From a72d40ef8a997b8dc2501e9136a41997519a310a Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Tue, 31 May 2016 14:02:40 -0700 Subject: [PATCH] Provide type for boolean module parameters Instead of inserting 'True' and 'False' into Ansible's BOOLEANS constants, designate the parameters as a 'bool' type. ansible.module_utils.basic will downcase and handle ensuring the variables are cast to booleans. Change-Id: I2fc70a90df5cca76b49fc21adee59350173157d9 --- library/glance | 5 ++--- library/keystone | 2 +- library/neutron | 3 +-- library/provider_networks | 13 +------------ 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/library/glance b/library/glance index 73e5997..bebcd95 100644 --- a/library/glance +++ b/library/glance @@ -222,10 +222,9 @@ def main(): image_url=dict(required=False), image_container_format=dict(required=False), image_disk_format=dict(required=False), - image_is_public=dict(required=False, choices=BOOLEANS), + image_is_public=dict(required=False, type='bool'), api_version=dict(default='1', required=False, choices=['1', '2']), - insecure=dict(default=False, required=False, - choices=BOOLEANS + ['True', 'False']) + insecure=dict(default=False, required=False, type='bool') ), supports_check_mode=False ) diff --git a/library/keystone b/library/keystone index 09166aa..823b456 100644 --- a/library/keystone +++ b/library/keystone @@ -1334,7 +1334,7 @@ def main(): insecure=dict( default=False, required=False, - choices=BOOLEANS + ['True', 'False'] + type='bool' ), return_code=dict( type='str', diff --git a/library/neutron b/library/neutron index e08e287..7237364 100644 --- a/library/neutron +++ b/library/neutron @@ -429,8 +429,7 @@ def main(): router_name=dict(required=False), external_gateway_info=dict(required=False), tenant_id=dict(required=False), - insecure=dict(default=False, required=False, - choices=BOOLEANS + ['True', 'False']), + insecure=dict(default=False, required=False, type='bool'), allocation_pools=dict(required=False) ), supports_check_mode=False diff --git a/library/provider_networks b/library/provider_networks index d3aefa7..8697a4f 100644 --- a/library/provider_networks +++ b/library/provider_networks @@ -220,11 +220,6 @@ class ProviderNetworksParsing(object): def main(): - # Add in python True False - BOOLEANS.extend(['False', 'True']) - BOOLEANS_TRUE.append('True') - BOOLEANS_FALSE.append('False') - module = AnsibleModule( argument_spec=dict( provider_networks=dict( @@ -232,7 +227,7 @@ def main(): required=True ), is_metal=dict( - choices=BOOLEANS, + type='bool', default='false' ), bind_prefix=dict( @@ -245,12 +240,6 @@ def main(): ) try: - is_metal = module.params.get('is_metal') - if is_metal in BOOLEANS_TRUE: - module.params['is_metal'] = True - else: - module.params['is_metal'] = False - pnp = ProviderNetworksParsing(module=module) pnp.load_networks( provider_networks=module.params.get('provider_networks'),