From 9ec5caf1d0a82e4cb4c35f0e9795405701536681 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Fri, 23 Oct 2015 01:39:07 +0200 Subject: [PATCH] openstack: add ownedby property to volumes And delete the volumes owned by a teuthology instance on restart. Signed-off-by: Loic Dachary --- teuthology/openstack/openstack-teuthology.init | 5 +++++ teuthology/provision.py | 1 + 2 files changed, 6 insertions(+) diff --git a/teuthology/openstack/openstack-teuthology.init b/teuthology/openstack/openstack-teuthology.init index a2ac79f78..6e237dccb 100755 --- a/teuthology/openstack/openstack-teuthology.init +++ b/teuthology/openstack/openstack-teuthology.init @@ -75,6 +75,11 @@ case $1 in while read uuid ; do eval openstack server delete $uuid done + openstack volume list --long -f json | \ + jq ".[] | select(.Properties | contains(\"ownedby='$ip'\")) | .ID" | \ + while read uuid ; do + eval openstack volume delete $uuid + done rm -fr /home/$user/src/* /tmp/stampsdir ;; restart) diff --git a/teuthology/provision.py b/teuthology/provision.py index 078794375..a3e7241c8 100644 --- a/teuthology/provision.py +++ b/teuthology/provision.py @@ -253,6 +253,7 @@ class ProvisionOpenStack(OpenStack): raise e misc.sh("openstack volume create -f json " + config['openstack'].get('volume-create', '') + " " + + " --property ownedby=" + config.openstack['ip'] + " --size " + str(volumes['size']) + " " + volume_name) with safe_while(sleep=2, tries=100, -- 2.47.3