Allow value to be bool where 'yes'/'no' are in choices (#2593)

* Changed type of 'details' argument to bool on ecs_service_facts module.

* Changed type of 'autostart' argument to bool on virt_* modules.

* Changed types of 'autoconnect' and 'stp' argument to bool on nmcli module.
('create_connection_bridge(self)' and 'modify_connection_bridge(self)' are not implemented yet?)

* Added conversion of 'value' argument when 'vtype' is boolean on debconf module.
This commit is contained in:
Shinichi TAMURA
2016-08-17 23:32:49 +09:00
committed by Matt Clay
parent b54d352a69
commit a3860ecf1e
5 changed files with 30 additions and 21 deletions

View File

@@ -55,7 +55,7 @@ EXAMPLES = '''
- ecs_service_facts:
cluster: test-cluster
service: console-test-service
details: "true"
details: true
# Basic listing example
- ecs_service_facts:
@@ -201,7 +201,7 @@ def main():
argument_spec = ec2_argument_spec()
argument_spec.update(dict(
details=dict(required=False, choices=['true', 'false'] ),
details=dict(required=False, type='bool', default=False ),
cluster=dict(required=False, type='str' ),
service=dict(required=False, type='str' )
))
@@ -214,9 +214,7 @@ def main():
if not HAS_BOTO3:
module.fail_json(msg='boto3 is required.')
show_details = False
if 'details' in module.params and module.params['details'] == 'true':
show_details = True
show_details = module.params.get('details', False)
task_mgr = EcsServiceManager(module)
if show_details:

View File

@@ -534,16 +534,16 @@ def core(module):
else:
module.fail_json(msg="Command %s not recognized" % basecmd)
if autostart:
if autostart is not None:
if not name:
module.fail_json(msg = "state change requires a specified name")
res['changed'] = False
if autostart == 'yes':
if autostart:
if not v.get_autostart(name):
res['changed'] = True
res['msg'] = v.set_autostart(name, True)
elif autostart == 'no':
else:
if v.get_autostart(name):
res['changed'] = True
res['msg'] = v.set_autostart(name, False)
@@ -562,7 +562,7 @@ def main():
command = dict(choices=ALL_COMMANDS),
uri = dict(default='qemu:///system'),
xml = dict(),
autostart = dict(choices=['yes', 'no'])
autostart = dict(type='bool')
),
supports_check_mode = True
)

View File

@@ -644,16 +644,16 @@ def core(module):
else:
module.fail_json(msg="Command %s not recognized" % basecmd)
if autostart:
if autostart is not None:
if not name:
module.fail_json(msg = "state change requires a specified name")
res['changed'] = False
if autostart == 'yes':
if autostart:
if not v.get_autostart(name):
res['changed'] = True
res['msg'] = v.set_autostart(name, True)
elif autostart == 'no':
else:
if v.get_autostart(name):
res['changed'] = True
res['msg'] = v.set_autostart(name, False)
@@ -672,7 +672,7 @@ def main():
command = dict(choices=ALL_COMMANDS),
uri = dict(default='qemu:///system'),
xml = dict(),
autostart = dict(choices=['yes', 'no']),
autostart = dict(type='bool'),
mode = dict(choices=ALL_MODES),
),
supports_check_mode = True