internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 13:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing open stack compile time errors irt exception handling for Python 3 (#3848)

Browse Source
This commit is contained in:
@
2016-06-03 06:37:09 -07:00
committed by Matt Clay
parent 13bebda244
commit 7960e99310
11 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ansible/modules/cloud/openstack/_nova_keypair.py
View File

@@ -107,9 +107,9 @@ def main():
service_type='compute')
try:
nova.authenticate()
except exc.Unauthorized, e:
except exc.Unauthorized as e:
module.fail_json(msg = "Invalid OpenStack Nova credentials.: %s" % e.message)
except exc.AuthorizationFailure, e:
except exc.AuthorizationFailure as e:
module.fail_json(msg = "Unable to authorize user: %s" % e.message)
if module.params['state'] == 'present':
@@ -121,7 +121,7 @@ def main():
module.exit_json(changed = False, result = "Key present")
try:
key = nova.keypairs.create(module.params['name'], module.params['public_key'])
except Exception, e:
except Exception as e:
module.exit_json(msg = "Error in creating the keypair: %s" % e.message)
if not module.params['public_key']:
module.exit_json(changed = True, key = key.private_key)
@@ -131,7 +131,7 @@ def main():
if key.name == module.params['name']:
try:
nova.keypairs.delete(module.params['name'])
except Exception, e:
except Exception as e:
module.fail_json(msg = "The keypair deletion has failed: %s" % e.message)
module.exit_json( changed = True, result = "deleted")
module.exit_json(changed = False, result = "not present")