Merge pull request #5289 from rstrox/devel

rax: import novaclient.exceptions for cs.images.find
pull/5349/head
jctanner 11 years ago
commit 320d41149a

@ -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)

Loading…
Cancel
Save