From 90f8228fb1330d87da32e84d76b6282c471fa5ca Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Tue, 22 Dec 2015 10:42:47 +0100 Subject: [PATCH] Fix #2629, replace choices=BOOLEANS by type='bool' --- cloud/openstack/os_ironic.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/cloud/openstack/os_ironic.py b/cloud/openstack/os_ironic.py index 0ec4366b79f..38f19e71e58 100644 --- a/cloud/openstack/os_ironic.py +++ b/cloud/openstack/os_ironic.py @@ -183,17 +183,12 @@ def _choose_id_value(module): return None -def _is_value_true(value): - true_values = [True, 'yes', 'Yes', 'True', 'true'] - if value in true_values: - return True - return False def _choose_if_password_only(module, patch): if len(patch) is 1: - if 'password' in patch[0]['path'] and _is_value_true( - module.params['skip_update_of_masked_password']): + if 'password' in patch[0]['path'] and + module.params['skip_update_of_masked_password']: # Return false to aabort update as the password appears # to be the only element in the patch. return False @@ -219,7 +214,7 @@ def main(): properties=dict(type='dict', default={}), ironic_url=dict(required=False), chassis_uuid=dict(required=False), - skip_update_of_masked_password=dict(required=False, choices=BOOLEANS), + skip_update_of_masked_password=dict(required=False, type='bool'), state=dict(required=False, default='present') ) module_kwargs = openstack_module_kwargs()