Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rax: import novaclient.exceptions for cs.images.find #5289

Merged
merged 2 commits into from Dec 17, 2013
Merged

rax: import novaclient.exceptions for cs.images.find #5289

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3007a8a
import novaclient.exceptions for cs.images.find
Dec 13, 2013
038d030
catch exposed cs.exceptions instead of novaclient
Dec 16, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions library/cloud/rax
View file
Open in desktop
Expand Up @@ -366,12 +366,12 @@ def cloudservers(module, state, name, flavor, image, meta, key_name, files,
except ValueError:
try:
image = cs.images.find(human_id=image)
except (pyrax.exceptions.NotFound,
pyrax.exceptions.NoUniqueMatch):
except(cs.exceptions.NotFound,
cs.exceptions.NoUniqueMatch):
try:
image = cs.images.find(name=image)
except (pyrax.exceptions.NotFound,
pyrax.exceptions.NoUniqueMatch):
except (cs.exceptions.NotFound,
cs.exceptions.NoUniqueMatch):
module.fail_json(msg='No matching image found (%s)' %
image)

Expand Down