openstack: add ownedby property to volumes

And delete the volumes owned by a teuthology instance on restart.

Signed-off-by: Loic Dachary <ldachary@redhat.com>

diff --git a/teuthology/openstack/openstack-teuthology.init b/teuthology/openstack/openstack-teuthology.init
index a2ac79f787cbabae4390fcef3dabcb0cc66f7b0d..6e237dccbab3fffeb717ed5ad786d7e6612fdc1c 100755 (executable)
--- 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 078794375ca5cec21a7652ff1258885144aa6564..a3e7241c850a90ffb8432cf5c6312a3e49181ed2 100644 (file)
--- 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,