From 481f3008364920345573c92a9cddbc8c5b090a3f Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Fri, 24 Jul 2015 23:32:41 -0400 Subject: [PATCH] clarified error messages to actually give back ansible module option instead of internal boto field name --- cloud/amazon/ec2.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cloud/amazon/ec2.py b/cloud/amazon/ec2.py index 8a50359b71b..55c45a647f4 100644 --- a/cloud/amazon/ec2.py +++ b/cloud/amazon/ec2.py @@ -1283,21 +1283,21 @@ def main(): else: module.fail_json(msg="region must be specified") - tagged_instances = [] + tagged_instances = [] - state = module.params.get('state') + state = module.params['state'] if state == 'absent': - instance_ids = module.params.get('instance_ids') - if not isinstance(instance_ids, list): - module.fail_json(msg='termination_list needs to be a list of instances to terminate') + instance_ids = module.params['instance_ids'] + if not instance_ids: + 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) elif state in ('running', 'stopped'): - instance_ids = module.params.get('instance_ids') - if not isinstance(instance_ids, list): - module.fail_json(msg='running list needs to be a list of instances to run: %s' % instance_ids) + instance_ids = module.params['instance_ids'] + if not 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)