aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-07 21:55:16 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-08 00:29:30 +0200
commit3e45721b819ec16e8cf164a42725bc1d30614581 (patch)
treeaf425401ba753becba5c164fe80e4fc38db1e369 /mcp
parentac7bb381c5376c28b0eeac880af90b50a2801f38 (diff)
lib.sh: Remove all storage on undefine
While executing the deploy script via sudo will raise no issues with re-using old storage volume files, non-root deploys fail to change ownership of said files. Properly clean after ourselves when destroying and undefining VMs. JIRA: ARMBAND-311 Change-Id: I7fdd269dccbfd5ab5285d852ac7dacfc4dc5ccd7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp')
-rw-r--r--mcp/scripts/lib.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index 1812663d3..d9b5e6385 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -34,7 +34,9 @@ cleanup_vms() {
virsh destroy "${node}"
done
for node in $(virsh list --name --all | grep -P '\w{3}\d{2}'); do
- virsh undefine --nvram "${node}"
+ virsh domblklist "${node}" | awk '/^.da/ {print $2}' | \
+ xargs --no-run-if-empty -I{} sudo rm -f {}
+ virsh undefine "${node}" --remove-all-storage --nvram
done
}
@@ -45,6 +47,7 @@ prepare_vms() {
cleanup_vms
get_base_image "${base_image}" "${image_dir}"
+ # shellcheck disable=SC2016
envsubst '${SALT_MASTER},${CLUSTER_DOMAIN}' < \
user-data.template > user-data.sh