summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael DeHaan <michael.dehaan@gmail.com>2012-07-11 17:42:39 -0700
committerMichael DeHaan <michael.dehaan@gmail.com>2012-07-11 17:42:39 -0700
commitdc4ebab3454251cb2c692e1f2aeec36ece27c866 (patch)
tree9c27bf2a8ca502f5a950df34a66b5f9fa8111a3e
parent969c3feb13393af7ad2e0c36ad198d5ab99abf98 (diff)
parent7ecdb83800321cb5c54cf8e81f9d0fae1525a446 (diff)
downloadansible-dc4ebab3454251cb2c692e1f2aeec36ece27c866.tar.gz
Merge pull request #576 from davehatton/adjust_playbook_output_formating
improve output formating for playbook
-rwxr-xr-xbin/ansible-playbook2
-rw-r--r--lib/ansible/callbacks.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/ansible-playbook b/bin/ansible-playbook
index 4fac717c36..ace86146c5 100755
--- a/bin/ansible-playbook
+++ b/bin/ansible-playbook
@@ -91,7 +91,7 @@ def main(args):
print callbacks.banner("PLAY RECAP")
for h in hosts:
t = pb.stats.summarize(h)
- print "%-30s : ok=%4s changed=%4s unreachable=%4s failed=%4s " % (h,
+ print "%-30s : ok=%-4s changed=%-4s unreachable=%-4s failed=%-4s " % (h,
t['ok'], t['changed'], t['unreachable'], t['failures']
)
print "\n"
diff --git a/lib/ansible/callbacks.py b/lib/ansible/callbacks.py
index 8921a99423..7bbbf39793 100644
--- a/lib/ansible/callbacks.py
+++ b/lib/ansible/callbacks.py
@@ -84,7 +84,7 @@ def banner(msg):
(out, err) = cmd.communicate()
res = "%s\n" % out
else:
- res = "%s ********************* \n" % msg
+ res = "\n%s ********************* " % msg
return res
@@ -190,7 +190,7 @@ class PlaybookRunnerCallbacks(DefaultRunnerCallbacks):
def on_ok(self, host, host_result):
# 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]\n" % (host)
+ print "ok: [%s]" % (host)
else:
print "ok: [%s] => %s" % (host, utils.smjson(host_result))
@@ -225,7 +225,7 @@ class PlaybookCallbacks(object):
self.verbose = verbose
def on_start(self):
- print "\n"
+ pass
def on_notify(self, host, handler):
pass