openstack/deb-sahara
Code Issues Proposed changes

Merge "Fixing cluster creation without auto_security_group"

Browse Source
This commit is contained in:
Jenkins 2015-10-10 11:29:04 +00:00 committed by Gerrit Code Review
commit d479d2ece4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sahara/service/heat/templates.py
View File

@ -485,12 +485,12 @@ class ClusterStack(object):
})
def _get_security_groups(self, node_group):
if not node_group.auto_security_group:
return node_group.security_groups
node_group_sg = list(node_group.security_groups or [])
node_group_sg += [
{"get_resource": g.generate_auto_security_group_name(node_group)}
]
if node_group.auto_security_group:
node_group_sg += [
{"get_resource": g.generate_auto_security_group_name(
node_group)}
]
return node_group_sg
def _serialize_aa_server_group(self):