From fed371bd9bb81d1f5e839d7ded3ce3f266c3877a Mon Sep 17 00:00:00 2001 From: Dan Radez <dradez@redhat.com> Date: Thu, 8 Oct 2015 10:52:32 -0400 Subject: cleaning up libvirt storage after undefine Change-Id: Id03828b1a61c2f9a3c56821d8ca31f2d82251c9b Signed-off-by: Dan Radez <dradez@redhat.com> --- build/instack.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build/instack.sh b/build/instack.sh index 1d4eb11c..22bd7831 100755 --- a/build/instack.sh +++ b/build/instack.sh @@ -72,11 +72,11 @@ fi ssh -T -o "StrictHostKeyChecking no" stack@localhost <<EOI set -e virsh destroy instack 2> /dev/null || echo -n '' -virsh undefine instack 2> /dev/null || echo -n '' +virsh undefine instack --remove-all-storage 2> /dev/null || echo -n '' virsh destroy baremetalbrbm_0 2> /dev/null || echo -n '' -virsh undefine baremetalbrbm_0 2> /dev/null || echo -n '' +virsh undefine baremetalbrbm_0 --remove-all-storage 2> /dev/null || echo -n '' virsh destroy baremetalbrbm_1 2> /dev/null || echo -n '' -virsh undefine baremetalbrbm_1 2> /dev/null || echo -n '' +virsh undefine baremetalbrbm_1 --remove-all-storage 2> /dev/null || echo -n '' instack-virt-setup EOI @@ -204,17 +204,17 @@ done # move and Sanitize private keys from instack.json file mv stack/instackenv.json instackenv-virt.json -sed -i '/pm_password/c\ "pm_password": "INSERT_STACK_USER_PRIV_KEY",' instackenv-virt.json +sed -i '/pm_password/c\ "pm_password": "INSERT_STACK_USER_PRIV_KEY",' instackenv-virt.json sed -i '/ssh-key/c\ "ssh-key": "INSERT_STACK_USER_PRIV_KEY",' instackenv-virt.json # clean up the VMs ssh -T -o "StrictHostKeyChecking no" stack@localhost <<EOI set -e virsh destroy instack 2> /dev/null || echo -n '' -virsh undefine instack 2> /dev/null || echo -n '' +virsh undefine instack --remove-all-storage 2> /dev/null || echo -n '' virsh destroy baremetalbrbm_0 2> /dev/null || echo -n '' -virsh undefine baremetalbrbm_0 2> /dev/null || echo -n '' +virsh undefine baremetalbrbm_0 --remove-all-storage 2> /dev/null || echo -n '' virsh destroy baremetalbrbm_1 2> /dev/null || echo -n '' -virsh undefine baremetalbrbm_1 2> /dev/null || echo -n '' +virsh undefine baremetalbrbm_1 --remove-all-storage 2> /dev/null || echo -n '' EOI -- cgit