Merge branch 'BANS-246' into 'rc-5.2.6'
Fix call of AnsibleModule.fail_json method in decort_disk.__init__ method. See merge request rudecs/dev/decort-ansible!32
This commit is contained in:
@@ -276,7 +276,7 @@ class decort_disk(DecortController):
|
|||||||
self.result['msg'] = ("Current user does not have access to the account ID {} / "
|
self.result['msg'] = ("Current user does not have access to the account ID {} / "
|
||||||
"name '{}' or non-existent account specified.").format(arg_amodule.params['account_id'],
|
"name '{}' or non-existent account specified.").format(arg_amodule.params['account_id'],
|
||||||
arg_amodule.params['account_name'])
|
arg_amodule.params['account_name'])
|
||||||
self.fail_json(**self.result)
|
self.amodule.fail_json(**self.result)
|
||||||
else:
|
else:
|
||||||
self.acc_id = validated_acc_id
|
self.acc_id = validated_acc_id
|
||||||
self.acc_info = validated_acc_info
|
self.acc_info = validated_acc_info
|
||||||
@@ -289,7 +289,7 @@ class decort_disk(DecortController):
|
|||||||
else:
|
else:
|
||||||
self.result['failed'] = True
|
self.result['failed'] = True
|
||||||
self.result['msg'] = ("Cannot manage Disk when its ID is 0 and name is empty")
|
self.result['msg'] = ("Cannot manage Disk when its ID is 0 and name is empty")
|
||||||
self.fail_json(**self.result)
|
self.amodule.fail_json(**self.result)
|
||||||
|
|
||||||
if arg_amodule.params['place_with']:
|
if arg_amodule.params['place_with']:
|
||||||
image_id, image_facts = self.image_find(arg_amodule.params['place_with'], "", 0)
|
image_id, image_facts = self.image_find(arg_amodule.params['place_with'], "", 0)
|
||||||
|
|||||||
Reference in New Issue
Block a user