cloudstack: cs_volume: simplify detach on state=absent
This commit is contained in:
parent
c6829752d8
commit
56fb7abc65
1 changed files with 3 additions and 6 deletions
|
@ -392,18 +392,15 @@ class AnsibleCloudStackVolume(AnsibleCloudStack):
|
|||
volume = self.get_volume()
|
||||
|
||||
if volume:
|
||||
if 'attached' in volume:
|
||||
if self.module.param.get('force'):
|
||||
self.detached_volume()
|
||||
else:
|
||||
self.module.fail_json(msg="Volume '%s' is attached, use force=true for detaching and removing the volume." % volume.get('name'))
|
||||
if 'attached' in volume and not self.module.param.get('force'):
|
||||
self.module.fail_json(msg="Volume '%s' is attached, use force=true for detaching and removing the volume." % volume.get('name'))
|
||||
|
||||
self.result['changed'] = True
|
||||
if not self.module.check_mode:
|
||||
volume = self.detached_volume()
|
||||
|
||||
res = self.cs.deleteVolume(id=volume['id'])
|
||||
if 'errortext' in volume:
|
||||
if 'errortext' in res:
|
||||
self.module.fail_json(msg="Failed: '%s'" % res['errortext'])
|
||||
poll_async = self.module.params.get('poll_async')
|
||||
if poll_async:
|
||||
|
|
Loading…
Reference in a new issue