diff options
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/ansible | 13 | ||||
-rwxr-xr-x | bin/ansible-playbook | 11 |
2 files changed, 14 insertions, 10 deletions
diff --git a/bin/ansible b/bin/ansible index 9c90b3a79a..1704a45869 100755 --- a/bin/ansible +++ b/bin/ansible @@ -34,6 +34,7 @@ import ansible.runner import ansible.playbook import ansible.constants as C from ansible.utils import * +from ansible.errors import * ######################################################## @@ -193,7 +194,11 @@ class Cli(object): if __name__ == '__main__': cli = Cli() (options, args) = cli.parse() - (runner, results) = cli.run(options, args) - cli.output(runner, results, options, args) - - + try: + (runner, results) = cli.run(options, args) + except AnsibleError as e: + # Generic handler for ansible specific errors + print e + sys.exit(1) + else: + cli.output(runner, results, options, args) diff --git a/bin/ansible-playbook b/bin/ansible-playbook index c91a17bac5..6e2a65b9ef 100755 --- a/bin/ansible-playbook +++ b/bin/ansible-playbook @@ -96,15 +96,14 @@ def main(args): remote_pass=sshpass, callbacks=PlaybookCallbacks() ) - pb.run() + try: + pb.run() + except AnsibleError as e: + print e + return 1 return 0 if __name__ == "__main__": sys.exit(main(sys.argv[1:])) - - - - - |