Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
038d0304
Commit
038d0304
authored
Dec 16, 2013
by
Troy C
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
catch exposed cs.exceptions instead of novaclient
parent
3007a8af
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
8 deletions
+4
-8
library/cloud/rax
+4
-8
No files found.
library/cloud/rax
View file @
038d0304
...
...
@@ -162,8 +162,6 @@ except ImportError:
print
(
"failed=True msg='pyrax is required for this module'"
)
sys
.
exit
(
1
)
import
novaclient.exceptions
ACTIVE_STATUSES
=
(
'ACTIVE'
,
'BUILD'
,
'HARD_REBOOT'
,
'MIGRATING'
,
'PASSWORD'
,
'REBOOT'
,
'REBUILD'
,
'RESCUE'
,
'RESIZE'
,
'REVERT_RESIZE'
)
FINAL_STATUSES
=
(
'ACTIVE'
,
'ERROR'
)
...
...
@@ -368,14 +366,12 @@ def cloudservers(module, state, name, flavor, image, meta, key_name, files,
except
ValueError
:
try
:
image
=
cs
.
images
.
find
(
human_id
=
image
)
except
(
novaclient
.
exceptions
.
NotFound
,
pyrax
.
exceptions
.
NotFound
,
pyrax
.
exceptions
.
NoUniqueMatch
):
except
(
cs
.
exceptions
.
NotFound
,
cs
.
exceptions
.
NoUniqueMatch
):
try
:
image
=
cs
.
images
.
find
(
name
=
image
)
except
(
novaclient
.
exceptions
.
NotFound
,
pyrax
.
exceptions
.
NotFound
,
pyrax
.
exceptions
.
NoUniqueMatch
):
except
(
cs
.
exceptions
.
NotFound
,
cs
.
exceptions
.
NoUniqueMatch
):
module
.
fail_json
(
msg
=
'No matching image found (
%
s)'
%
image
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment