From 3ffebeac5b575721660783fb15ece6713aad44a2 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 1 Apr 2015 10:43:29 -0400 Subject: [PATCH] Use the delete method from shade Sigh. Turns out glance v1 and glance v2 delete images differently too. --- cloud/openstack/os_image.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/cloud/openstack/os_image.py b/cloud/openstack/os_image.py index 7842137f7d9..7e97b3800a9 100644 --- a/cloud/openstack/os_image.py +++ b/cloud/openstack/os_image.py @@ -116,16 +116,6 @@ EXAMPLES = ''' import time -def _glance_delete_image(module, params, client): - try: - for image in client.images.list(): - if image.name == params['name']: - client.images.delete(image) - except Exception, e: - module.fail_json(msg="Error in deleting image: %s" % e.message) - module.exit_json(changed=True, result="Deleted") - - def main(): argument_spec = openstack_full_argument_spec( @@ -179,7 +169,10 @@ def main(): if not image: module.exit_json(changed=False, result="success") else: - _glance_delete_image(module, module.params, cloud.glance_client) + cloud.delete_image( + name_or_id=module.params['name'], + wait=module.params['wait'], + timeout=module.params['timeout']) changed = True module.exit_json(changed=changed, id=image.id, result="success")