Revert "Do not retry default security group creation"
This is a breakage of the API signature. We cannot change this.
This reverts commit 5ad5d103ad
.
Change-Id: I53916a43c78a96d1e2d91aa55ad0c45bf70dc2eb
This commit is contained in:
parent
5ad5d103ad
commit
2a5826c8b3
|
@ -61,15 +61,11 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase):
|
|||
raise exc_cls(reason=reason, id=id)
|
||||
|
||||
@db_api.retry_if_session_inactive()
|
||||
def create_security_group(self, context, security_group):
|
||||
return self._create_security_group(context, security_group)
|
||||
|
||||
def _create_security_group(self, context, security_group,
|
||||
default_sg=False):
|
||||
def create_security_group(self, context, security_group, default_sg=False):
|
||||
"""Create security group.
|
||||
|
||||
If default_sg is true that means we are creating a default security
|
||||
group for a given tenant if it does not exist.
|
||||
If default_sg is true that means we are a default security group for
|
||||
a given tenant if it does not exist.
|
||||
"""
|
||||
s = security_group['security_group']
|
||||
kwargs = {
|
||||
|
@ -675,7 +671,7 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase):
|
|||
'tenant_id': tenant_id,
|
||||
'description': _('Default security group')}
|
||||
}
|
||||
return self._create_security_group(
|
||||
return self.create_security_group(
|
||||
context, security_group, default_sg=True)['id']
|
||||
|
||||
def _get_security_groups_on_port(self, context, port):
|
||||
|
|
Loading…
Reference in New Issue