Remove choices=BOOLEANS as it is no longer needed

reviewable/pr18780/r1
Daniel Hokka Zakrisson 12 years ago
parent 0150f18a3b
commit 1dadd70d9f

8
apt

@ -181,12 +181,12 @@ def main():
module = AnsibleModule(
argument_spec = dict(
state = dict(default='installed', choices=['installed', 'latest', 'removed', 'absent', 'present']),
update_cache = dict(default='no', choices=BOOLEANS, aliases=['update-cache'], type='bool'),
purge = dict(default='no', choices=BOOLEANS, type='bool'),
update_cache = dict(default='no', aliases=['update-cache'], type='bool'),
purge = dict(default='no', type='bool'),
package = dict(default=None, aliases=['pkg', 'name']),
default_release = dict(default=None, aliases=['default-release']),
install_recommends = dict(default='yes', aliases=['install-recommends'], choices=BOOLEANS, type='bool'),
force = dict(default='no', choices=BOOLEANS, type='bool')
install_recommends = dict(default='yes', aliases=['install-recommends'], type='bool'),
force = dict(default='no', type='bool')
),
supports_check_mode = True
)

@ -94,7 +94,7 @@ def main():
argument_spec = dict(
src = dict(required=True),
dest = dict(required=True),
backup=dict(default=False, choices=BOOLEANS, type='bool'),
backup=dict(default=False, type='bool'),
),
add_file_common_args=True
)

@ -78,8 +78,8 @@ def main():
argument_spec = dict(
src=dict(required=True),
dest=dict(required=True),
backup=dict(default=False, choices=BOOLEANS, type='bool'),
force = dict(default='yes', choices=BOOLEANS, aliases=['thirsty'], type='bool'),
backup=dict(default=False, type='bool'),
force = dict(default='yes', aliases=['thirsty'], type='bool'),
),
add_file_common_args=True,
)

@ -259,13 +259,13 @@ def main():
job=dict(required=False),
cron_file=dict(required=False),
state=dict(default='present', choices=['present', 'absent']),
backup=dict(default=False, choices=BOOLEANS, type='bool'),
backup=dict(default=False, type='bool'),
minute=dict(default='*'),
hour=dict(default='*'),
day=dict(default='*'),
month=dict(default='*'),
weekday=dict(default='*'),
reboot=dict(required=False, default=False, choices=BOOLEANS, type='bool')
reboot=dict(required=False, default=False, type='bool')
)
)

@ -82,7 +82,7 @@ def main():
arg_spec = dict(
name=dict(required=True),
virtualenv=dict(default=None, required=False),
virtualenv_site_packages=dict(default='no', choices=BOOLEANS, type='bool'),
virtualenv_site_packages=dict(default='no', type='bool'),
virtualenv_command=dict(default='virtualenv', required=False),
)

@ -140,7 +140,7 @@ def main():
argument_spec = dict(
state = dict(choices=['file','directory','link','absent'], default='file'),
path = dict(aliases=['dest', 'name'], required=True),
recurse = dict(default='no', choices=BOOLEANS, type='bool')
recurse = dict(default='no', type='bool')
),
add_file_common_args=True,
supports_check_mode=True

@ -195,7 +195,7 @@ def main():
argument_spec = dict(
url = dict(required=True),
dest = dict(required=True),
force = dict(default='no', choices=BOOLEANS, aliases=['thirsty'], type='bool')
force = dict(default='no', aliases=['thirsty'], type='bool')
),
add_file_common_args=True
)

2
git

@ -223,7 +223,7 @@ def main():
repo=dict(required=True, aliases=['name']),
version=dict(default='HEAD'),
remote=dict(default='origin'),
force=dict(default='yes', choices=BOOLEANS, type='bool')
force=dict(default='yes', type='bool')
)
)

4
hg

@ -204,8 +204,8 @@ def main():
repo = dict(required=True),
dest = dict(required=True),
revision = dict(default="default"),
force = dict(default='yes', choices=BOOLEANS, type='bool'),
purge = dict(default='no', choices=BOOLEANS, type='bool')
force = dict(default='yes', type='bool'),
purge = dict(default='no', type='bool')
),
)
repo = module.params['repo']

@ -158,7 +158,7 @@ def main():
section = dict(required=True),
option = dict(required=False),
value = dict(required=False),
backup = dict(default='no', choices=BOOLEANS, type='bool'),
backup = dict(default='no', type='bool'),
state = dict(default='present', choices=['present', 'absent'])
),
add_file_common_args = True

@ -241,8 +241,8 @@ def main():
line=dict(aliases=['value']),
insertafter=dict(default=None),
insertbefore=dict(default=None),
create=dict(default=False, choices=BOOLEANS, type='bool'),
backup=dict(default=False, choices=BOOLEANS, type='bool'),
create=dict(default=False, type='bool'),
backup=dict(default=False, type='bool'),
),
mutually_exclusive = [['insertbefore', 'insertafter']],
add_file_common_args = True,

@ -134,7 +134,7 @@ def main():
module = AnsibleModule(
argument_spec = dict(
state = dict(default="installed", choices=["installed","absent"]),
update_cache = dict(default="no", choices=BOOLEANS, aliases=["update-cache"], type='bool'),
update_cache = dict(default="no", aliases=["update-cache"], type='bool'),
name = dict(aliases=["pkg"], required=True)))

4
pip

@ -158,9 +158,9 @@ def main():
version=dict(default=None, required=False),
requirements=dict(default=None, required=False),
virtualenv=dict(default=None, required=False),
virtualenv_site_packages=dict(default='no', choices=BOOLEANS, type='bool'),
virtualenv_site_packages=dict(default='no', type='bool'),
virtualenv_command=dict(default='virtualenv', required=False),
use_mirrors=dict(default='yes', choices=BOOLEANS, type='bool'),
use_mirrors=dict(default='yes', type='bool'),
extra_args=dict(default=None, required=False),
),
required_one_of=[['name', 'requirements']],

@ -75,7 +75,7 @@ class RabbitMqPlugins(object):
def main():
arg_spec = dict(
names=dict(required=True, aliases=['name']),
new_only=dict(default='no', choices=BOOLEANS, type='bool'),
new_only=dict(default='no', type='bool'),
state=dict(default='enabled', choices=['enabled', 'disabled'])
)
module = AnsibleModule(

@ -178,7 +178,7 @@ def main():
configure_priv=dict(default='^$'),
write_priv=dict(default='^$'),
read_priv=dict(default='^$'),
force=dict(default='no', choices=BOOLEANS, type='bool'),
force=dict(default='no', type='bool'),
state=dict(default='present', choices=['present', 'absent'])
)
module = AnsibleModule(

@ -100,7 +100,7 @@ class RabbitMqVhost(object):
def main():
arg_spec = dict(
name=dict(required=True, aliases=['vhost']),
tracing=dict(default='off', choices=BOOLEANS, aliases=['trace'], type='bool'),
tracing=dict(default='off', aliases=['trace'], type='bool'),
state=dict(default='present', choices=['present', 'absent'])
)

@ -158,8 +158,8 @@ def main():
module = AnsibleModule(
argument_spec = dict(
name=dict(required=True),
persistent=dict(default='no', choices=BOOLEANS, type='bool'),
state=dict(required=True, choices=BOOLEANS, type='bool')
persistent=dict(default='no', type='bool'),
state=dict(required=True, type='bool')
)
)

@ -129,7 +129,7 @@ def main():
dest=dict(required=True),
repo=dict(required=True, aliases=['name', 'repository']),
revision=dict(default='HEAD', aliases=['rev']),
force=dict(default='yes', choices=BOOLEANS, type='bool'),
force=dict(default='yes', type='bool'),
username=dict(required=False),
password=dict(required=False),
)

@ -208,7 +208,7 @@ def main():
value = dict(aliases=['val'], required=False),
state = dict(default='present', choices=['present', 'absent']),
checks = dict(default='both', choices=['none', 'before', 'after', 'both']),
reload = dict(default=True, choices=BOOLEANS, type='bool'),
reload = dict(default=True, type='bool'),
sysctl_file = dict(default='/etc/sysctl.conf')
)
)

6
uri

@ -267,9 +267,9 @@ def main():
password = dict(required=False, default=None),
body = dict(required=False, default=None),
method = dict(required=False, default='GET', choices=['GET', 'POST', 'PUT', 'HEAD', 'DELETE', 'OPTIONS']),
return_content = dict(required=False, default='no', choices=BOOLEANS, type='bool'),
force_basic_auth = dict(required=False, default='no', choices=BOOLEANS, type='bool'),
follow_redirects = dict(required=False, default='no', choices=BOOLEANS, type='bool'),
return_content = dict(required=False, default='no', type='bool'),
force_basic_auth = dict(required=False, default='no', type='bool'),
follow_redirects = dict(required=False, default='no', type='bool'),
creates = dict(required=False, default=None),
removes = dict(required=False, default=None),
status_code = dict(required=False, default="200"),

10
user

@ -1002,13 +1002,13 @@ def main():
shell=dict(default=None),
password=dict(default=None),
# following options are specific to userdel
force=dict(default='no', choices=BOOLEANS, type='bool'),
remove=dict(default='no', choices=BOOLEANS, type='bool'),
force=dict(default='no', type='bool'),
remove=dict(default='no', type='bool'),
# following options are specific to useradd
createhome=dict(default='yes', choices=BOOLEANS, type='bool'),
system=dict(default='no', choices=BOOLEANS, type='bool'),
createhome=dict(default='yes', type='bool'),
system=dict(default='no', type='bool'),
# following options are specific to usermod
append=dict(default='no', choices=BOOLEANS, type='bool'),
append=dict(default='no', type='bool'),
# following are specific to ssh key generation
generate_ssh_key=dict(choices=BOOLEANS, type='bool'),
ssh_key_bits=dict(default=ssh_defaults['bits']),

Loading…
Cancel
Save