summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mcp/scripts/lib.sh6
-rw-r--r--mcp/scripts/lib_jump_deploy.sh2
2 files changed, 6 insertions, 2 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index 79767f0fa..85360bf2e 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -38,6 +38,7 @@ function wait_for {
function cleanup_uefi {
# Clean up Ubuntu boot entry if cfg01, kvm 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
@@ -47,7 +48,10 @@ function cleanup_uefi {
efibootmgr | grep -oP '(?<=Boot)[0-9]+(?=.*ubuntu)' | \
xargs -I{} efibootmgr --delete-bootnum --bootnum {}; \
rm -rf /boot/efi/*\"" || true
- ${cmd_str} "sudo salt -C 'kvm* or cmp*' cmd.run 'shutdown now'" || true
+
+ if [ "${grain_virtual}" == physical ]; then
+ ${cmd_str} "sudo salt -C 'kvm* or cmp*' cmd.run 'shutdown now'" || true
+ fi
}
function get_nova_compute_pillar_data {
diff --git a/mcp/scripts/lib_jump_deploy.sh b/mcp/scripts/lib_jump_deploy.sh
index d8b62fd7c..9c4d8fb5a 100644
--- a/mcp/scripts/lib_jump_deploy.sh
+++ b/mcp/scripts/lib_jump_deploy.sh
@@ -194,7 +194,7 @@ function __apt_repos_pkgs_image {
function __cleanup_vms {
# clean up existing nodes
for node in $(${VIRSH} list --name | grep -P '\w{3}\d{2}'); do
- ${VIRSH} destroy "${node}"
+ ${VIRSH} destroy "${node}" 2>/dev/null || true
done
for node in $(${VIRSH} list --name --all | grep -P '\w{3}\d{2}'); do
${VIRSH} domblklist "${node}" | awk '/^.da/ {print $2}' | \