From f33ddf3ab9e14f3a7f2b8f44048969c14ff3c880 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 2 Dec 2020 09:12:14 -0500 Subject: [PATCH] Move fetch of profile.yaml Need to use thte copernicus network setup, as the 'final' setup will depend on subsequent autoyast activity. Therefore, move it up to when mgr is probably IPv6 --- .../suse15/initramfs/opt/confluent/bin/suseagent | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent b/confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent index a5460029..d42dd373 100755 --- a/confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent +++ b/confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent @@ -52,6 +52,9 @@ if [ -z "$mgtiface" ]; then else curl -H "CONFLUENT_MGTIFACE: $mgtiface" -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /etc/confluent/confluent.apikey)" https://$mgr/confluent-api/self/deploycfg > /etc/confluent/confluent.deploycfg fi +profilename=$(grep ^profile: /etc/confluent/confluent.deploycfg) +profilename=${profilename#profile: } +curl https://$mgr/confluent-public/os/$profilename/profile.yaml > /tmp/profile.yaml dnsdomain=$(grep ^dnsdomain: /etc/confluent/confluent.deploycfg) dnsdomain=${dnsdomain#dnsdomain: } if [ ! -z "$dnsdomain" ] && [ "$dnsdomain" != "null" ]; then @@ -111,12 +114,9 @@ fi echo done mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg) mgr=${mgr#deploy_server: } -profilename=$(grep ^profile: /etc/confluent/confluent.deploycfg) -profilename=${profilename#profile: } proto=$(grep ^protocol: /etc/confluent/confluent.deploycfg) proto=${proto#protocol: } -curl https://$mgr/confluent-public/os/$profilename/profile.yaml > /tmp/profile.yaml append=$(grep ^installedargs: /tmp/profile.yaml | sed -e 's/^installedargs: //' -e 's/#.*//') if [ -z "$append" ]; then echo "" > /tmp/bootloader.xml