cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3747 from lorin/ec2-check

Browse source 
ec2: check for changes
This commit is contained in:
Michael DeHaan 2013-08-03 10:30:24 -07:00
commit fb42784c7a
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cloud/ec2
View file

@ -396,7 +396,10 @@ def create_instances(module, ec2):
# Both min_count and max_count equal count parameter. This means the launch request is explicit (we want count, or fail) in how many instances we want. # Both min_count and max_count equal count parameter. This means the launch request is explicit (we want count, or fail) in how many instances we want.
if count_remaining > 0: if count_remaining == 0:
changed = False
else:
changed = True
try: try:
params = {'image_id': image, params = {'image_id': image,
'key_name': key_name, 'key_name': key_name,
@ -465,7 +468,7 @@ def create_instances(module, ec2):
created_instance_ids.append(inst.id) created_instance_ids.append(inst.id)
instance_dict_array.append(d) instance_dict_array.append(d)
return (instance_dict_array, created_instance_ids) return (instance_dict_array, created_instance_ids, changed)
def terminate_instances(module, ec2, instance_ids): def terminate_instances(module, ec2, instance_ids):
@ -542,7 +545,6 @@ def main():
ec2_secret_key = module.params.get('ec2_secret_key') ec2_secret_key = module.params.get('ec2_secret_key')
ec2_access_key = module.params.get('ec2_access_key') ec2_access_key = module.params.get('ec2_access_key')
region = module.params.get('region') region = module.params.get('region')
termination_list = module.params.get('termination_list')
# allow eucarc environment variables to be used if ansible vars aren't set # allow eucarc environment variables to be used if ansible vars aren't set
@ -578,14 +580,13 @@ def main():
elif module.params.get('state') == 'present': elif module.params.get('state') == 'present':
# Changed is always set to true when provisioning new instances # Changed is always set to true when provisioning new instances
changed = True
if not module.params.get('key_name'): if not module.params.get('key_name'):
module.fail_json(msg='key_name parameter is required for new instance') module.fail_json(msg='key_name parameter is required for new instance')
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')
(instance_dict_array, new_instance_ids) = create_instances(module, ec2) (instance_dict_array, new_instance_ids, changed) = create_instances(module, ec2)
module.exit_json(changed=True, instance_ids=new_instance_ids, instances=instance_dict_array) module.exit_json(changed=changed, instance_ids=new_instance_ids, instances=instance_dict_array)
# this is magic, see lib/ansible/module_common.py # this is magic, see lib/ansible/module_common.py