From 6eab33788a8458189e71531b4b42878e05fc2d88 Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Wed, 25 Jan 2017 15:39:30 +0000 Subject: [PATCH] DevStack: Fix cleaning up nodes with NVRAM (UEFI) This patch is fixing the cleanup_nodes.sh script to take in account undefining nodes with NVRAM set (UEFI mode). The --nvram option is now being passed to the "virsh undefine" command, this will undefine nodes with (and without) NVRAM set. Change-Id: Idbc2d0d1765cad969e68544109bd44963cadc06c Closes-Bug: #1659335 --- devstack/tools/ironic/scripts/cleanup-node.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devstack/tools/ironic/scripts/cleanup-node.sh b/devstack/tools/ironic/scripts/cleanup-node.sh index ac837a2b44..466b7059b8 100755 --- a/devstack/tools/ironic/scripts/cleanup-node.sh +++ b/devstack/tools/ironic/scripts/cleanup-node.sh @@ -19,7 +19,7 @@ export VIRSH_DEFAULT_CONNECT_URI=$LIBVIRT_CONNECT_URI VOL_NAME="$NAME.qcow2" virsh list | grep -q $NAME && virsh destroy $NAME -virsh list --inactive | grep -q $NAME && virsh undefine $NAME +virsh list --inactive | grep -q $NAME && virsh undefine $NAME --nvram # Delete the Virtual BMC if [[ $(type -P vbmc) != "" ]]; then