parallelvirtualcluster/pvc-installer
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Adjust names of checking actions

Browse Source
This commit is contained in:
Joshua Boniface
2021-12-15 16:35:57 -05:00
parent 9353396367
commit 326c3adeb3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
templates/install.sh
View File

@@ -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_macaddr=\$( ipmitool lan print | grep 'MAC Address ' | awk '{ print \$NF }' )
bmc_ipaddr=\$( ipmitool lan print | grep 'IP Address ' | awk '{ print \$NF }' ) bmc_ipaddr=\$( ipmitool lan print | grep 'IP Address ' | awk '{ print \$NF }' )
if [[ -f /etc/pvc-install.hooks ]]; then if [[ -f /etc/pvc-install.hooks ]]; then
# The third boot, when all pvcprovisionerd hook plugins have been run (this script will henceforth do nothing) # The third boot, when all hooks have been completed
action="system-boot_hooks-completed" action="system-boot_completed"
elif [[ -f /etc/pvc-install.base && -f /etc/pvc-install.pvc ]]; then elif [[ -f /etc/pvc-install.base && -f /etc/pvc-install.pvc ]]; then
# The second boot, when Ansible has been run and plugins running # The second boot, when Ansible has configured the cluster
action="system-boot_ansible-completed" action="system-boot_configured"
else else
# The first boot, when Ansible has not been run yet # The first boot, when Ansible has not been run yet
action="system-boot_initial" 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}\"}" \ -d "{\"action\":\"\${action}\",\"macaddr\":\"\${macaddr}\",\"ipaddr\":\"\${ipaddr}\",\"hostname\":\"\$( hostname -s )\",\"bmc_macaddr\":\"\${bmc_macaddr}\",\"bmc_ipaddr\":\"\${bmc_ipaddr}\"}" \
\${pvcbootstrapd_checkin_uri} \${pvcbootstrapd_checkin_uri}
if [[ \${action} == "system-boot_hooks-completed" ]]; then if [[ \${action} == "system-boot_completed" ]]; then
# Clean up the bootstrap interface and this script # Clean up the bootstrap interface and this script
rm /etc/network/interfaces.d/\${target_interface} rm /etc/network/interfaces.d/\${target_interface}
rm \$0 rm \$0