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
8a5675ca
Commit
8a5675ca
authored
Aug 19, 2014
by
James Cammarata
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing no_log for the playbook level use
Fixes #8647
parent
8648fa17
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
lib/ansible/playbook/play.py
+4
-2
lib/ansible/playbook/task.py
+1
-1
No files found.
lib/ansible/playbook/play.py
View file @
8a5675ca
...
@@ -37,7 +37,8 @@ class Play(object):
...
@@ -37,7 +37,8 @@ class Play(object):
'handlers'
,
'remote_user'
,
'remote_port'
,
'included_roles'
,
'accelerate'
,
'handlers'
,
'remote_user'
,
'remote_port'
,
'included_roles'
,
'accelerate'
,
'accelerate_port'
,
'accelerate_ipv6'
,
'sudo'
,
'sudo_user'
,
'transport'
,
'playbook'
,
'accelerate_port'
,
'accelerate_ipv6'
,
'sudo'
,
'sudo_user'
,
'transport'
,
'playbook'
,
'tags'
,
'gather_facts'
,
'serial'
,
'_ds'
,
'_handlers'
,
'_tasks'
,
'tags'
,
'gather_facts'
,
'serial'
,
'_ds'
,
'_handlers'
,
'_tasks'
,
'basedir'
,
'any_errors_fatal'
,
'roles'
,
'max_fail_pct'
,
'_play_hosts'
,
'su'
,
'su_user'
,
'vault_password'
'basedir'
,
'any_errors_fatal'
,
'roles'
,
'max_fail_pct'
,
'_play_hosts'
,
'su'
,
'su_user'
,
'vault_password'
,
'no_log'
,
]
]
# to catch typos and so forth -- these are userland names
# to catch typos and so forth -- these are userland names
...
@@ -47,7 +48,7 @@ class Play(object):
...
@@ -47,7 +48,7 @@ class Play(object):
'tasks'
,
'handlers'
,
'remote_user'
,
'user'
,
'port'
,
'include'
,
'accelerate'
,
'accelerate_port'
,
'accelerate_ipv6'
,
'tasks'
,
'handlers'
,
'remote_user'
,
'user'
,
'port'
,
'include'
,
'accelerate'
,
'accelerate_port'
,
'accelerate_ipv6'
,
'sudo'
,
'sudo_user'
,
'connection'
,
'tags'
,
'gather_facts'
,
'serial'
,
'sudo'
,
'sudo_user'
,
'connection'
,
'tags'
,
'gather_facts'
,
'serial'
,
'any_errors_fatal'
,
'roles'
,
'role_names'
,
'pre_tasks'
,
'post_tasks'
,
'max_fail_percentage'
,
'any_errors_fatal'
,
'roles'
,
'role_names'
,
'pre_tasks'
,
'post_tasks'
,
'max_fail_percentage'
,
'su'
,
'su_user'
,
'vault_password'
'su'
,
'su_user'
,
'vault_password'
,
'no_log'
,
]
]
# *************************************************
# *************************************************
...
@@ -139,6 +140,7 @@ class Play(object):
...
@@ -139,6 +140,7 @@ class Play(object):
self
.
max_fail_pct
=
int
(
ds
.
get
(
'max_fail_percentage'
,
100
))
self
.
max_fail_pct
=
int
(
ds
.
get
(
'max_fail_percentage'
,
100
))
self
.
su
=
ds
.
get
(
'su'
,
self
.
playbook
.
su
)
self
.
su
=
ds
.
get
(
'su'
,
self
.
playbook
.
su
)
self
.
su_user
=
ds
.
get
(
'su_user'
,
self
.
playbook
.
su_user
)
self
.
su_user
=
ds
.
get
(
'su_user'
,
self
.
playbook
.
su_user
)
self
.
no_log
=
utils
.
boolean
(
ds
.
get
(
'no_log'
,
'false'
))
# gather_facts is not a simple boolean, as None means that a 'smart'
# gather_facts is not a simple boolean, as None means that a 'smart'
# fact gathering mode will be used, so we need to be careful here as
# fact gathering mode will be used, so we need to be careful here as
...
...
lib/ansible/playbook/task.py
View file @
8a5675ca
...
@@ -122,7 +122,7 @@ class Task(object):
...
@@ -122,7 +122,7 @@ class Task(object):
self
.
su
=
utils
.
boolean
(
ds
.
get
(
'su'
,
play
.
su
))
self
.
su
=
utils
.
boolean
(
ds
.
get
(
'su'
,
play
.
su
))
self
.
environment
=
ds
.
get
(
'environment'
,
{})
self
.
environment
=
ds
.
get
(
'environment'
,
{})
self
.
role_name
=
role_name
self
.
role_name
=
role_name
self
.
no_log
=
utils
.
boolean
(
ds
.
get
(
'no_log'
,
"false"
))
self
.
no_log
=
utils
.
boolean
(
ds
.
get
(
'no_log'
,
"false"
))
or
self
.
play
.
no_log
self
.
run_once
=
utils
.
boolean
(
ds
.
get
(
'run_once'
,
'false'
))
self
.
run_once
=
utils
.
boolean
(
ds
.
get
(
'run_once'
,
'false'
))
#Code to allow do until feature in a Task
#Code to allow do until feature in a Task
...
...
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