From 78b0574dbcdc242404372c29676da7352d6a43cc Mon Sep 17 00:00:00 2001 From: Yichen Wang Date: Wed, 23 Aug 2017 15:00:02 -0700 Subject: [PATCH] Add retries for security group delete Change-Id: I8123a9475831424c34a47530c793b2a7bee553f0 --- vmtp/compute.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/vmtp/compute.py b/vmtp/compute.py index bcb580a..70d4a06 100644 --- a/vmtp/compute.py +++ b/vmtp/compute.py @@ -21,6 +21,7 @@ import time import glanceclient.exc as glance_exception import keystoneauth1 from log import LOG +from neutronclient.common.exceptions import Conflict import novaclient import novaclient.exceptions as exceptions @@ -416,7 +417,12 @@ class Compute(object): def security_group_delete(self, group): if group: LOG.info("Deleting security group") - self.neutron.delete_security_group(group["id"]) + for _ in range(1, 5): + try: + self.neutron.delete_security_group(group["id"]) + break + except Conflict: + time.sleep(1) # Add rules to the security group def security_group_add_rules(self, group):