From e59f4fb85e3e5b60c97aa45a1a4c3da6ec973ce2 Mon Sep 17 00:00:00 2001
From: Hagai <hagai@bigpanda.io>
Date: Tue, 4 Mar 2014 21:37:15 +0200
Subject: [PATCH 1/2] ec2_snapshot: Add `wait' and `snapshot_tags' parameters,
return more info on success
---
cloud/ec2_snapshot | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/cloud/ec2_snapshot b/cloud/ec2_snapshot
index 2b8a9dabba6..1bf4f8b509e 100644
--- a/cloud/ec2_snapshot
+++ b/cloud/ec2_snapshot
@@ -124,6 +124,8 @@ def main():
ec2_url = dict(),
ec2_secret_key = dict(aliases=['aws_secret_key', 'secret_key'], no_log=True),
ec2_access_key = dict(aliases=['aws_access_key', 'access_key']),
+ wait = dict(choices=BOOLEANS, default='true'),
+ snapshot_tags = dict(type='dict', default=dict()),
)
)
@@ -131,6 +133,8 @@ def main():
description = module.params.get('description')
instance_id = module.params.get('instance_id')
device_name = module.params.get('device_name')
+ wait = module.params.get('wait')
+ snapshot_tags = module.params.get('snapshot_tags')
if not volume_id and not instance_id or volume_id and instance_id:
module.fail_json('One and only one of volume_id or instance_id must be specified')
@@ -150,10 +154,18 @@ def main():
try:
snapshot = ec2.create_snapshot(volume_id, description=description)
+ if wait:
+ snapshot.update()
+ while snapshot.status != 'completed':
+ time.sleep(3)
+ snapshot.update()
+ for k, v in snapshot_tags.items():
+ snapshot.add_tag(k, v)
except boto.exception.BotoServerError, e:
module.fail_json(msg = "%s: %s" % (e.error_code, e.error_message))
- module.exit_json(changed=True, snapshot_id=snapshot.id)
+ module.exit_json(changed=True, snapshot_id=snapshot.id, volume_id=snapshot.volume_id,
+ volume_size=snapshot.volume_size, tags=snapshot.tags.copy())
# import module snippets
from ansible.module_utils.basic import *
From dbd18bfe3efbda3297ab630bddf274f0ca841b56 Mon Sep 17 00:00:00 2001
From: Hagai <hagai@bigpanda.io>
Date: Mon, 10 Mar 2014 19:15:01 +0200
Subject: [PATCH 2/2] Added wait_timeout option
---
cloud/ec2_snapshot | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/cloud/ec2_snapshot b/cloud/ec2_snapshot
index 1bf4f8b509e..0b499e47765 100644
--- a/cloud/ec2_snapshot
+++ b/cloud/ec2_snapshot
@@ -125,6 +125,7 @@ def main():
ec2_secret_key = dict(aliases=['aws_secret_key', 'secret_key'], no_log=True),
ec2_access_key = dict(aliases=['aws_access_key', 'access_key']),
wait = dict(choices=BOOLEANS, default='true'),
+ wait_timeout = dict(type='number', default=0),
snapshot_tags = dict(type='dict', default=dict()),
)
)
@@ -134,6 +135,7 @@ def main():
instance_id = module.params.get('instance_id')
device_name = module.params.get('device_name')
wait = module.params.get('wait')
+ wait_timeout = module.params.get('wait_timeout')
snapshot_tags = module.params.get('snapshot_tags')
if not volume_id and not instance_id or volume_id and instance_id:
@@ -154,11 +156,15 @@ def main():
try:
snapshot = ec2.create_snapshot(volume_id, description=description)
+ time_waited = 0
if wait:
snapshot.update()
while snapshot.status != 'completed':
time.sleep(3)
snapshot.update()
+ time_waited += 3
+ if wait_timeout and time_waited > wait_timeout:
+ module.fail_json('Timed out while creating snapshot.')
for k, v in snapshot_tags.items():
snapshot.add_tag(k, v)
except boto.exception.BotoServerError, e: