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
48a308a8
Commit
48a308a8
authored
Oct 09, 2014
by
Toshio Kuratomi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow both old-style and new-style role dependencies to be valid.
Fixes #9173
parent
98ed6921
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
94 additions
and
8 deletions
+94
-8
lib/ansible/utils/__init__.py
+30
-8
test/units/TestUtils.py
+64
-0
No files found.
lib/ansible/utils/__init__.py
View file @
48a308a8
...
...
@@ -416,14 +416,36 @@ def role_spec_parse(role_spec):
def
role_yaml_parse
(
role
):
if
'github.com'
in
role
[
"src"
]
and
'http'
in
role
[
"src"
]
and
'+'
not
in
role
[
"src"
]
and
not
role
[
"src"
]
.
endswith
(
'.tar.gz'
):
role
[
"src"
]
=
"git+"
+
role
[
"src"
]
if
'+'
in
role
[
"src"
]:
(
scm
,
src
)
=
role
[
"src"
]
.
split
(
'+'
)
role
[
"scm"
]
=
scm
role
[
"src"
]
=
src
if
'name'
not
in
role
:
role
[
"name"
]
=
repo_url_to_role_name
(
role
[
"src"
])
if
'role'
in
role
:
# Old style: {role: "galaxy.role,version,name", other_vars: "here" }
role_info
=
role_spec_parse
(
role
[
'role'
])
if
isinstance
(
role_info
,
dict
):
# Warning: Slight change in behaviour here. name may be being
# overloaded. Previously, name was only a parameter to the role.
# Now it is both a parameter to the role and the name that
# ansible-galaxy will install under on the local system.
if
'name'
in
role
and
'name'
in
role_info
:
del
role_info
[
'name'
]
role
.
update
(
role_info
)
else
:
# New style: { src: 'galaxy.role,version,name', other_vars: "here" }
if
'github.com'
in
role
[
"src"
]
and
'http'
in
role
[
"src"
]
and
'+'
not
in
role
[
"src"
]
and
not
role
[
"src"
]
.
endswith
(
'.tar.gz'
):
role
[
"src"
]
=
"git+"
+
role
[
"src"
]
if
'+'
in
role
[
"src"
]:
(
scm
,
src
)
=
role
[
"src"
]
.
split
(
'+'
)
role
[
"scm"
]
=
scm
role
[
"src"
]
=
src
if
'name'
not
in
role
:
role
[
"name"
]
=
repo_url_to_role_name
(
role
[
"src"
])
if
'version'
not
in
role
:
role
[
'version'
]
=
''
if
'scm'
not
in
role
:
role
[
'scm'
]
=
None
return
role
...
...
test/units/TestUtils.py
View file @
48a308a8
...
...
@@ -841,3 +841,67 @@ class TestUtils(unittest.TestCase):
for
(
spec
,
result
)
in
tests
:
self
.
assertEqual
(
ansible
.
utils
.
role_spec_parse
(
spec
),
result
)
def
test_role_yaml_parse
(
self
):
tests
=
(
(
# Old style
{
'role'
:
'debops.elasticsearch'
,
'name'
:
'elks'
},
{
'role'
:
'debops.elasticsearch'
,
'name'
:
'elks'
,
'scm'
:
None
,
'src'
:
'debops.elasticsearch'
,
'version'
:
''
,
}
),
(
{
'role'
:
'debops.elasticsearch,1.0,elks'
,
'my_param'
:
'foo'
},
{
'role'
:
'debops.elasticsearch,1.0,elks'
,
'name'
:
'elks'
,
'scm'
:
None
,
'src'
:
'debops.elasticsearch'
,
'version'
:
'1.0'
,
'my_param'
:
'foo'
,
}
),
(
{
'role'
:
'debops.elasticsearch,1.0'
,
'my_param'
:
'foo'
},
{
'role'
:
'debops.elasticsearch,1.0'
,
'name'
:
'debops.elasticsearch'
,
'scm'
:
None
,
'src'
:
'debops.elasticsearch'
,
'version'
:
'1.0'
,
'my_param'
:
'foo'
,
}
),
# New style
(
{
'src'
:
'debops.elasticsearch'
,
'name'
:
'elks'
,
'my_param'
:
'foo'
},
{
'name'
:
'elks'
,
'scm'
:
None
,
'src'
:
'debops.elasticsearch'
,
'version'
:
''
,
'my_param'
:
'foo'
}
),
)
for
(
role
,
result
)
in
tests
:
self
.
assertEqual
(
ansible
.
utils
.
role_yaml_parse
(
role
),
result
)
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