Merge branch 'ec2-params' of https://github.com/scottanderson42/ansible into scottanderson42-ec2-params

Conflicts:
	lib/ansible/module_utils/ec2.py
	library/cloud/ec2
This commit is contained in:
James Cammarata 2014-02-26 09:37:26 -06:00
commit 8a7c68dc18
9 changed files with 55 additions and 53 deletions

View file

@ -1053,6 +1053,7 @@ def main():
ec2 = ec2_connect(module)
tagged_instances = []
if module.params.get('state') == 'absent':
instance_ids = module.params.get('instance_ids')
if not isinstance(instance_ids, list):