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

Don't import novaclient, exceptions are available via cs.exceptions

Browse source
This commit is contained in:
Matt Martz 2013-12-13 19:34:33 -06:00
parent 77377be11c
commit 6443d90808
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cloud/rax_keypair
View file

@ -98,8 +98,6 @@ except ImportError:
print("failed=True msg='pyrax required for this module'") print("failed=True msg='pyrax required for this module'")
sys.exit(1) sys.exit(1)
from novaclient.exceptions import NotFound
NON_CALLABLES = (basestring, bool, dict, int, list, NoneType) NON_CALLABLES = (basestring, bool, dict, int, list, NoneType)
@ -121,7 +119,7 @@ def rax_keypair(module, name, public_key, state):
if state == 'present': if state == 'present':
try: try:
keypair = cs.keypairs.find(name=name) keypair = cs.keypairs.find(name=name)
except NotFound: except cs.exceptions.NotFound:
try: try:
keypair = cs.keypairs.create(name, public_key) keypair = cs.keypairs.create(name, public_key)
changed = True changed = True