summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorToshio Kuratomi <a.badger@gmail.com>2017-07-14 16:44:58 -0700
committerToshio Kuratomi <a.badger@gmail.com>2017-07-17 11:48:05 -0700
commitff22528b076fa7ab17e096c73f5d30d370bd0448 (patch)
tree3a2b1e658ab2a7a661036e3e5fc53d77e0db9849 /contrib
parentf9c60e1a827909236c9b131f534c75f665dedee3 (diff)
downloadansible-ff22528b076fa7ab17e096c73f5d30d370bd0448.tar.gz
Consolidate boolean/mk_boolean conversion functions into a single location
Consolidate the module_utils, constants, and config functions that convert values into booleans into a single function in module_utils. Port code to use the module_utils.validate.convert_bool.boolean function isntead of mk_boolean.
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/inventory/rax.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/inventory/rax.py b/contrib/inventory/rax.py
index eae1b4892f..9704852ca3 100755
--- a/contrib/inventory/rax.py
+++ b/contrib/inventory/rax.py
@@ -168,7 +168,8 @@ except ImportError:
from time import time
-from ansible.constants import get_config, mk_boolean
+from ansible.constants import get_config
+from ansible.module_utils.parsing.convert_bool import boolean
NON_CALLABLES = (basestring, bool, dict, int, list, type(None))
@@ -288,7 +289,7 @@ def _list_into_cache(regions):
if not cbs_attachments[region]:
cbs = pyrax.connect_to_cloud_blockstorage(region)
for vol in cbs.list():
- if mk_boolean(vol.bootable):
+ if boolean(vol.bootable, strict=False):
for attachment in vol.attachments:
metadata = vol.volume_image_metadata
server_id = attachment['server_id']