From 2622e2136fcbfcfbc8685c04ef226df26b7c42b4 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Fri, 1 Sep 2023 15:41:58 -0400 Subject: [PATCH] Adjust names of checking actions --- templates/install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/install.sh b/templates/install.sh index 5a323c4..96ae97b 100755 --- a/templates/install.sh +++ b/templates/install.sh @@ -839,11 +839,11 @@ ipaddr=\$( ip -br address show \${target_interface} | awk '{ print \$3 }' | awk bmc_macaddr=\$( ipmitool lan print | grep 'MAC Address ' | awk '{ print \$NF }' ) bmc_ipaddr=\$( ipmitool lan print | grep 'IP Address ' | awk '{ print \$NF }' ) if [[ -f /etc/pvc-install.hooks ]]; then - # The third boot, when all pvcprovisionerd hook plugins have been run (this script will henceforth do nothing) - action="system-boot_hooks-completed" + # The third boot, when all hooks have been completed + action="system-boot_completed" elif [[ -f /etc/pvc-install.base && -f /etc/pvc-install.pvc ]]; then - # The second boot, when Ansible has been run and plugins running - action="system-boot_ansible-completed" + # The second boot, when Ansible has configured the cluster + action="system-boot_configured" else # The first boot, when Ansible has not been run yet action="system-boot_initial" @@ -853,7 +853,7 @@ curl -X POST \ -d "{\"action\":\"\${action}\",\"macaddr\":\"\${macaddr}\",\"ipaddr\":\"\${ipaddr}\",\"hostname\":\"\$( hostname -s )\",\"bmc_macaddr\":\"\${bmc_macaddr}\",\"bmc_ipaddr\":\"\${bmc_ipaddr}\"}" \ \${pvcbootstrapd_checkin_uri} -if [[ \${action} == "system-boot_hooks-completed" ]]; then +if [[ \${action} == "system-boot_completed" ]]; then # Clean up the bootstrap interface and this script rm /etc/network/interfaces.d/\${target_interface} rm \$0