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

openstack: Correct fail_json call in module_utils (#41064)

Browse source 
Fixes: #40925

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Abhijeet Kasurde 2018-06-04 13:48:15 +05:30 • committed by Martin Krizek
parent 4d200fb5ac
commit 13c7d149bb
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/module_utils/openstack.py
View file

@ -136,9 +136,9 @@ def openstack_cloud_from_module(module, min_version='0.12.0'):
'auth', 'region_name', 'verify', 'auth', 'region_name', 'verify',
'cacert', 'key', 'api_timeout', 'interface'): 'cacert', 'key', 'api_timeout', 'interface'):
if module.params[param] is not None: if module.params[param] is not None:
module.fail_json(fail_message.format(param=param)) module.fail_json(msg=fail_message.format(param=param))
if module.params['auth_type'] != 'password': if module.params['auth_type'] != 'password':
module.fail_json(fail_message.format(param='auth_type')) module.fail_json(msg=fail_message.format(param='auth_type'))
return sdk, sdk.connect(**cloud_config) return sdk, sdk.connect(**cloud_config)
else: else:
return sdk, sdk.connect( return sdk, sdk.connect(