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

Merge pull request #1827 from thyming/fix-ec2-snapshot-error

Browse source 
Use msg kwarg to pass error message in ec2_snapshot
This commit is contained in:
Brian Coca 2015-07-28 16:30:40 -04:00
commit e16993ae55
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cloud/amazon/ec2_snapshot.py
View file

@ -146,9 +146,9 @@ def main():
state = module.params.get('state') state = module.params.get('state')
if not volume_id and not instance_id and not snapshot_id or volume_id and instance_id and snapshot_id: if not volume_id and not instance_id and not snapshot_id or volume_id and instance_id and snapshot_id:
module.fail_json('One and only one of volume_id or instance_id or snapshot_id must be specified') module.fail_json(msg='One and only one of volume_id or instance_id or snapshot_id must be specified')
if instance_id and not device_name or device_name and not instance_id: if instance_id and not device_name or device_name and not instance_id:
module.fail_json('Instance ID and device name must both be specified') module.fail_json(msg='Instance ID and device name must both be specified')
ec2 = ec2_connect(module) ec2 = ec2_connect(module)