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
21d2069a
Commit
21d2069a
authored
Aug 21, 2013
by
Alek Storm
Committed by
James Cammarata
Aug 22, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support multiple --extra-vars flags
parent
af4f0bd0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
bin/ansible-playbook
+9
-9
No files found.
bin/ansible-playbook
View file @
21d2069a
...
...
@@ -61,8 +61,8 @@ def main(args):
check_opts
=
True
,
diff_opts
=
True
)
parser
.
add_option
(
'-e'
,
'--extra-vars'
,
dest
=
"extra_vars"
,
default
=
None
,
help
=
"set additional
key=value variables from the CLI"
)
parser
.
add_option
(
'-e'
,
'--extra-vars'
,
dest
=
"extra_vars"
,
action
=
"append"
,
help
=
"set additional
variables as key=value or JSON"
,
default
=
[]
)
parser
.
add_option
(
'-t'
,
'--tags'
,
dest
=
'tags'
,
default
=
'all'
,
help
=
"only run plays and tasks tagged with these values"
)
parser
.
add_option
(
'--skip-tags'
,
dest
=
'skip_tags'
,
...
...
@@ -99,17 +99,17 @@ def main(args):
options
.
sudo_user
=
options
.
sudo_user
or
C
.
DEFAULT_SUDO_USER
extra_vars
=
{}
if
options
.
extra_vars
:
if
options
.
extra_vars
.
startswith
(
"@"
):
for
extra_vars_opt
in
options
.
extra_vars
:
if
extra_vars_opt
.
startswith
(
"@"
):
# Argument is a JSON file
with
open
(
options
.
extra_vars
[
1
:])
as
fd
:
extra_vars
=
utils
.
json_loads
(
fd
.
read
(
))
elif
options
.
extra_vars
[
0
]
in
'[{'
:
with
open
(
extra_vars_opt
[
1
:])
as
fd
:
extra_vars
=
utils
.
combine_vars
(
extra_vars
,
utils
.
json_loads
(
fd
.
read
()
))
elif
extra_vars_opt
[
0
]
in
'[{'
:
# Arguments as JSON
extra_vars
=
utils
.
json_loads
(
options
.
extra_vars
)
extra_vars
=
utils
.
combine_vars
(
extra_vars
,
utils
.
json_loads
(
extra_vars_opt
)
)
else
:
# Arguments as Key-value
extra_vars
=
utils
.
parse_kv
(
options
.
extra_vars
)
extra_vars
=
utils
.
combine_vars
(
extra_vars
,
utils
.
parse_kv
(
extra_vars_opt
)
)
only_tags
=
options
.
tags
.
split
(
","
)
skip_tags
=
options
.
skip_tags
...
...
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