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
b76cb8f6
Commit
b76cb8f6
authored
Jul 15, 2015
by
Brian Coca
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
now that invocation is only async again, no need to sanitize
parent
2d870b71
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
20 deletions
+3
-20
lib/ansible/constants.py
+0
-1
lib/ansible/executor/process/result.py
+1
-5
lib/ansible/plugins/callback/__init__.py
+2
-14
No files found.
lib/ansible/constants.py
View file @
b76cb8f6
...
...
@@ -235,4 +235,3 @@ DEFAULT_SUBSET = None
DEFAULT_SU_PASS
=
None
VAULT_VERSION_MIN
=
1.0
VAULT_VERSION_MAX
=
1.0
RESULT_SANITIZE
=
frozenset
([
'warnings'
])
lib/ansible/executor/process/result.py
View file @
b76cb8f6
...
...
@@ -33,7 +33,6 @@ try:
except
ImportError
:
HAS_ATFORK
=
False
from
ansible
import
constants
as
C
from
ansible.playbook.handler
import
Handler
from
ansible.playbook.task
import
Task
...
...
@@ -108,10 +107,7 @@ class ResultProcess(multiprocessing.Process):
# if this task is registering a result, do it now
if
result
.
_task
.
register
:
res
=
{}
for
k
in
set
(
result
.
_result
.
keys
())
.
difference
(
C
.
RESULT_SANITIZE
):
res
[
k
]
=
result
.
_result
[
k
]
self
.
_send_result
((
'register_host_var'
,
result
.
_host
,
result
.
_task
.
register
,
res
))
self
.
_send_result
((
'register_host_var'
,
result
.
_host
,
result
.
_task
.
register
,
result
.
_result
))
# send callbacks, execute other options based on the result status
# FIXME: this should all be cleaned up and probably moved to a sub-function.
...
...
lib/ansible/plugins/callback/__init__.py
View file @
b76cb8f6
...
...
@@ -21,8 +21,6 @@ __metaclass__ = type
import
json
from
ansible
import
constants
as
C
__all__
=
[
"CallbackBase"
]
...
...
@@ -45,18 +43,8 @@ class CallbackBase:
version
=
getattr
(
self
,
'CALLBACK_VERSION'
,
'unknwon'
)
self
.
_display
.
vvvv
(
'Loaded callback
%
s of type
%
s, v
%
s'
%
(
name
,
ctype
,
version
))
def
_dump_results
(
self
,
result
,
sanitize
=
True
,
indent
=
4
,
sort_keys
=
True
):
if
sanitize
:
res
=
self
.
_sanitize_result
(
result
)
else
:
res
=
result
return
json
.
dumps
(
res
,
indent
=
indent
,
ensure_ascii
=
False
,
sort_keys
=
sort_keys
)
def
_sanitize_result
(
self
,
result
):
res
=
{}
for
k
in
set
(
result
.
keys
())
.
difference
(
C
.
RESULT_SANITIZE
):
res
[
k
]
=
result
[
k
]
return
res
def
_dump_results
(
self
,
result
,
indent
=
4
,
sort_keys
=
True
):
return
json
.
dumps
(
result
,
indent
=
indent
,
ensure_ascii
=
False
,
sort_keys
=
sort_keys
)
def
set_connection_info
(
self
,
conn_info
):
pass
...
...
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