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

Use rax_to_dict and make sure to return the volume details after deletion

Browse source
This commit is contained in:
Matt Martz 2015-01-19 10:54:22 -06:00 committed by Matt Clay
parent 02a1cb62df
commit 63e5d5dcc4
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/cloud/rackspace/rax_cbs.py
View file

@ -145,10 +145,7 @@ def cloud_block_storage(module, state, name, description, meta, size,
attempts=attempts) attempts=attempts)
volume.get() volume.get()
for key, value in vars(volume).iteritems(): instance = rax_to_dict(volume)
if (isinstance(value, NON_CALLABLES) and
not key.startswith('_')):
instance[key] = value
result = dict(changed=changed, volume=instance) result = dict(changed=changed, volume=instance)
@ -164,6 +161,7 @@ def cloud_block_storage(module, state, name, description, meta, size,
elif state == 'absent': elif state == 'absent':
if volume: if volume:
instance = rax_to_dict(volume)
try: try:
volume.delete() volume.delete()
changed = True changed = True