Skip to content

Commit 3542969

Browse files
author
Gabriel Monroy
committed
fix sg_name bug
1 parent e115621 commit 3542969

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

api/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ def launch(self, *args, **kwargs):
536536
def _prepare_launch_args(self):
537537
creds = self.layer.flavor.provider.creds.copy()
538538
params = self.layer.flavor.params.copy()
539-
params['formation'] = self.formation.id
539+
params['layer'] = "{0}-{1}".format(self.formation.id, self.layer.id)
540540
params['id'] = self.id
541541
init = self.layer.flavor.init.copy()
542542
if settings.CHEF_ENABLED:

celerytasks/ec2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def launch_node(node_id, creds, params, init, ssh_username, ssh_private_key):
5656
conn = create_ec2_connection(
5757
region, creds['access_key'], creds['secret_key'])
5858
# find or create the security group for this formation
59-
sg_name = params['formation']
59+
sg_name = params['layer']
6060
sg = conn.get_all_security_groups(sg_name)[0]
6161
# add the security group to the list
6262
params.setdefault('security_groups', []).append(sg.name)

0 commit comments

Comments
 (0)