1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Merge pull request #28 from tbielawa/DieGracefully

Die gracefully...
This commit is contained in:
Michael DeHaan 2012-03-13 15:35:38 -07:00
commit 8df0c92f3c
5 changed files with 59 additions and 12 deletions

View file

@ -34,6 +34,7 @@ import ansible.runner
import ansible.playbook import ansible.playbook
import ansible.constants as C import ansible.constants as C
from ansible.utils import * from ansible.utils import *
from ansible.errors import *
######################################################## ########################################################
@ -193,7 +194,11 @@ class Cli(object):
if __name__ == '__main__': if __name__ == '__main__':
cli = Cli() cli = Cli()
(options, args) = cli.parse() (options, args) = cli.parse()
(runner, results) = cli.run(options, args) try:
cli.output(runner, results, options, args) (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)

View file

@ -96,15 +96,14 @@ def main(args):
remote_pass=sshpass, remote_pass=sshpass,
callbacks=PlaybookCallbacks() callbacks=PlaybookCallbacks()
) )
pb.run() try:
pb.run()
except AnsibleError as e:
print e
return 1
return 0 return 0
if __name__ == "__main__": if __name__ == "__main__":
sys.exit(main(sys.argv[1:])) sys.exit(main(sys.argv[1:]))

37
lib/ansible/errors.py Normal file
View file

@ -0,0 +1,37 @@
# (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>
#
# This file is part of Ansible
#
# Ansible is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Ansible is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
class AnsibleError(Exception):
"""
The base Ansible exception from which all others should subclass.
"""
pass
class AnsibleInventoryNotFoundError(AnsibleError):
"""
Exception raised when the default or provided host inventory file
does not exist.
"""
def __init__(self, inventory):
self.inventory = inventory
self.msg = "Unable to continue, inventory file not found: %s" %\
self.inventory
def __str__(self):
return self.msg

View file

@ -161,7 +161,7 @@ class PlayBook(object):
# loop through all patterns and run them # loop through all patterns and run them
self.callbacks.on_start() self.callbacks.on_start()
for pattern in self.playbook: for pattern in self.playbook:
self._run_pattern(pattern) self._run_play(pattern)
# summarize the results # summarize the results
results = {} results = {}
@ -389,7 +389,7 @@ class PlayBook(object):
x['run'] = [] x['run'] = []
x['run'].append(host) x['run'].append(host)
def _run_pattern(self, pg): def _run_play(self, pg):
''' '''
run a list of tasks for a given pattern, in order run a list of tasks for a given pattern, in order
''' '''

View file

@ -39,6 +39,8 @@ import random
import jinja2 import jinja2
import time import time
from ansible.utils import * from ansible.utils import *
from ansible.errors import AnsibleInventoryNotFoundError
################################################ ################################################
@ -127,6 +129,10 @@ class Runner(object):
return (host_list, {}) return (host_list, {})
host_list = os.path.expanduser(host_list) host_list = os.path.expanduser(host_list)
if not os.path.exists(host_list):
raise AnsibleInventoryNotFoundError(host_list)
lines = file(host_list).read().split("\n") lines = file(host_list).read().split("\n")
groups = {} groups = {}
groups['ungrouped'] = [] groups['ungrouped'] = []