cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #2629, replace choices=BOOLEANS by type='bool'

Browse source
This commit is contained in:
Michael Scherer 2015-12-22 10:42:47 +01:00 committed by Matt Clay
parent b0d54092ee
commit 69036826a8
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/modules/cloud/openstack/os_ironic.py
View file

@ -181,17 +181,12 @@ def _choose_id_value(module):
return None 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): def _choose_if_password_only(module, patch):
if len(patch) is 1: if len(patch) is 1:
if 'password' in patch[0]['path'] and _is_value_true( if 'password' in patch[0]['path'] and
module.params['skip_update_of_masked_password']): module.params['skip_update_of_masked_password']:
# Return false to aabort update as the password appears # Return false to aabort update as the password appears
# to be the only element in the patch. # to be the only element in the patch.
return False return False
@ -217,7 +212,7 @@ def main():
properties=dict(type='dict', default={}), properties=dict(type='dict', default={}),
ironic_url=dict(required=False), ironic_url=dict(required=False),
chassis_uuid=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') state=dict(required=False, default='present')
) )
module_kwargs = openstack_module_kwargs() module_kwargs = openstack_module_kwargs()