summaryrefslogtreecommitdiff
path: root/lib/ansible/config/manager.py
diff options
context:
space:
mode:
authorSloane Hertel <shertel@redhat.com>2019-05-02 15:09:15 -0400
committerMatt Davis <nitzmahone@users.noreply.github.com>2019-05-02 12:09:14 -0700
commit47b2cb748b0815ae7680f7be45b64ebf40262e25 (patch)
tree1c8afcc515380ed19cb8b1d07101a0d55bbf6130 /lib/ansible/config/manager.py
parent89d767c046e7b57b3aa04de96d15a8943beac611 (diff)
downloadansible-47b2cb748b0815ae7680f7be45b64ebf40262e25.tar.gz
Allow config boolean options to default to None (#55951)
* Allow plugin boolean options to default to None * fix mistake * changelog * be more specific
Diffstat (limited to 'lib/ansible/config/manager.py')
-rw-r--r--lib/ansible/config/manager.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ansible/config/manager.py b/lib/ansible/config/manager.py
index ec3fc8e601..c951e82d58 100644
--- a/lib/ansible/config/manager.py
+++ b/lib/ansible/config/manager.py
@@ -83,11 +83,11 @@ def ensure_type(value, value_type, origin=None):
if value_type:
value_type = value_type.lower()
- if value_type in ('boolean', 'bool'):
- value = boolean(value, strict=False)
+ if value is not None:
+ if value_type in ('boolean', 'bool'):
+ value = boolean(value, strict=False)
- elif value is not None:
- if value_type in ('integer', 'int'):
+ elif value_type in ('integer', 'int'):
value = int(value)
elif value_type == 'float':