diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-01-21 18:55:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-01-21 18:55:44 +0000 |
| commit | 89392bca9cba16093a1a3012be9b27dd69ad1162 (patch) | |
| tree | 5ebcd5f5986380a91e51d8f69998a07178f0e4e9 | |
| parent | d239cdfa3dbcc6ceec8df947bcd6234e861baba9 (diff) | |
| parent | 8de84a06b723a237aa34dd42d020ba06ae57dcf5 (diff) | |
Merge "[uefi_cleanup] Use grain targeting"
| -rw-r--r-- | mcp/scripts/lib.sh | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 85360bf2e..6455a65c0 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -36,22 +36,17 @@ function wait_for { } function cleanup_uefi { - # Clean up Ubuntu boot entry if cfg01, kvm nodes online from previous deploy + # Clean up Ubuntu boot entry if cfg01, baremetal nodes online from previous deploy local cmd_str="ssh ${SSH_OPTS} ${SSH_SALT}" - local grain_virtual=$(salt -C 'I@nova:compute and *01*' grains.get virtual --out txt | cut -d ' ' -f2) ping -c 1 -w 1 "${SALT_MASTER}" || return 0 [ ! "$(hostname)" = 'cfg01' ] || cmd_str='eval' - # NOTE: Targeting nodes by hostname is fragile and should be refactored to - # also cover corner cases like noha scenarios on AArch64 baremetal's 'ctl01' - ${cmd_str} "sudo salt -C 'kvm* or cmp*' cmd.run \ + ${cmd_str} "sudo salt -C 'G@virtual:physical and not cfg01*' cmd.run \ \"which efibootmgr > /dev/null 2>&1 && \ efibootmgr | grep -oP '(?<=Boot)[0-9]+(?=.*ubuntu)' | \ xargs -I{} efibootmgr --delete-bootnum --bootnum {}; \ rm -rf /boot/efi/*\"" || true - if [ "${grain_virtual}" == physical ]; then - ${cmd_str} "sudo salt -C 'kvm* or cmp*' cmd.run 'shutdown now'" || true - fi + ${cmd_str} "sudo salt -C 'G@virtual:physical and not cfg01*' cmd.run 'shutdown now'" || true } function get_nova_compute_pillar_data { |