ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-20 03:40:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #4065 from CharlesBlonde/nova_wait_for_bug

Browse source 
Nova_compute wait_for fixes
This commit is contained in:
Michael DeHaan 2013-09-09 07:48:21 -07:00
commit 59099b7607
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
library/cloud/nova_compute
View file

@ -135,7 +135,7 @@ def _delete_server(module, nova):
module.fail_json( msg = "Error in deleting vm: %s" % e.message) module.fail_json( msg = "Error in deleting vm: %s" % e.message)
if module.params['wait'] == 'no': if module.params['wait'] == 'no':
module.exit_json(changed = True, result = "deleted") module.exit_json(changed = True, result = "deleted")
expire = time.time() + module.params['wait_for'] expire = time.time() + int(module.params['wait_for'])
while time.time() < expire: while time.time() < expire:
name = nova.servers.list(True, {'name': module.params['name']}) name = nova.servers.list(True, {'name': module.params['name']})
if not name: if not name:
@ -160,7 +160,7 @@ def _create_server(module, nova):
except Exception as e: except Exception as e:
module.fail_json( msg = "Error in creating instance: %s " % e.message) module.fail_json( msg = "Error in creating instance: %s " % e.message)
if module.params['wait'] == 'yes': if module.params['wait'] == 'yes':
expire = time.time() + module.params['wait_for'] expire = time.time() + int(module.params['wait_for'])
while time.time() < expire: while time.time() < expire:
try: try:
server = nova.servers.get(server.id) server = nova.servers.get(server.id)
@ -220,7 +220,7 @@ def main():
nics = dict(default=None), nics = dict(default=None),
meta = dict(default=None), meta = dict(default=None),
wait = dict(default='yes', choices=['yes', 'no']), wait = dict(default='yes', choices=['yes', 'no']),
wait_for = dict(default=120), wait_for = dict(default=180),
state = dict(default='present', choices=['absent', 'present']) state = dict(default='present', choices=['absent', 'present'])
), ),
) )