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
b0eedfbf
Commit
b0eedfbf
authored
Jul 20, 2012
by
Michael DeHaan
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #639 from goozbach/issue-627
improved output in with_items fixes: #627
parents
85b9fa58
34e25842
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
6 deletions
+30
-6
lib/ansible/callbacks.py
+29
-6
lib/ansible/runner/__init__.py
+1
-0
No files found.
lib/ansible/callbacks.py
View file @
b0eedfbf
...
...
@@ -248,27 +248,50 @@ class PlaybookRunnerCallbacks(DefaultRunnerCallbacks):
def
on_unreachable
(
self
,
host
,
msg
):
print
"fatal: [
%
s] =>
%
s"
%
(
host
,
msg
)
item
=
msg
.
get
(
'item'
,
None
)
if
item
:
print
"fatal: [
%
s] => (item=
%
s) =>
%
s"
%
(
host
,
item
,
msg
)
else
:
print
"fatal: [
%
s] =>
%
s"
%
(
host
,
msg
)
def
on_failed
(
self
,
host
,
results
):
print
"failed: [
%
s] =>
%
s"
%
(
host
,
utils
.
jsonify
(
results
))
item
=
results
.
get
(
'item'
,
None
)
if
item
:
print
"failed: [
%
s] => (item=
%
s) =>
%
s"
%
(
host
,
item
,
utils
.
jsonify
(
results
))
else
:
print
"failed: [
%
s] =>
%
s"
%
(
host
,
utils
.
jsonify
(
results
))
def
on_ok
(
self
,
host
,
host_result
):
item
=
host_result
.
get
(
'item'
,
None
)
# show verbose output for non-setup module results if --verbose is used
if
not
self
.
verbose
or
host_result
.
get
(
"verbose_override"
,
None
)
is
not
None
:
print
"ok: [
%
s]"
%
(
host
)
if
item
:
print
"ok: [
%
s] => (item=
%
s)"
%
(
host
,
item
)
else
:
print
"ok: [
%
s]"
%
(
host
)
else
:
print
"ok: [
%
s] =>
%
s"
%
(
host
,
utils
.
jsonify
(
host_result
))
if
item
:
print
"ok: [
%
s] => (item=
%
s) =>
%
s"
%
(
host
,
item
,
utils
.
jsonify
(
host_result
))
else
:
print
"ok: [
%
s] =>
%
s"
%
(
host
,
utils
.
jsonify
(
host_result
))
def
on_error
(
self
,
host
,
err
):
print
>>
sys
.
stderr
,
"err: [
%
s] =>
%
s"
%
(
host
,
err
)
item
=
err
.
get
(
'item'
,
None
)
if
item
:
print
>>
sys
.
stderr
,
"err: [
%
s] => (item=
%
s) =>
%
s"
%
(
host
,
item
,
err
)
else
:
print
>>
sys
.
stderr
,
"err: [
%
s] =>
%
s"
%
(
host
,
err
)
def
on_skipped
(
self
,
host
):
print
"skipping: [
%
s]"
%
host
print
"skipping: [
%
s]"
%
host
def
on_no_hosts
(
self
):
...
...
lib/ansible/runner/__init__.py
View file @
b0eedfbf
...
...
@@ -646,6 +646,7 @@ class Runner(object):
self
.
callbacks
.
on_unreachable
(
host
,
result
.
result
)
else
:
data
=
result
.
result
result
.
result
[
'item'
]
=
inject
.
get
(
'item'
,
None
)
if
'skipped'
in
data
:
self
.
callbacks
.
on_skipped
(
result
.
host
)
elif
not
result
.
is_successful
():
...
...
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