From 85bef580e30df628872f3a7333c72f037fb73290 Mon Sep 17 00:00:00 2001 From: jwcolbert Date: Wed, 16 Aug 2017 14:43:31 -0500 Subject: [PATCH] Updated logic and increased timeout --- clc_ansible_module/clc_server_snapshot.py | 10 ++++++---- setup.py | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/clc_ansible_module/clc_server_snapshot.py b/clc_ansible_module/clc_server_snapshot.py index 991cb16..b87ef61 100644 --- a/clc_ansible_module/clc_server_snapshot.py +++ b/clc_ansible_module/clc_server_snapshot.py @@ -314,14 +314,16 @@ def _delete_server_snapshot(self, server, ignore_failures): server.id, ex.message )) - t_end = time.time() + 300 + t_end = time.time() + 600 while time.time() < t_end: if len(self.clc.v2.Server(server).GetSnapshots()) == 0: break if len(self.clc.v2.Server(server).GetSnapshots()) != 0: - self.module.fail_json(msg='Failed to delete snapshot for server : {0}. {1}'.format( - server.id, ex.message)) - + if ignore_failures: + return None + else: + self.module.fail_json(msg='Failed to delete snapshot for server : {0}.'.format( + server.id)) return result def ensure_server_snapshot_restore(self, server_ids, ignore_failures): diff --git a/setup.py b/setup.py index 626af49..b1f3ea8 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ setup( name='clc-ansible-module', - version='1.1.23', + version='1.1.24', description='Centurylink Cloud Ansible Modules', author='CenturyLink Cloud', author_email='WFAAS-LLFT@centurylink.com',