From 2f3dc1352fa4de14c3f42d06428c3a7d41869211 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Mon, 21 Dec 2015 23:39:20 +0100 Subject: [PATCH] Replace choices=BOOLEANS by type='bool', fix #1326 --- cloud/lxc/lxc_container.py | 6 +++--- cloud/misc/proxmox.py | 6 +++--- cloud/misc/proxmox_template.py | 4 ++-- cloud/webfaction/webfaction_app.py | 4 ++-- cloud/webfaction/webfaction_site.py | 2 +- messaging/rabbitmq_exchange.py | 6 +++--- messaging/rabbitmq_queue.py | 4 ++-- monitoring/datadog_monitor.py | 4 ++-- packaging/os/apk.py | 4 ++-- packaging/os/pkg5.py | 2 +- packaging/os/pkg5_publisher.py | 4 ++-- system/osx_defaults.py | 2 +- system/svc.py | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cloud/lxc/lxc_container.py b/cloud/lxc/lxc_container.py index fd5daf1c47c..6c177552d6b 100644 --- a/cloud/lxc/lxc_container.py +++ b/cloud/lxc/lxc_container.py @@ -1684,7 +1684,7 @@ def main(): type='str' ), container_log=dict( - choices=BOOLEANS, + type='bool', default='false' ), container_log_level=dict( @@ -1696,11 +1696,11 @@ def main(): required=False ), clone_snapshot=dict( - choices=BOOLEANS, + type='bool', default='false' ), archive=dict( - choices=BOOLEANS, + type='bool', default='false' ), archive_path=dict( diff --git a/cloud/misc/proxmox.py b/cloud/misc/proxmox.py index 7be4361edbe..e5a7e0b15d5 100644 --- a/cloud/misc/proxmox.py +++ b/cloud/misc/proxmox.py @@ -273,7 +273,7 @@ def main(): api_user = dict(required=True), api_password = dict(no_log=True), vmid = dict(required=True), - validate_certs = dict(type='bool', choices=BOOLEANS, default='no'), + validate_certs = dict(type='bool', default='no'), node = dict(), password = dict(no_log=True), hostname = dict(), @@ -284,13 +284,13 @@ def main(): swap = dict(type='int', default=0), netif = dict(), ip_address = dict(), - onboot = dict(type='bool', choices=BOOLEANS, default='no'), + onboot = dict(type='bool', default='no'), storage = dict(default='local'), cpuunits = dict(type='int', default=1000), nameserver = dict(), searchdomain = dict(), timeout = dict(type='int', default=30), - force = dict(type='bool', choices=BOOLEANS, default='no'), + force = dict(type='bool', default='no'), state = dict(default='present', choices=['present', 'absent', 'stopped', 'started', 'restarted']), ) ) diff --git a/cloud/misc/proxmox_template.py b/cloud/misc/proxmox_template.py index 7fed47f7260..6434e59be23 100644 --- a/cloud/misc/proxmox_template.py +++ b/cloud/misc/proxmox_template.py @@ -156,14 +156,14 @@ def main(): api_host = dict(required=True), api_user = dict(required=True), api_password = dict(no_log=True), - validate_certs = dict(type='bool', choices=BOOLEANS, default='no'), + validate_certs = dict(type='bool', default='no'), node = dict(), src = dict(), template = dict(), content_type = dict(default='vztmpl', choices=['vztmpl','iso']), storage = dict(default='local'), timeout = dict(type='int', default=30), - force = dict(type='bool', choices=BOOLEANS, default='no'), + force = dict(type='bool', default='no'), state = dict(default='present', choices=['present', 'absent']), ) ) diff --git a/cloud/webfaction/webfaction_app.py b/cloud/webfaction/webfaction_app.py index 1c015a401d1..52ecedf438d 100644 --- a/cloud/webfaction/webfaction_app.py +++ b/cloud/webfaction/webfaction_app.py @@ -112,9 +112,9 @@ def main(): name = dict(required=True), state = dict(required=False, choices=['present', 'absent'], default='present'), type = dict(required=True), - autostart = dict(required=False, choices=BOOLEANS, default=False), + autostart = dict(required=False, type='bool', default=False), extra_info = dict(required=False, default=""), - port_open = dict(required=False, choices=BOOLEANS, default=False), + port_open = dict(required=False, type='bool', default=False), login_name = dict(required=True), login_password = dict(required=True), machine = dict(required=False, default=False), diff --git a/cloud/webfaction/webfaction_site.py b/cloud/webfaction/webfaction_site.py index bb1bfb94457..0226a2a2f92 100644 --- a/cloud/webfaction/webfaction_site.py +++ b/cloud/webfaction/webfaction_site.py @@ -112,7 +112,7 @@ def main(): state = dict(required=False, choices=['present', 'absent'], default='present'), # You can specify an IP address or hostname. host = dict(required=True), - https = dict(required=False, choices=BOOLEANS, default=False), + https = dict(required=False, type='bool', default=False), subdomains = dict(required=False, default=[]), site_apps = dict(required=False, default=[]), login_name = dict(required=True), diff --git a/messaging/rabbitmq_exchange.py b/messaging/rabbitmq_exchange.py index 728186385cb..1e69d434502 100644 --- a/messaging/rabbitmq_exchange.py +++ b/messaging/rabbitmq_exchange.py @@ -120,9 +120,9 @@ def main(): login_host = dict(default='localhost', type='str'), login_port = dict(default='15672', type='str'), vhost = dict(default='/', type='str'), - durable = dict(default=True, choices=BOOLEANS, type='bool'), - auto_delete = dict(default=False, choices=BOOLEANS, type='bool'), - internal = dict(default=False, choices=BOOLEANS, type='bool'), + durable = dict(default=True, type='bool'), + auto_delete = dict(default=False, type='bool'), + internal = dict(default=False, type='bool'), exchange_type = dict(default='direct', aliases=['type'], type='str'), arguments = dict(default=dict(), type='dict') ), diff --git a/messaging/rabbitmq_queue.py b/messaging/rabbitmq_queue.py index 5a403a6b602..be37ce7eaa3 100644 --- a/messaging/rabbitmq_queue.py +++ b/messaging/rabbitmq_queue.py @@ -134,8 +134,8 @@ def main(): login_host = dict(default='localhost', type='str'), login_port = dict(default='15672', type='str'), vhost = dict(default='/', type='str'), - durable = dict(default=True, choices=BOOLEANS, type='bool'), - auto_delete = dict(default=False, choices=BOOLEANS, type='bool'), + durable = dict(default=True, type='bool'), + auto_delete = dict(default=False, type='bool'), message_ttl = dict(default=None, type='int'), auto_expires = dict(default=None, type='int'), max_length = dict(default=None, type='int'), diff --git a/monitoring/datadog_monitor.py b/monitoring/datadog_monitor.py index 9318326620e..474d2e42090 100644 --- a/monitoring/datadog_monitor.py +++ b/monitoring/datadog_monitor.py @@ -144,12 +144,12 @@ def main(): query=dict(required=False), message=dict(required=False, default=None), silenced=dict(required=False, default=None, type='dict'), - notify_no_data=dict(required=False, default=False, choices=BOOLEANS), + notify_no_data=dict(required=False, default=False, type='bool'), no_data_timeframe=dict(required=False, default=None), timeout_h=dict(required=False, default=None), renotify_interval=dict(required=False, default=None), escalation_message=dict(required=False, default=None), - notify_audit=dict(required=False, default=False, choices=BOOLEANS), + notify_audit=dict(required=False, default=False, type='bool'), thresholds=dict(required=False, type='dict', default={'ok': 1, 'critical': 1, 'warning': 1}), ) ) diff --git a/packaging/os/apk.py b/packaging/os/apk.py index ec0e3908faf..191f3b39b09 100644 --- a/packaging/os/apk.py +++ b/packaging/os/apk.py @@ -177,8 +177,8 @@ def main(): argument_spec = dict( state = dict(default='present', choices=['present', 'installed', 'absent', 'removed', 'latest']), name = dict(type='list'), - update_cache = dict(default='no', choices=BOOLEANS, type='bool'), - upgrade = dict(default='no', choices=BOOLEANS, type='bool'), + update_cache = dict(default='no', type='bool'), + upgrade = dict(default='no', type='bool'), ), required_one_of = [['name', 'update_cache', 'upgrade']], supports_check_mode = True diff --git a/packaging/os/pkg5.py b/packaging/os/pkg5.py index 837eefd243e..4fb34d7a51c 100644 --- a/packaging/os/pkg5.py +++ b/packaging/os/pkg5.py @@ -78,7 +78,7 @@ def main(): ] ), accept_licenses=dict( - choices=BOOLEANS, + type='bool', default=False, aliases=['accept_licences', 'accept'], ), diff --git a/packaging/os/pkg5_publisher.py b/packaging/os/pkg5_publisher.py index 3881f5dd0b8..08c33464e7f 100644 --- a/packaging/os/pkg5_publisher.py +++ b/packaging/os/pkg5_publisher.py @@ -77,8 +77,8 @@ def main(): argument_spec=dict( name=dict(required=True, aliases=['publisher']), state=dict(default='present', choices=['present', 'absent']), - sticky=dict(choices=BOOLEANS), - enabled=dict(choices=BOOLEANS), + sticky=dict(type='bool'), + enabled=dict(type='bool'), # search_after=dict(), # search_before=dict(), origin=dict(type='list'), diff --git a/system/osx_defaults.py b/system/osx_defaults.py index e4dc5f8c750..614adc4852b 100644 --- a/system/osx_defaults.py +++ b/system/osx_defaults.py @@ -309,7 +309,7 @@ def main(): array_add=dict( default=False, required=False, - choices=BOOLEANS, + type='bool', ), value=dict( default=None, diff --git a/system/svc.py b/system/svc.py index 9831ce42ea7..36b4df5f9f7 100644 --- a/system/svc.py +++ b/system/svc.py @@ -240,8 +240,8 @@ def main(): argument_spec = dict( name = dict(required=True), state = dict(choices=['started', 'stopped', 'restarted', 'killed', 'reloaded', 'once']), - enabled = dict(required=False, type='bool', choices=BOOLEANS), - downed = dict(required=False, type='bool', choices=BOOLEANS), + enabled = dict(required=False, type='bool'), + downed = dict(required=False, type='bool'), dist = dict(required=False, default='daemontools'), service_dir = dict(required=False, default='/service'), service_src = dict(required=False, default='/etc/service'),