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
af49944a
Commit
af49944a
authored
Jun 27, 2015
by
Brian Coca
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #11398 from resmo/for-ansible
cloudstack: fixes and updates
parents
6daae92e
79527235
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
6 deletions
+24
-6
lib/ansible/module_utils/cloudstack.py
+12
-3
v1/ansible/module_utils/cloudstack.py
+12
-3
No files found.
lib/ansible/module_utils/cloudstack.py
View file @
af49944a
...
...
@@ -77,6 +77,14 @@ class AnsibleCloudStack:
else
:
self
.
cs
=
CloudStack
(
**
read_config
())
def
get_or_fallback
(
self
,
key
=
None
,
fallback_key
=
None
):
value
=
self
.
module
.
params
.
get
(
key
)
if
not
value
:
value
=
self
.
module
.
params
.
get
(
fallback_key
)
return
value
# TODO: for backward compatibility only, remove if not used anymore
def
_has_changed
(
self
,
want_dict
,
current_dict
,
only_keys
=
None
):
return
self
.
has_changed
(
want_dict
=
want_dict
,
current_dict
=
current_dict
,
only_keys
=
only_keys
)
...
...
@@ -266,12 +274,13 @@ class AnsibleCloudStack:
return
None
args
=
{}
args
[
'name'
]
=
domain
args
[
'listall'
]
=
True
domains
=
self
.
cs
.
listDomains
(
**
args
)
if
domains
:
self
.
domain
=
domains
[
'domain'
][
0
]
return
self
.
_get_by_key
(
key
,
self
.
domain
)
for
d
in
domains
[
'domain'
]:
if
d
[
'path'
]
.
lower
()
in
[
domain
.
lower
(),
"root/"
+
domain
.
lower
(),
"root"
+
domain
.
lower
()
]:
self
.
domain
=
d
return
self
.
_get_by_key
(
key
,
self
.
domain
)
self
.
module
.
fail_json
(
msg
=
"Domain '
%
s' not found"
%
domain
)
...
...
v1/ansible/module_utils/cloudstack.py
View file @
af49944a
...
...
@@ -77,6 +77,14 @@ class AnsibleCloudStack:
else
:
self
.
cs
=
CloudStack
(
**
read_config
())
def
get_or_fallback
(
self
,
key
=
None
,
fallback_key
=
None
):
value
=
self
.
module
.
params
.
get
(
key
)
if
not
value
:
value
=
self
.
module
.
params
.
get
(
fallback_key
)
return
value
# TODO: for backward compatibility only, remove if not used anymore
def
_has_changed
(
self
,
want_dict
,
current_dict
,
only_keys
=
None
):
return
self
.
has_changed
(
want_dict
=
want_dict
,
current_dict
=
current_dict
,
only_keys
=
only_keys
)
...
...
@@ -266,12 +274,13 @@ class AnsibleCloudStack:
return
None
args
=
{}
args
[
'name'
]
=
domain
args
[
'listall'
]
=
True
domains
=
self
.
cs
.
listDomains
(
**
args
)
if
domains
:
self
.
domain
=
domains
[
'domain'
][
0
]
return
self
.
_get_by_key
(
key
,
self
.
domain
)
for
d
in
domains
[
'domain'
]:
if
d
[
'path'
]
.
lower
()
in
[
domain
.
lower
(),
"root/"
+
domain
.
lower
(),
"root"
+
domain
.
lower
()
]:
self
.
domain
=
d
return
self
.
_get_by_key
(
key
,
self
.
domain
)
self
.
module
.
fail_json
(
msg
=
"Domain '
%
s' not found"
%
domain
)
...
...
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