wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move the order of argument processing

Browse source
This commit is contained in:
Monty Taylor 2015-06-18 07:59:32 -04:00 committed by Matt Clay
parent 377311db56
commit 869da89b35
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/modules/cloud/openstack/os_keypair.py
View file

@ -84,18 +84,16 @@ def main():
mutually_exclusive=[['public_key', 'public_key_file']]) mutually_exclusive=[['public_key', 'public_key_file']])
module = AnsibleModule(argument_spec, **module_kwargs) module = AnsibleModule(argument_spec, **module_kwargs)
if module.params['public_key_file']:
public_key = open(module.params['public_key_file']).read()
else:
public_key = module.params['public_key']
if not HAS_SHADE:
module.fail_json(msg='shade is required for this module')
state = module.params['state'] state = module.params['state']
name = module.params['name'] name = module.params['name']
public_key = module.params['public_key'] public_key = module.params['public_key']
if module.params['public_key_file']:
public_key = open(module.params['public_key_file']).read()
if not HAS_SHADE:
module.fail_json(msg='shade is required for this module')
try: try:
cloud = shade.openstack_cloud(**module.params) cloud = shade.openstack_cloud(**module.params)