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

clarified error messages to actually give back ansible module option instead of internal boto field name

Browse source
This commit is contained in:
Brian Coca 2015-07-24 23:32:41 -04:00 committed by Matt Clay
parent a913370687
commit 357d542bb3
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/modules/cloud/amazon/ec2.py
View file

@ -1282,19 +1282,19 @@ def main():
tagged_instances = [] tagged_instances = []
state = module.params.get('state') state = module.params['state']
if state == 'absent': if state == 'absent':
instance_ids = module.params.get('instance_ids') instance_ids = module.params['instance_ids']
if not isinstance(instance_ids, list): if not instance_ids:
module.fail_json(msg='termination_list needs to be a list of instances to terminate') module.fail_json(msg='instance_ids list is required for absent state')
(changed, instance_dict_array, new_instance_ids) = terminate_instances(module, ec2, instance_ids) (changed, instance_dict_array, new_instance_ids) = terminate_instances(module, ec2, instance_ids)
elif state in ('running', 'stopped'): elif state in ('running', 'stopped'):
instance_ids = module.params.get('instance_ids') instance_ids = module.params['instance_ids']
if not isinstance(instance_ids, list): if not instance_ids:
module.fail_json(msg='running list needs to be a list of instances to run: %s' % instance_ids) module.fail_json(msg='instance_ids list is requried for %s state' % state)
(changed, instance_dict_array, new_instance_ids) = startstop_instances(module, ec2, instance_ids, state) (changed, instance_dict_array, new_instance_ids) = startstop_instances(module, ec2, instance_ids, state)