openstack/ansible-collections-openstack
Code Issues Proposed changes

Merge "keypair: make use of OpenStackModule class"

Browse Source
This commit is contained in:
Zuul 2020-07-09 14:30:16 +00:00 committed by Gerrit Code Review
commit 4a930cf0ec
1 changed files with 36 additions and 41 deletions

77
plugins/modules/keypair.py

@ -79,23 +79,14 @@ private_key:
type: str type: str
''' '''
from ansible.module_utils.basic import AnsibleModule from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (
from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec, OpenStackModule)
openstack_module_kwargs,
openstack_cloud_from_module)
def _system_state_change(module, keypair): class KeyPairModule(OpenStackModule):
state = module.params['state'] deprecated_names = ('os_keypair', 'openstack.cloud.os_keypair')
if state == 'present' and not keypair:
return True
if state == 'absent' and keypair:
return True
return False
argument_spec = dict(
def main():
argument_spec = openstack_full_argument_spec(
name=dict(required=True), name=dict(required=True),
public_key=dict(default=None), public_key=dict(default=None),
public_key_file=dict(default=None), public_key_file=dict(default=None),
@ -103,58 +94,62 @@ def main():
choices=['absent', 'present', 'replace']), choices=['absent', 'present', 'replace']),
) )
module_kwargs = openstack_module_kwargs( module_kwargs = dict(
mutually_exclusive=[['public_key', 'public_key_file']]) mutually_exclusive=[['public_key', 'public_key_file']])
module = AnsibleModule(argument_spec, def _system_state_change(self, keypair):
supports_check_mode=True, state = self.params['state']
**module_kwargs) if state == 'present' and not keypair:
return True
if state == 'absent' and keypair:
return True
return False
state = module.params['state'] def run(self):
name = module.params['name']
public_key = module.params['public_key']
if module.params['public_key_file']: state = self.params['state']
with open(module.params['public_key_file']) as public_key_fh: name = self.params['name']
public_key = public_key_fh.read().rstrip() public_key = self.params['public_key']
sdk, cloud = openstack_cloud_from_module(module) if self.params['public_key_file']:
try: with open(self.params['public_key_file']) as public_key_fh:
keypair = cloud.get_keypair(name) public_key = public_key_fh.read().rstrip()
if module.check_mode: keypair = self.conn.get_keypair(name)
module.exit_json(changed=_system_state_change(module, keypair))
if self.ansible.check_mode:
self.exit_json(changed=self._system_state_change(keypair))
if state in ('present', 'replace'): if state in ('present', 'replace'):
if keypair and keypair['name'] == name: if keypair and keypair['name'] == name:
if public_key and (public_key != keypair['public_key']): if public_key and (public_key != keypair['public_key']):
if state == 'present': if state == 'present':
module.fail_json( self.fail_json(
msg="Key name %s present but key hash not the same" msg="Key name %s present but key hash not the same"
" as offered. Delete key first." % name " as offered. Delete key first." % name
) )
else: else:
cloud.delete_keypair(name) self.conn.delete_keypair(name)
keypair = cloud.create_keypair(name, public_key) keypair = self.conn.create_keypair(name, public_key)
changed = True changed = True
else: else:
changed = False changed = False
else: else:
keypair = cloud.create_keypair(name, public_key) keypair = self.conn.create_keypair(name, public_key)
changed = True changed = True
module.exit_json(changed=changed, self.exit_json(changed=changed, key=keypair, id=keypair['id'])
key=keypair,
id=keypair['id'])
elif state == 'absent': elif state == 'absent':
if keypair: if keypair:
cloud.delete_keypair(name) self.conn.delete_keypair(name)
module.exit_json(changed=True) self.exit_json(changed=True)
module.exit_json(changed=False) self.exit_json(changed=False)
except sdk.exceptions.OpenStackCloudException as e:
module.fail_json(msg=str(e)) def main():
module = KeyPairModule()
module()
if __name__ == '__main__': if __name__ == '__main__':