From 61eecd672ca16faf1d67cfa6f0969439e4db35dd Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 8 Nov 2021 16:34:26 -0500 Subject: [PATCH] Add confignet to default firstboot/onboot as appropriate for el8 and suse15 --- .../el8-diskless/profiles/default/scripts/onboot.sh | 1 + confluent_osdeploy/el8/profiles/default/scripts/firstboot.sh | 1 + .../suse15-diskless/profiles/default/scripts/onboot.sh | 2 ++ confluent_osdeploy/suse15/profiles/hpc/scripts/firstboot.sh | 1 + 4 files changed, 5 insertions(+) diff --git a/confluent_osdeploy/el8-diskless/profiles/default/scripts/onboot.sh b/confluent_osdeploy/el8-diskless/profiles/default/scripts/onboot.sh index 97e035f8..ec2f225b 100644 --- a/confluent_osdeploy/el8-diskless/profiles/default/scripts/onboot.sh +++ b/confluent_osdeploy/el8-diskless/profiles/default/scripts/onboot.sh @@ -18,6 +18,7 @@ tail -f /var/log/confluent/confluent-onboot.log > /dev/console & logshowpid=$! run_remote_python syncfileclient +run_remote_python confignet run_remote onboot.custom # onboot scripts may be placed into onboot.d, e.g. onboot.d/01-firstaction.sh, onboot.d/02-secondaction.sh diff --git a/confluent_osdeploy/el8/profiles/default/scripts/firstboot.sh b/confluent_osdeploy/el8/profiles/default/scripts/firstboot.sh index 0a5509d9..10219400 100644 --- a/confluent_osdeploy/el8/profiles/default/scripts/firstboot.sh +++ b/confluent_osdeploy/el8/profiles/default/scripts/firstboot.sh @@ -34,6 +34,7 @@ if [ ! -f /etc/confluent/firstboot.ran ]; then touch /etc/confluent/firstboot.ran cat /etc/confluent/tls/*.pem >> /etc/pki/tls/certs/ca-bundle.crt + run_remote_python confignet run_remote firstboot.custom # Firstboot scripts may be placed into firstboot.d, e.g. firstboot.d/01-firstaction.sh, firstboot.d/02-secondaction.sh diff --git a/confluent_osdeploy/suse15-diskless/profiles/default/scripts/onboot.sh b/confluent_osdeploy/suse15-diskless/profiles/default/scripts/onboot.sh index e821c57d..142a4443 100644 --- a/confluent_osdeploy/suse15-diskless/profiles/default/scripts/onboot.sh +++ b/confluent_osdeploy/suse15-diskless/profiles/default/scripts/onboot.sh @@ -17,6 +17,8 @@ exec 2>> /var/log/confluent/confluent-onboot.log tail -f /var/log/confluent/confluent-onboot.log > /dev/console & logshowpid=$! +run_remote_python syncfileclient +run_remote_python confignet run_remote onboot.custom # onboot scripts may be placed into onboot.d, e.g. onboot.d/01-firstaction.sh, onboot.d/02-secondaction.sh run_remote_parts onboot.d diff --git a/confluent_osdeploy/suse15/profiles/hpc/scripts/firstboot.sh b/confluent_osdeploy/suse15/profiles/hpc/scripts/firstboot.sh index 8aa6f496..d2c5b4d9 100644 --- a/confluent_osdeploy/suse15/profiles/hpc/scripts/firstboot.sh +++ b/confluent_osdeploy/suse15/profiles/hpc/scripts/firstboot.sh @@ -28,6 +28,7 @@ for i in /etc/ssh/ssh_host*key.pub; do curl -f -X POST -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /etc/confluent/confluent.apikey)" -d @$i https://$confluent_mgr/confluent-api/self/sshcert > $certname done systemctl restart sshd +run_remote_python confignet run_remote firstboot.custom # Firstboot scripts may be placed into firstboot.d, e.g. firstboot.d/01-firstaction.sh, firstboot.d/02-secondaction.sh