Merge pull request #6075 from jlaska/issue_6067

Resolves issue#6067 by allowing exact_count=0
pull/6076/head
Michael DeHaan 11 years ago
commit 58814d08fe

@ -1035,7 +1035,7 @@ def main():
instance_profile_name = dict(), instance_profile_name = dict(),
instance_ids = dict(type='list'), instance_ids = dict(type='list'),
state = dict(default='present'), state = dict(default='present'),
exact_count = dict(type='int'), exact_count = dict(type='int', default=None),
count_tag = dict(), count_tag = dict(),
volumes = dict(type='list'), volumes = dict(type='list'),
) )
@ -1072,10 +1072,10 @@ def main():
if not module.params.get('image'): if not module.params.get('image'):
module.fail_json(msg='image parameter is required for new instance') module.fail_json(msg='image parameter is required for new instance')
if module.params.get('exact_count'): if module.params.get('exact_count') is None:
(tagged_instances, instance_dict_array, new_instance_ids, changed) = enforce_count(module, ec2)
else:
(instance_dict_array, new_instance_ids, changed) = create_instances(module, ec2) (instance_dict_array, new_instance_ids, changed) = create_instances(module, ec2)
else:
(tagged_instances, instance_dict_array, new_instance_ids, changed) = enforce_count(module, ec2)
module.exit_json(changed=changed, instance_ids=new_instance_ids, instances=instance_dict_array, tagged_instances=tagged_instances) module.exit_json(changed=changed, instance_ids=new_instance_ids, instances=instance_dict_array, tagged_instances=tagged_instances)

Loading…
Cancel
Save