diff options
| author | James Cammarata <jimi@sngx.net> | 2013-09-09 10:22:03 -0500 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2013-09-09 10:22:03 -0500 |
| commit | 150dd230cc9364fa93799116c4b478bc01271b03 (patch) | |
| tree | ad559819ec02e7e403433ab05498353892ff1dc2 | |
| parent | 59099b7607c2c94efbbb35bdc4b55cf005c047e1 (diff) | |
| parent | bcc2a4b513c59bcdbbc441304587ea88d830ca59 (diff) | |
| download | ansible-150dd230cc9364fa93799116c4b478bc01271b03.tar.gz | |
Merge branch 'kavink-devel' into devel
| -rw-r--r-- | lib/ansible/playbook/__init__.py | 3 | ||||
| -rw-r--r-- | lib/ansible/playbook/play.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/ansible/playbook/__init__.py b/lib/ansible/playbook/__init__.py index 63d5934fd3..6700e4c3c9 100644 --- a/lib/ansible/playbook/__init__.py +++ b/lib/ansible/playbook/__init__.py @@ -573,8 +573,9 @@ class PlayBook(object): host_list = self._list_available_hosts(play.hosts) + # Set max_fail_pct to 0, So if any hosts fails, bail out if task.any_errors_fatal and len(host_list) < hosts_count: - host_list = None + play.max_fail_pct = 0 # If threshold for max nodes failed is exceeded , bail out. if (hosts_count - len(host_list)) > int((play.max_fail_pct)/100.0 * hosts_count): diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py index ea069f3221..4ebc1b6cb0 100644 --- a/lib/ansible/playbook/play.py +++ b/lib/ansible/playbook/play.py @@ -111,7 +111,7 @@ class Play(object): self.transport = ds.get('connection', self.playbook.transport) self.gather_facts = ds.get('gather_facts', None) self.remote_port = self.remote_port - self.any_errors_fatal = ds.get('any_errors_fatal', False) + self.any_errors_fatal = utils.boolean(ds.get('any_errors_fatal', 'false')) self.accelerate = utils.boolean(ds.get('accelerate', 'false')) self.accelerate_port = ds.get('accelerate_port', None) self.max_fail_pct = int(ds.get('max_fail_percentage', 100)) |