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

Merge pull request #5289 from rstrox/devel

Browse source 
rax: import novaclient.exceptions for cs.images.find
This commit is contained in:
jctanner 2013-12-17 14:04:05 -08:00
commit 320d41149a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/cloud/rax
View file

@ -366,12 +366,12 @@ def cloudservers(module, state, name, flavor, image, meta, key_name, files,
except ValueError: except ValueError:
try: try:
image = cs.images.find(human_id=image) image = cs.images.find(human_id=image)
except (pyrax.exceptions.NotFound, except(cs.exceptions.NotFound,
pyrax.exceptions.NoUniqueMatch): cs.exceptions.NoUniqueMatch):
try: try:
image = cs.images.find(name=image) image = cs.images.find(name=image)
except (pyrax.exceptions.NotFound, except (cs.exceptions.NotFound,
pyrax.exceptions.NoUniqueMatch): cs.exceptions.NoUniqueMatch):
module.fail_json(msg='No matching image found (%s)' % module.fail_json(msg='No matching image found (%s)' %
image) image)