openstack
/
neutron
Code Issues Proposed changes

Merge "Do not retry default security group creation"

This commit is contained in:
Jenkins 2016-09-21 18:20:31 +00:00 committed by Gerrit Code Review
parent abb7e08a0b 09d1185d24
commit f899470f63
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/db/securitygroups_db.py
View File

@ -671,8 +671,11 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase):
'tenant_id': tenant_id,
'description': _('Default security group')}
}
return self.create_security_group(
context, security_group, default_sg=True)['id']
# starting a transaction before create to avoid db retries
with context.session.begin(subtransactions=True):
sg_id = self.create_security_group(
context, security_group, default_sg=True)['id']
return sg_id
def _get_security_groups_on_port(self, context, port):
"""Check that all security groups on port belong to tenant.