Skip to content

Commit 72185b4

Browse files
committed
Merge pull request ansible#194 from rglew/devel
Fixed bug ansible#193 where parameter name was set incorrectly
2 parents 4d1bd72 + 043b38f commit 72185b4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

cloud/ec2_asg.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ def replace(connection, module):
426426

427427
batch_size = module.params.get('replace_batch_size')
428428
wait_timeout = module.params.get('wait_timeout')
429-
group_name = module.params.get('group_name')
429+
group_name = module.params.get('name')
430430
max_size = module.params.get('max_size')
431431
min_size = module.params.get('min_size')
432432
desired_capacity = module.params.get('desired_capacity')
@@ -444,7 +444,7 @@ def replace(connection, module):
444444
time.sleep(10)
445445
if instance_wait <= time.time():
446446
# waiting took too long
447-
module.fail_json(msg = "Waited too for instances to appear. %s" % time.asctime())
447+
module.fail_json(msg = "Waited too long for instances to appear. %s" % time.asctime())
448448
# determine if we need to continue
449449
replaceable = 0
450450
if replace_instances:
@@ -470,7 +470,7 @@ def replace(connection, module):
470470
props = get_properties(as_group)
471471
if wait_timeout <= time.time():
472472
# waiting took too long
473-
module.fail_json(msg = "Waited too for instances to appear. %s" % time.asctime())
473+
module.fail_json(msg = "Waited too long for instances to appear. %s" % time.asctime())
474474
instances = props['instances']
475475
if replace_instances:
476476
instances = replace_instances
@@ -490,7 +490,7 @@ def replace(connection, module):
490490
def replace_batch(connection, module, replace_instances):
491491

492492

493-
group_name = module.params.get('group_name')
493+
group_name = module.params.get('name')
494494
wait_timeout = int(module.params.get('wait_timeout'))
495495
lc_check = module.params.get('lc_check')
496496

0 commit comments

Comments
 (0)