cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'exit-3-on-dark' of https://github.com/j2sol/ansible into j2sol-exit-3-on-dark

Browse source
This commit is contained in:
James Cammarata 2013-08-22 22:03:34 -05:00
commit d9be910e6e
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/ansible
View file

@ -159,7 +159,7 @@ if __name__ == '__main__':
if 'failed' in result or result.get('rc', 0) != 0: if 'failed' in result or result.get('rc', 0) != 0:
sys.exit(2) sys.exit(2)
if results['dark']: if results['dark']:
sys.exit(2) sys.exit(3)
except errors.AnsibleError, e: except errors.AnsibleError, e:
# Generic handler for ansible specific errors # Generic handler for ansible specific errors
callbacks.display("ERROR: %s" % str(e), stderr=True, color='red') callbacks.display("ERROR: %s" % str(e), stderr=True, color='red')

13
bin/ansible-playbook
View file

@ -201,6 +201,7 @@ def main(args):
return 0 return 0
failed_hosts = [] failed_hosts = []
unreachable_hosts = []
try: try:
@ -212,11 +213,15 @@ def main(args):
for h in hosts: for h in hosts:
t = pb.stats.summarize(h) t = pb.stats.summarize(h)
if t['unreachable'] > 0 or t['failures'] > 0: if t['failures'] > 0:
failed_hosts.append(h) failed_hosts.append(h)
if t['unreachable'] > 0:
unreachable_hosts.append(h)
if len(failed_hosts) > 0: retries = failed_hosts + unreachable_hosts
filename = pb.generate_retry_inventory(failed_hosts)
if len(retries) > 0:
filename = pb.generate_retry_inventory(retries)
if filename: if filename:
display(" to retry, use: --limit @%s\n" % filename) display(" to retry, use: --limit @%s\n" % filename)
@ -245,6 +250,8 @@ def main(args):
print "" print ""
if len(failed_hosts) > 0: if len(failed_hosts) > 0:
return 2 return 2
if len(unreachable_hosts) > 0:
return 3
except errors.AnsibleError, e: except errors.AnsibleError, e:
display("ERROR: %s" % e, color='red') display("ERROR: %s" % e, color='red')