From 2b5caa23fba5df7ba9b390d100d37c2e6e9e3d6d Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Tue, 19 Jan 2016 14:12:27 -0500 Subject: [PATCH] Properly look for parent become attribute Corrects inheritence of the boolean value, which needs some special consideration from other (string/int) values. Fixes #13872 --- lib/ansible/playbook/become.py | 7 ++++--- lib/ansible/playbook/task.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/ansible/playbook/become.py b/lib/ansible/playbook/become.py index 1e579751d46..cf13e2d1c3a 100644 --- a/lib/ansible/playbook/become.py +++ b/lib/ansible/playbook/become.py @@ -106,10 +106,11 @@ class Become: ''' Override for the 'become' getattr fetcher, used from Base. ''' + value = self._attributes['become'] if hasattr(self, '_get_parent_attribute'): - return self._get_parent_attribute('become') - else: - return self._attributes['become'] + if self._get_parent_attribute('become'): + return True + return value def _get_attr_become_method(self): ''' diff --git a/lib/ansible/playbook/task.py b/lib/ansible/playbook/task.py index 154ff53d5e3..f623f0566fe 100644 --- a/lib/ansible/playbook/task.py +++ b/lib/ansible/playbook/task.py @@ -417,7 +417,7 @@ class Task(Base, Conditional, Taggable, Become): def _get_attr_any_errors_fatal(self): ''' - Override for the 'tags' getattr fetcher, used from Base. + Override for the 'any_errors_fatal' getattr fetcher, used from Base. ''' any_errors_fatal = self._attributes['any_errors_fatal'] if hasattr(self, '_get_parent_attribute'):