diff --git a/confluent_osdeploy/el7/profiles/default/scripts/post.sh b/confluent_osdeploy/el7/profiles/default/scripts/post.sh index 6afcd90f..7991e0c7 100644 --- a/confluent_osdeploy/el7/profiles/default/scripts/post.sh +++ b/confluent_osdeploy/el7/profiles/default/scripts/post.sh @@ -2,7 +2,7 @@ mkdir -p /var/log/confluent exec >> /var/log/confluent/confluent-post.log tail -f /var/log/confluent/confluent-post.log > /dev/tty & -# need to copy over ssh key info +logshowpid=$! nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}') apikey=$(cat /etc/confluent/confluent.apikey) @@ -45,3 +45,4 @@ run_remote_parts post # Induce execution of remote configuration, e.g. ansible plays in ansible/post.d/ run_remote_config post curl -sf -X POST -d 'status: staged' -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $apikey" https://$mgr/confluent-api/self/updatestatus +kill $logshowpid \ No newline at end of file diff --git a/confluent_osdeploy/el7/profiles/default/scripts/pre.sh b/confluent_osdeploy/el7/profiles/default/scripts/pre.sh index 386c524a..24b170fc 100644 --- a/confluent_osdeploy/el7/profiles/default/scripts/pre.sh +++ b/confluent_osdeploy/el7/profiles/default/scripts/pre.sh @@ -13,6 +13,7 @@ if [ -f "/run/install/cmdline.d/01-autocons.conf" ]; then fi exec >> /tmp/confluent-pre.log tail -f /tmp/confluent-pre.log > /dev/tty & +loogshowpid=$! nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}') locale=$(grep ^locale: /etc/confluent/confluent.deploycfg) locale=${locale#locale: } @@ -77,3 +78,4 @@ if [ -e /tmp/installdisk -a ! -e /tmp/partitioning ]; then echo autopart --nohome $LUKSPARTY >> /tmp/partitioning fi python /etc/confluent/apiclient /confluent-public/os/$profile/kickstart.custom -o /tmp/kickstart.custom +kill $logshowpid \ No newline at end of file diff --git a/confluent_osdeploy/el8/profiles/default/scripts/post.sh b/confluent_osdeploy/el8/profiles/default/scripts/post.sh index 6afcd90f..7991e0c7 100644 --- a/confluent_osdeploy/el8/profiles/default/scripts/post.sh +++ b/confluent_osdeploy/el8/profiles/default/scripts/post.sh @@ -2,7 +2,7 @@ mkdir -p /var/log/confluent exec >> /var/log/confluent/confluent-post.log tail -f /var/log/confluent/confluent-post.log > /dev/tty & -# need to copy over ssh key info +logshowpid=$! nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}') apikey=$(cat /etc/confluent/confluent.apikey) @@ -45,3 +45,4 @@ run_remote_parts post # Induce execution of remote configuration, e.g. ansible plays in ansible/post.d/ run_remote_config post curl -sf -X POST -d 'status: staged' -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $apikey" https://$mgr/confluent-api/self/updatestatus +kill $logshowpid \ No newline at end of file diff --git a/confluent_osdeploy/el8/profiles/default/scripts/pre.sh b/confluent_osdeploy/el8/profiles/default/scripts/pre.sh index 23bc238f..7b95778e 100644 --- a/confluent_osdeploy/el8/profiles/default/scripts/pre.sh +++ b/confluent_osdeploy/el8/profiles/default/scripts/pre.sh @@ -13,6 +13,7 @@ if [ -f "/run/install/cmdline.d/01-autocons.conf" ]; then fi exec >> /tmp/confluent-pre.log tail -f /tmp/confluent-pre.log > /dev/tty & +logshowpid=$! /usr/libexec/platform-python /etc/confluent/apiclient >& /dev/null nicname=$(ip link|grep ^$(cat /tmp/confluent.ifidx): | awk '{print $2}' | awk -F: '{print $1}') nmcli c u $nicname @@ -87,3 +88,4 @@ if [ -e /tmp/installdisk -a ! -e /tmp/partitioning ]; then echo autopart --nohome $LUKSPARTY >> /tmp/partitioning fi curl -sf https://$mgr/confluent-public/os/$profile/kickstart.custom > /tmp/kickstart.custom +kill $logshowpid \ No newline at end of file