From f3d22e693075fc40ed392f4d1345a81c84bf34c4 Mon Sep 17 00:00:00 2001 From: Periyasamy Palanisamy Date: Tue, 7 Nov 2017 15:54:56 +0100 Subject: use glance_client for image cleanup Change-Id: Ia192a1b26c5f31b6d3465a060c3d8a3097e6ebd4 Signed-off-by: Periyasamy Palanisamy --- sdnvpn/lib/utils.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'sdnvpn/lib') diff --git a/sdnvpn/lib/utils.py b/sdnvpn/lib/utils.py index 54c9730..1afccf7 100644 --- a/sdnvpn/lib/utils.py +++ b/sdnvpn/lib/utils.py @@ -592,7 +592,7 @@ def cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, return True -def cleanup_nova(nova_client, instance_ids, image_ids): +def cleanup_nova(nova_client, instance_ids): if len(instance_ids) != 0: for instance_id in instance_ids: if not os_utils.delete_instance(nova_client, instance_id): @@ -600,10 +600,13 @@ def cleanup_nova(nova_client, instance_ids, image_ids): 'Instance with id {} was not deleted.'. format(instance_id)) return False + return True + +def cleanup_glance(glance_client, image_ids): if len(image_ids) != 0: for image_id in image_ids: - if not os_utils.delete_glance_image(nova_client, image_id): + if not os_utils.delete_glance_image(glance_client, image_id): logging.error('Fail to delete all images. ' 'Image with id {} was not deleted.'. format(image_id)) -- cgit 1.2.3-korg