mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-06-17 22:01:07 -07:00
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:
parent
b54d352a69
commit
a3860ecf1e
5 changed files with 30 additions and 21 deletions
|
@ -514,6 +514,12 @@ class Nmcli(object):
|
|||
return setting_list
|
||||
# print ""
|
||||
|
||||
def bool_to_string(self, boolean):
|
||||
if boolean:
|
||||
return "yes"
|
||||
else:
|
||||
return "no"
|
||||
|
||||
def list_connection_info(self):
|
||||
# Ask the settings service for the list of connections it provides
|
||||
bus=dbus.SystemBus()
|
||||
|
@ -602,7 +608,7 @@ class Nmcli(object):
|
|||
cmd.append(self.gw6)
|
||||
if self.autoconnect is not None:
|
||||
cmd.append('autoconnect')
|
||||
cmd.append(self.autoconnect)
|
||||
cmd.append(self.bool_to_string(self.autoconnect))
|
||||
return cmd
|
||||
|
||||
def modify_connection_team(self):
|
||||
|
@ -631,7 +637,7 @@ class Nmcli(object):
|
|||
cmd.append(self.dns6)
|
||||
if self.autoconnect is not None:
|
||||
cmd.append('autoconnect')
|
||||
cmd.append(self.autoconnect)
|
||||
cmd.append(self.bool_to_string(self.autoconnect))
|
||||
# Can't use MTU with team
|
||||
return cmd
|
||||
|
||||
|
@ -704,7 +710,7 @@ class Nmcli(object):
|
|||
cmd.append(self.gw6)
|
||||
if self.autoconnect is not None:
|
||||
cmd.append('autoconnect')
|
||||
cmd.append(self.autoconnect)
|
||||
cmd.append(self.bool_to_string(self.autoconnect))
|
||||
if self.mode is not None:
|
||||
cmd.append('mode')
|
||||
cmd.append(self.mode)
|
||||
|
@ -751,7 +757,7 @@ class Nmcli(object):
|
|||
cmd.append(self.dns6)
|
||||
if self.autoconnect is not None:
|
||||
cmd.append('autoconnect')
|
||||
cmd.append(self.autoconnect)
|
||||
cmd.append(self.bool_to_string(self.autoconnect))
|
||||
return cmd
|
||||
|
||||
def create_connection_bond_slave(self):
|
||||
|
@ -820,7 +826,7 @@ class Nmcli(object):
|
|||
cmd.append(self.gw6)
|
||||
if self.autoconnect is not None:
|
||||
cmd.append('autoconnect')
|
||||
cmd.append(self.autoconnect)
|
||||
cmd.append(self.bool_to_string(self.autoconnect))
|
||||
return cmd
|
||||
|
||||
def modify_connection_ethernet(self):
|
||||
|
@ -855,7 +861,7 @@ class Nmcli(object):
|
|||
cmd.append(self.mtu)
|
||||
if self.autoconnect is not None:
|
||||
cmd.append('autoconnect')
|
||||
cmd.append(self.autoconnect)
|
||||
cmd.append(self.bool_to_string(self.autoconnect))
|
||||
return cmd
|
||||
|
||||
def create_connection_bridge(self):
|
||||
|
@ -964,7 +970,7 @@ def main():
|
|||
# Parsing argument file
|
||||
module=AnsibleModule(
|
||||
argument_spec=dict(
|
||||
autoconnect=dict(required=False, default=None, choices=['yes', 'no'], type='str'),
|
||||
autoconnect=dict(required=False, default=None, type='bool'),
|
||||
state=dict(required=True, choices=['present', 'absent'], type='str'),
|
||||
conn_name=dict(required=True, type='str'),
|
||||
master=dict(required=False, default=None, type='str'),
|
||||
|
@ -987,7 +993,7 @@ def main():
|
|||
mtu=dict(required=False, default=None, type='str'),
|
||||
mac=dict(required=False, default=None, type='str'),
|
||||
# bridge specific vars
|
||||
stp=dict(required=False, default='yes', choices=['yes', 'no'], type='str'),
|
||||
stp=dict(required=False, default=True, type='bool'),
|
||||
priority=dict(required=False, default="128", type='str'),
|
||||
slavepriority=dict(required=False, default="32", type='str'),
|
||||
forwarddelay=dict(required=False, default="15", type='str'),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue