From 9466103a4a57ee736d8e4cecc298a7cb531ecfe5 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Tue, 1 Nov 2022 19:12:11 +0100 Subject: [PATCH] Revert "Fix non-matching defaults in docs (#5446) (#5451)" This reverts commit b26df2a00852368abe28576efc0d535300d9f8ff. --- .../fragments/5444-passwordstore-options.yml | 2 - plugins/doc_fragments/influxdb.py | 2 - plugins/doc_fragments/ldap.py | 1 - plugins/doc_fragments/utm.py | 1 - plugins/lookup/passwordstore.py | 74 +++++++++---------- .../modules/cloud/atomic/atomic_container.py | 1 - .../cloud/dimensiondata/dimensiondata_vlan.py | 3 - .../modules/cloud/huawei/hwc_ecs_instance.py | 1 - plugins/modules/cloud/huawei/hwc_evs_disk.py | 1 - .../modules/cloud/huawei/hwc_network_vpc.py | 1 - plugins/modules/cloud/huawei/hwc_vpc_eip.py | 1 - .../cloud/huawei/hwc_vpc_peering_connect.py | 1 - plugins/modules/cloud/huawei/hwc_vpc_port.py | 1 - .../modules/cloud/huawei/hwc_vpc_subnet.py | 1 - plugins/modules/cloud/linode/linode.py | 1 - plugins/modules/cloud/memset/memset_zone.py | 1 - .../cloud/memset/memset_zone_record.py | 3 - plugins/modules/cloud/misc/rhevm.py | 1 - plugins/modules/cloud/misc/serverless.py | 2 - plugins/modules/cloud/misc/terraform.py | 1 - .../oneandone/oneandone_firewall_policy.py | 5 -- .../oneandone/oneandone_load_balancer.py | 5 -- .../oneandone/oneandone_monitoring_policy.py | 11 --- .../oneandone/oneandone_private_network.py | 2 - plugins/modules/cloud/packet/packet_device.py | 1 - .../cloud/profitbricks/profitbricks.py | 2 - .../cloud/profitbricks/profitbricks_volume.py | 4 +- plugins/modules/cloud/pubnub/pubnub_blocks.py | 4 +- plugins/modules/cloud/rackspace/rax.py | 4 - plugins/modules/cloud/rackspace/rax_cbs.py | 1 - plugins/modules/cloud/rackspace/rax_clb.py | 1 - plugins/modules/cloud/rackspace/rax_files.py | 1 - .../cloud/rackspace/rax_files_objects.py | 1 - plugins/modules/cloud/rackspace/rax_meta.py | 1 - .../modules/cloud/rackspace/rax_mon_check.py | 2 - .../modules/cloud/rackspace/rax_mon_entity.py | 2 - .../cloud/rackspace/rax_scaling_group.py | 2 - .../scaleway/scaleway_container_registry.py | 1 - plugins/modules/cloud/scaleway/scaleway_lb.py | 1 - plugins/modules/cloud/softlayer/sl_vm.py | 1 - .../spotinst/spotinst_aws_elastigroup.py | 6 -- .../modules/cloud/univention/udm_dns_zone.py | 2 - plugins/modules/cloud/univention/udm_group.py | 2 - plugins/modules/cloud/univention/udm_user.py | 3 - plugins/modules/database/mssql/mssql_db.py | 2 - plugins/modules/files/iso_customize.py | 2 - plugins/modules/files/xml.py | 1 - plugins/modules/identity/onepassword_info.py | 1 + .../modules/monitoring/sensu/sensu_check.py | 4 + plugins/modules/monitoring/statsd.py | 1 - plugins/modules/net_tools/dnsmadeeasy.py | 1 + .../modules/net_tools/infinity/infinity.py | 5 ++ plugins/modules/net_tools/ldap/ldap_entry.py | 1 - plugins/modules/notification/mail.py | 2 - .../modules/packaging/language/composer.py | 1 - .../packaging/language/maven_artifact.py | 1 - plugins/modules/packaging/os/opkg.py | 1 - plugins/modules/packaging/os/pacman.py | 6 +- .../packaging/os/redhat_subscription.py | 1 + plugins/modules/packaging/os/sorcery.py | 1 - .../lenovoxcc/xcc_redfish_command.py | 1 - .../manageiq/manageiq_tenant.py | 2 +- .../redfish/redfish_command.py | 3 - .../redfish/redfish_config.py | 4 - .../remote_management/stacki/stacki_host.py | 2 - .../source_control/gitlab/gitlab_hook.py | 1 - plugins/modules/storage/zfs/zfs.py | 1 - plugins/modules/storage/zfs/zfs_facts.py | 1 - plugins/modules/system/aix_lvol.py | 2 - plugins/modules/system/java_cert.py | 1 + plugins/modules/system/lvg.py | 2 - plugins/modules/system/selinux_permissive.py | 1 - plugins/modules/web_infrastructure/jira.py | 1 - .../sophos_utm/utm_aaa_group.py | 6 -- .../sophos_utm/utm_dns_host.py | 2 - .../utm_network_interface_address.py | 1 - .../sophos_utm/utm_proxy_location.py | 3 - .../tasks/password_tests.yml | 16 ++-- .../lookup_passwordstore/tasks/tests.yml | 4 +- 79 files changed, 63 insertions(+), 187 deletions(-) delete mode 100644 changelogs/fragments/5444-passwordstore-options.yml diff --git a/changelogs/fragments/5444-passwordstore-options.yml b/changelogs/fragments/5444-passwordstore-options.yml deleted file mode 100644 index a25c9a2fef..0000000000 --- a/changelogs/fragments/5444-passwordstore-options.yml +++ /dev/null @@ -1,2 +0,0 @@ -minor_changes: - - "passwordstore lookup plugin - allow options to be passed lookup options instead of being part of the term strings (https://github.com/ansible-collections/community.general/pull/5444)." diff --git a/plugins/doc_fragments/influxdb.py b/plugins/doc_fragments/influxdb.py index 6aedd5ad39..f9e08550bd 100644 --- a/plugins/doc_fragments/influxdb.py +++ b/plugins/doc_fragments/influxdb.py @@ -43,7 +43,6 @@ options: - The path on which InfluxDB server is accessible - Only available when using python-influxdb >= 5.1.0 type: str - default: '' version_added: '0.2.0' validate_certs: description: @@ -81,5 +80,4 @@ options: description: - HTTP(S) proxy to use for Requests to connect to InfluxDB server. type: dict - default: {} ''' diff --git a/plugins/doc_fragments/ldap.py b/plugins/doc_fragments/ldap.py index c73e5080be..28e9d2fdae 100644 --- a/plugins/doc_fragments/ldap.py +++ b/plugins/doc_fragments/ldap.py @@ -23,7 +23,6 @@ options: description: - The password to use with I(bind_dn). type: str - default: '' dn: required: true description: diff --git a/plugins/doc_fragments/utm.py b/plugins/doc_fragments/utm.py index 73ad805035..d8b2305d23 100644 --- a/plugins/doc_fragments/utm.py +++ b/plugins/doc_fragments/utm.py @@ -17,7 +17,6 @@ options: - Is needed for some modules type: dict required: false - default: {} utm_host: description: - The REST Endpoint of the Sophos UTM. diff --git a/plugins/lookup/passwordstore.py b/plugins/lookup/passwordstore.py index 1106bbc473..ce1f4ee852 100644 --- a/plugins/lookup/passwordstore.py +++ b/plugins/lookup/passwordstore.py @@ -21,15 +21,17 @@ DOCUMENTATION = ''' _terms: description: query key. required: true - directory: + passwordstore: description: - - The directory of the password store. - - If I(backend=pass), the default is C(~/.password-store) is used. - - If I(backend=gopass), then the default is the C(path) field in C(~/.config/gopass/config.yml), - falling back to C(~/.local/share/gopass/stores/root) if C(path) is not defined in the gopass config. - type: path - vars: - - name: passwordstore + - Location of the password store. + - 'The value is decided by checking the following in order:' + - If set, this value is used. + - If C(directory) is set, that value will be used. + - If I(backend=pass), then C(~/.password-store) is used. + - If I(backend=gopass), then the C(path) field in C(~/.config/gopass/config.yml) is used, + falling back to C(~/.local/share/gopass/stores/root) if not defined. + directory: + description: The directory of the password store. env: - name: PASSWORD_STORE_DIR create: @@ -53,11 +55,9 @@ DOCUMENTATION = ''' default: false subkey: description: Return a specific subkey of the password. When set to C(password), always returns the first line. - type: str default: password userpass: description: Specify a password to save, instead of a generated one. - type: str length: description: The length of the generated password. type: integer @@ -67,7 +67,7 @@ DOCUMENTATION = ''' type: bool default: false nosymbols: - description: Use alphanumeric characters. + description: use alphanumeric characters. type: bool default: false missing: @@ -129,8 +129,6 @@ DOCUMENTATION = ''' - pass - gopass version_added: 5.2.0 - notes: - - The lookup supports passing all options as lookup parameters since community.general 6.0.0. ''' EXAMPLES = """ ansible.cfg: | @@ -138,7 +136,7 @@ ansible.cfg: | lock=readwrite locktimeout=45s -tasks.yml: | +playbook.yml: | --- # Debug is used for examples, BAD IDEA to show passwords on screen @@ -148,49 +146,45 @@ tasks.yml: | - name: Basic lookup. Warns if example/test does not exist and returns empty string ansible.builtin.debug: - msg: "{{ lookup('community.general.passwordstore', 'example/test', missing='warn')}}" + msg: "{{ lookup('community.general.passwordstore', 'example/test missing=warn')}}" - name: Create pass with random 16 character password. If password exists just give the password ansible.builtin.debug: var: mypassword vars: - mypassword: "{{ lookup('community.general.passwordstore', 'example/test', create=true)}}" + mypassword: "{{ lookup('community.general.passwordstore', 'example/test create=true')}}" - name: Create pass with random 16 character password. If password exists just give the password ansible.builtin.debug: var: mypassword vars: - mypassword: "{{ lookup('community.general.passwordstore', 'example/test', missing='create')}}" + mypassword: "{{ lookup('community.general.passwordstore', 'example/test missing=create')}}" - name: Prints 'abc' if example/test does not exist, just give the password otherwise ansible.builtin.debug: var: mypassword vars: - mypassword: >- - {{ lookup('community.general.passwordstore', 'example/test', missing='empty') - | default('abc', true) }} + mypassword: "{{ lookup('community.general.passwordstore', 'example/test missing=empty') | default('abc', true) }}" - name: Different size password ansible.builtin.debug: - msg: "{{ lookup('community.general.passwordstore', 'example/test', create=true, length=42)}}" + msg: "{{ lookup('community.general.passwordstore', 'example/test create=true length=42')}}" - - name: >- - Create password and overwrite the password if it exists. - As a bonus, this module includes the old password inside the pass file + - name: Create password and overwrite the password if it exists. As a bonus, this module includes the old password inside the pass file ansible.builtin.debug: - msg: "{{ lookup('community.general.passwordstore', 'example/test', create=true, overwrite=true)}}" + msg: "{{ lookup('community.general.passwordstore', 'example/test create=true overwrite=true')}}" - name: Create an alphanumeric password ansible.builtin.debug: - msg: "{{ lookup('community.general.passwordstore', 'example/test', create=true, nosymbols=true) }}" + msg: "{{ lookup('community.general.passwordstore', 'example/test create=true nosymbols=true') }}" - name: Return the value for user in the KV pair user, username ansible.builtin.debug: - msg: "{{ lookup('community.general.passwordstore', 'example/test', subkey='user')}}" + msg: "{{ lookup('community.general.passwordstore', 'example/test subkey=user')}}" - name: Return the entire password file content ansible.builtin.set_fact: - passfilecontent: "{{ lookup('community.general.passwordstore', 'example/test', returnall=true)}}" + passfilecontent: "{{ lookup('community.general.passwordstore', 'example/test returnall=true')}}" """ RETURN = """ @@ -326,7 +320,7 @@ class LookupModule(LookupBase): raise AnsibleError('Passwordstore directory \'{0}\' does not exist'.format(self.paramvals['directory'])) # Set PASSWORD_STORE_UMASK if umask is set - if self.paramvals.get('umask') is not None: + if 'umask' in self.paramvals: if len(self.paramvals['umask']) != 3: raise AnsibleError('Passwordstore umask must have a length of 3.') elif int(self.paramvals['umask'][0]) > 3: @@ -441,7 +435,8 @@ class LookupModule(LookupBase): unit_to_seconds = {"s": 1, "m": 60, "h": 3600} self.lock_timeout = int(timeout[:-1]) * unit_to_seconds[timeout[-1]] - directory = self.get_option('directory') + directory = variables.get('passwordstore', os.environ.get('PASSWORD_STORE_DIR', None)) + if directory is None: if self.backend == 'gopass': try: @@ -453,17 +448,16 @@ class LookupModule(LookupBase): directory = os.path.expanduser('~/.password-store') self.paramvals = { - 'subkey': self.get_option('subkey'), + 'subkey': 'password', 'directory': directory, - 'create': self.get_option('create'), - 'returnall': self.get_option('returnall'), - 'overwrite': self.get_option('overwrite'), - 'nosymbols': self.get_option('nosymbols'), - 'userpass': self.get_option('userpass') or '', - 'length': self.get_option('length'), - 'backup': self.get_option('backup'), - 'missing': self.get_option('missing'), - 'umask': self.get_option('umask'), + 'create': False, + 'returnall': False, + 'overwrite': False, + 'nosymbols': False, + 'userpass': '', + 'length': 16, + 'backup': False, + 'missing': 'error', } def run(self, terms, variables, **kwargs): diff --git a/plugins/modules/cloud/atomic/atomic_container.py b/plugins/modules/cloud/atomic/atomic_container.py index c32e617a22..586b1254c2 100644 --- a/plugins/modules/cloud/atomic/atomic_container.py +++ b/plugins/modules/cloud/atomic/atomic_container.py @@ -61,7 +61,6 @@ options: - The values specified here will be used at installation time as --set arguments for atomic install. type: list elements: str - default: [] ''' EXAMPLES = r''' diff --git a/plugins/modules/cloud/dimensiondata/dimensiondata_vlan.py b/plugins/modules/cloud/dimensiondata/dimensiondata_vlan.py index ca25374dcb..b06566b8e6 100644 --- a/plugins/modules/cloud/dimensiondata/dimensiondata_vlan.py +++ b/plugins/modules/cloud/dimensiondata/dimensiondata_vlan.py @@ -31,7 +31,6 @@ options: description: - A description of the VLAN. type: str - default: '' network_domain: description: - The Id or name of the target network domain. @@ -41,13 +40,11 @@ options: description: - The base address for the VLAN's IPv4 network (e.g. 192.168.1.0). type: str - default: '' private_ipv4_prefix_size: description: - The size of the IPv4 address space, e.g 24. - Required, if C(private_ipv4_base_address) is specified. type: int - default: 0 state: description: - The desired state for the target VLAN. diff --git a/plugins/modules/cloud/huawei/hwc_ecs_instance.py b/plugins/modules/cloud/huawei/hwc_ecs_instance.py index 10d913f9b5..8026c0f2f6 100644 --- a/plugins/modules/cloud/huawei/hwc_ecs_instance.py +++ b/plugins/modules/cloud/huawei/hwc_ecs_instance.py @@ -33,7 +33,6 @@ options: description: - The timeouts for each operations. type: dict - default: {} suboptions: create: description: diff --git a/plugins/modules/cloud/huawei/hwc_evs_disk.py b/plugins/modules/cloud/huawei/hwc_evs_disk.py index 7b5a99fb7f..e319821c9f 100644 --- a/plugins/modules/cloud/huawei/hwc_evs_disk.py +++ b/plugins/modules/cloud/huawei/hwc_evs_disk.py @@ -33,7 +33,6 @@ options: description: - The timeouts for each operations. type: dict - default: {} suboptions: create: description: diff --git a/plugins/modules/cloud/huawei/hwc_network_vpc.py b/plugins/modules/cloud/huawei/hwc_network_vpc.py index 78f5925e0c..2f08f20313 100644 --- a/plugins/modules/cloud/huawei/hwc_network_vpc.py +++ b/plugins/modules/cloud/huawei/hwc_network_vpc.py @@ -33,7 +33,6 @@ options: description: - The timeouts for each operations. type: dict - default: {} suboptions: create: description: diff --git a/plugins/modules/cloud/huawei/hwc_vpc_eip.py b/plugins/modules/cloud/huawei/hwc_vpc_eip.py index e14fb0e502..a86338052e 100644 --- a/plugins/modules/cloud/huawei/hwc_vpc_eip.py +++ b/plugins/modules/cloud/huawei/hwc_vpc_eip.py @@ -33,7 +33,6 @@ options: description: - The timeouts for each operations. type: dict - default: {} suboptions: create: description: diff --git a/plugins/modules/cloud/huawei/hwc_vpc_peering_connect.py b/plugins/modules/cloud/huawei/hwc_vpc_peering_connect.py index 01c52932ba..89955d2091 100644 --- a/plugins/modules/cloud/huawei/hwc_vpc_peering_connect.py +++ b/plugins/modules/cloud/huawei/hwc_vpc_peering_connect.py @@ -34,7 +34,6 @@ options: description: - The timeouts for each operations. type: dict - default: {} suboptions: create: description: diff --git a/plugins/modules/cloud/huawei/hwc_vpc_port.py b/plugins/modules/cloud/huawei/hwc_vpc_port.py index aac9636f88..dadc76c064 100644 --- a/plugins/modules/cloud/huawei/hwc_vpc_port.py +++ b/plugins/modules/cloud/huawei/hwc_vpc_port.py @@ -33,7 +33,6 @@ options: description: - The timeouts for each operations. type: dict - default: {} suboptions: create: description: diff --git a/plugins/modules/cloud/huawei/hwc_vpc_subnet.py b/plugins/modules/cloud/huawei/hwc_vpc_subnet.py index 4b192a5682..d38150dfc3 100644 --- a/plugins/modules/cloud/huawei/hwc_vpc_subnet.py +++ b/plugins/modules/cloud/huawei/hwc_vpc_subnet.py @@ -33,7 +33,6 @@ options: description: - The timeouts for each operations. type: dict - default: {} suboptions: create: description: diff --git a/plugins/modules/cloud/linode/linode.py b/plugins/modules/cloud/linode/linode.py index 5304ed3d89..c19770dc41 100644 --- a/plugins/modules/cloud/linode/linode.py +++ b/plugins/modules/cloud/linode/linode.py @@ -37,7 +37,6 @@ options: description: - Add the instance to a Display Group in Linode Manager. type: str - default: '' linode_id: description: - Unique ID of a linode server. This value is read-only in the sense that diff --git a/plugins/modules/cloud/memset/memset_zone.py b/plugins/modules/cloud/memset/memset_zone.py index 9731e3a943..f402e0e0f4 100644 --- a/plugins/modules/cloud/memset/memset_zone.py +++ b/plugins/modules/cloud/memset/memset_zone.py @@ -44,7 +44,6 @@ options: - The default TTL for all records created in the zone. This must be a valid int from U(https://www.memset.com/apidocs/methods_dns.html#dns.zone_create). type: int - default: 0 choices: [ 0, 300, 600, 900, 1800, 3600, 7200, 10800, 21600, 43200, 86400 ] force: required: false diff --git a/plugins/modules/cloud/memset/memset_zone_record.py b/plugins/modules/cloud/memset/memset_zone_record.py index c114532f90..5082475176 100644 --- a/plugins/modules/cloud/memset/memset_zone_record.py +++ b/plugins/modules/cloud/memset/memset_zone_record.py @@ -44,13 +44,11 @@ options: description: - C(SRV) and C(TXT) record priority, in the range 0 > 999 (inclusive). type: int - default: 0 record: required: false description: - The subdomain to create. type: str - default: '' type: required: true description: @@ -67,7 +65,6 @@ options: description: - The record's TTL in seconds (will inherit zone's TTL if not explicitly set). This must be a valid int from U(https://www.memset.com/apidocs/methods_dns.html#dns.zone_record_create). - default: 0 choices: [ 0, 300, 600, 900, 1800, 3600, 7200, 10800, 21600, 43200, 86400 ] type: int zone: diff --git a/plugins/modules/cloud/misc/rhevm.py b/plugins/modules/cloud/misc/rhevm.py index 994f737093..2542511bea 100644 --- a/plugins/modules/cloud/misc/rhevm.py +++ b/plugins/modules/cloud/misc/rhevm.py @@ -54,7 +54,6 @@ options: description: - The RHEV/oVirt cluster in which you want you VM to start. type: str - default: '' datacenter: description: - The RHEV/oVirt datacenter in which you want you VM to start. diff --git a/plugins/modules/cloud/misc/serverless.py b/plugins/modules/cloud/misc/serverless.py index 4d36ba679a..2819adae59 100644 --- a/plugins/modules/cloud/misc/serverless.py +++ b/plugins/modules/cloud/misc/serverless.py @@ -35,13 +35,11 @@ options: - The name of the serverless framework project stage to deploy to. - This uses the serverless framework default "dev". type: str - default: '' region: description: - AWS region to deploy the service to. - This parameter defaults to C(us-east-1). type: str - default: '' deploy: description: - Whether or not to deploy artifacts after building them. diff --git a/plugins/modules/cloud/misc/terraform.py b/plugins/modules/cloud/misc/terraform.py index 615c125cf3..7b6fbc5126 100644 --- a/plugins/modules/cloud/misc/terraform.py +++ b/plugins/modules/cloud/misc/terraform.py @@ -105,7 +105,6 @@ options: resources selected here will also auto-include any dependencies. type: list elements: str - default: [] lock: description: - Enable statefile locking, if you use a service that accepts locks (such diff --git a/plugins/modules/cloud/oneandone/oneandone_firewall_policy.py b/plugins/modules/cloud/oneandone/oneandone_firewall_policy.py index 23203e8d05..9d9f042f2b 100644 --- a/plugins/modules/cloud/oneandone/oneandone_firewall_policy.py +++ b/plugins/modules/cloud/oneandone/oneandone_firewall_policy.py @@ -48,7 +48,6 @@ options: (port_from, port_to, and source) type: list elements: dict - default: [] add_server_ips: description: - A list of server identifiers (id or name) to be assigned to a firewall policy. @@ -56,14 +55,12 @@ options: type: list elements: str required: false - default: [] remove_server_ips: description: - A list of server IP ids to be unassigned from a firewall policy. Used in combination with update state. type: list elements: str required: false - default: [] add_rules: description: - A list of rules that will be added to an existing firewall policy. @@ -71,14 +68,12 @@ options: type: list elements: dict required: false - default: [] remove_rules: description: - A list of rule ids that will be removed from an existing firewall policy. Used in combination with update state. type: list elements: str required: false - default: [] description: description: - Firewall policy description. maxLength=256 diff --git a/plugins/modules/cloud/oneandone/oneandone_load_balancer.py b/plugins/modules/cloud/oneandone/oneandone_load_balancer.py index 04aefde63a..3407e264ad 100644 --- a/plugins/modules/cloud/oneandone/oneandone_load_balancer.py +++ b/plugins/modules/cloud/oneandone/oneandone_load_balancer.py @@ -86,7 +86,6 @@ options: port_balancer, and port_server parameters, in addition to source parameter, which is optional. type: list elements: dict - default: [] description: description: - Description of the load balancer. maxLength=256 @@ -99,14 +98,12 @@ options: type: list elements: str required: false - default: [] remove_server_ips: description: - A list of server IP ids to be unassigned from a load balancer. Used in combination with update state. type: list elements: str required: false - default: [] add_rules: description: - A list of rules that will be added to an existing load balancer. @@ -114,14 +111,12 @@ options: type: list elements: dict required: false - default: [] remove_rules: description: - A list of rule ids that will be removed from an existing load balancer. Used in combination with update state. type: list elements: str required: false - default: [] wait: description: - wait for the instance to be in state 'running' before returning diff --git a/plugins/modules/cloud/oneandone/oneandone_monitoring_policy.py b/plugins/modules/cloud/oneandone/oneandone_monitoring_policy.py index 46c68e86e0..cd9ee40ca2 100644 --- a/plugins/modules/cloud/oneandone/oneandone_monitoring_policy.py +++ b/plugins/modules/cloud/oneandone/oneandone_monitoring_policy.py @@ -62,7 +62,6 @@ options: and value is used to advise when the value is exceeded. type: list elements: dict - default: [] suboptions: cpu: description: @@ -89,7 +88,6 @@ options: - Array of ports that will be monitoring. type: list elements: dict - default: [] suboptions: protocol: description: @@ -114,7 +112,6 @@ options: - Array of processes that will be monitoring. type: list elements: dict - default: [] suboptions: process: description: @@ -131,56 +128,48 @@ options: type: list elements: dict required: false - default: [] add_processes: description: - Processes to add to the monitoring policy. type: list elements: dict required: false - default: [] add_servers: description: - Servers to add to the monitoring policy. type: list elements: str required: false - default: [] remove_ports: description: - Ports to remove from the monitoring policy. type: list elements: str required: false - default: [] remove_processes: description: - Processes to remove from the monitoring policy. type: list elements: str required: false - default: [] remove_servers: description: - Servers to remove from the monitoring policy. type: list elements: str required: false - default: [] update_ports: description: - Ports to be updated on the monitoring policy. type: list elements: dict required: false - default: [] update_processes: description: - Processes to be updated on the monitoring policy. type: list elements: dict required: false - default: [] wait: description: - wait for the instance to be in state 'running' before returning diff --git a/plugins/modules/cloud/oneandone/oneandone_private_network.py b/plugins/modules/cloud/oneandone/oneandone_private_network.py index a6db23310a..36633716f7 100644 --- a/plugins/modules/cloud/oneandone/oneandone_private_network.py +++ b/plugins/modules/cloud/oneandone/oneandone_private_network.py @@ -62,13 +62,11 @@ options: - List of server identifiers (name or id) to be added to the private network. type: list elements: str - default: [] remove_members: description: - List of server identifiers (name or id) to be removed from the private network. type: list elements: str - default: [] wait: description: - wait for the instance to be in state 'running' before returning diff --git a/plugins/modules/cloud/packet/packet_device.py b/plugins/modules/cloud/packet/packet_device.py index 6b78406a6e..e8452f99eb 100644 --- a/plugins/modules/cloud/packet/packet_device.py +++ b/plugins/modules/cloud/packet/packet_device.py @@ -136,7 +136,6 @@ options: - URL of custom iPXE script for provisioning. - More about custom iPXE for Packet devices at U(https://help.packet.net/technical/infrastructure/custom-ipxe). type: str - default: '' always_pxe: description: diff --git a/plugins/modules/cloud/profitbricks/profitbricks.py b/plugins/modules/cloud/profitbricks/profitbricks.py index cb41491464..42e6a1314b 100644 --- a/plugins/modules/cloud/profitbricks/profitbricks.py +++ b/plugins/modules/cloud/profitbricks/profitbricks.py @@ -38,7 +38,6 @@ options: - Public SSH keys allowing access to the virtual machine. type: list elements: str - default: [] datacenter: description: - The datacenter to provision this virtual machine. @@ -75,7 +74,6 @@ options: - list of instance ids, currently only used when state='absent' to remove instances. type: list elements: str - default: [] count: description: - The number of virtual machines to create. diff --git a/plugins/modules/cloud/profitbricks/profitbricks_volume.py b/plugins/modules/cloud/profitbricks/profitbricks_volume.py index 2d449fd92a..a49948b4bf 100644 --- a/plugins/modules/cloud/profitbricks/profitbricks_volume.py +++ b/plugins/modules/cloud/profitbricks/profitbricks_volume.py @@ -50,7 +50,7 @@ options: - Public SSH keys allowing access to the virtual machine. type: list elements: str - default: [] + required: false disk_type: description: - The disk type of the volume. @@ -81,7 +81,7 @@ options: - list of instance ids, currently only used when state='absent' to remove instances. type: list elements: str - default: [] + required: false subscription_user: description: - The ProfitBricks username. Overrides the PB_SUBSCRIPTION_ID environment variable. diff --git a/plugins/modules/cloud/pubnub/pubnub_blocks.py b/plugins/modules/cloud/pubnub/pubnub_blocks.py index 9942c57134..8e9a56bdf5 100644 --- a/plugins/modules/cloud/pubnub/pubnub_blocks.py +++ b/plugins/modules/cloud/pubnub/pubnub_blocks.py @@ -37,7 +37,6 @@ options: same play)." required: false type: str - default: '' password: description: - Password which match to account to which specified C(email) belong. @@ -45,7 +44,6 @@ options: same play)." required: false type: str - default: '' cache: description: > In case if single play use blocks management module few times it is @@ -60,7 +58,7 @@ options: manage blocks." - "User's account will be used if value not set or empty." type: str - default: '' + required: false application: description: - "Name of target PubNub application for which blocks configuration on diff --git a/plugins/modules/cloud/rackspace/rax.py b/plugins/modules/cloud/rackspace/rax.py index b35384173a..35f88dde81 100644 --- a/plugins/modules/cloud/rackspace/rax.py +++ b/plugins/modules/cloud/rackspace/rax.py @@ -82,20 +82,17 @@ options: default: false extra_client_args: type: dict - default: {} description: - A hash of key/value pairs to be used when creating the cloudservers client. This is considered an advanced option, use it wisely and with caution. extra_create_args: type: dict - default: {} description: - A hash of key/value pairs to be used when creating a new server. This is considered an advanced option, use it wisely and with caution. files: type: dict - default: {} description: - Files to insert into the instance. remotefilename:localcontent flavor: @@ -127,7 +124,6 @@ options: - keypair meta: type: dict - default: {} description: - A hash of metadata to associate with the instance name: diff --git a/plugins/modules/cloud/rackspace/rax_cbs.py b/plugins/modules/cloud/rackspace/rax_cbs.py index dd8bcefa35..cde1d98755 100644 --- a/plugins/modules/cloud/rackspace/rax_cbs.py +++ b/plugins/modules/cloud/rackspace/rax_cbs.py @@ -26,7 +26,6 @@ options: C(name). This option requires C(pyrax>=1.9.3). meta: type: dict - default: {} description: - A hash of metadata to associate with the volume. name: diff --git a/plugins/modules/cloud/rackspace/rax_clb.py b/plugins/modules/cloud/rackspace/rax_clb.py index 7d45c865f0..8e5db34e50 100644 --- a/plugins/modules/cloud/rackspace/rax_clb.py +++ b/plugins/modules/cloud/rackspace/rax_clb.py @@ -28,7 +28,6 @@ options: default: LEAST_CONNECTIONS meta: type: dict - default: {} description: - A hash of metadata to associate with the instance name: diff --git a/plugins/modules/cloud/rackspace/rax_files.py b/plugins/modules/cloud/rackspace/rax_files.py index 1c549827cc..6599c88d16 100644 --- a/plugins/modules/cloud/rackspace/rax_files.py +++ b/plugins/modules/cloud/rackspace/rax_files.py @@ -27,7 +27,6 @@ options: - The container to use for container or metadata operations. meta: type: dict - default: {} description: - A hash of items to set as metadata values on a container private: diff --git a/plugins/modules/cloud/rackspace/rax_files_objects.py b/plugins/modules/cloud/rackspace/rax_files_objects.py index 82bedffddb..a7c36e6920 100644 --- a/plugins/modules/cloud/rackspace/rax_files_objects.py +++ b/plugins/modules/cloud/rackspace/rax_files_objects.py @@ -38,7 +38,6 @@ options: - Used to set an expiration in seconds on an uploaded file or folder. meta: type: dict - default: {} description: - Items to set as metadata values on an uploaded file or folder. method: diff --git a/plugins/modules/cloud/rackspace/rax_meta.py b/plugins/modules/cloud/rackspace/rax_meta.py index 33acad365c..7937696f88 100644 --- a/plugins/modules/cloud/rackspace/rax_meta.py +++ b/plugins/modules/cloud/rackspace/rax_meta.py @@ -30,7 +30,6 @@ options: - Server name to modify metadata for meta: type: dict - default: {} description: - A hash of metadata to associate with the instance author: "Matt Martz (@sivel)" diff --git a/plugins/modules/cloud/rackspace/rax_mon_check.py b/plugins/modules/cloud/rackspace/rax_mon_check.py index c6259dab47..adbd7e7600 100644 --- a/plugins/modules/cloud/rackspace/rax_mon_check.py +++ b/plugins/modules/cloud/rackspace/rax_mon_check.py @@ -87,7 +87,6 @@ options: I(ip_addresses) hash to resolve an IP address to target. details: type: dict - default: {} description: - Additional details specific to the check type. Must be a hash of strings between 1 and 255 characters long, or an array or object containing 0 to @@ -99,7 +98,6 @@ options: default: false metadata: type: dict - default: {} description: - Hash of arbitrary key-value pairs to accompany this check if it fires. Keys and values must be strings between 1 and 255 characters long. diff --git a/plugins/modules/cloud/rackspace/rax_mon_entity.py b/plugins/modules/cloud/rackspace/rax_mon_entity.py index cc502496dc..e8dabef69e 100644 --- a/plugins/modules/cloud/rackspace/rax_mon_entity.py +++ b/plugins/modules/cloud/rackspace/rax_mon_entity.py @@ -38,7 +38,6 @@ options: bound. Necessary to collect C(agent.) rax_mon_checks against this entity. named_ip_addresses: type: dict - default: {} description: - Hash of IP addresses that may be referenced by name by rax_mon_checks added to this entity. Must be a dictionary of with keys that are names @@ -46,7 +45,6 @@ options: addresses. metadata: type: dict - default: {} description: - Hash of arbitrary C(name), C(value) pairs that are passed to associated rax_mon_alarms. Names and values must all be between 1 and 255 characters diff --git a/plugins/modules/cloud/rackspace/rax_scaling_group.py b/plugins/modules/cloud/rackspace/rax_scaling_group.py index ef31cbb031..6389f91a26 100644 --- a/plugins/modules/cloud/rackspace/rax_scaling_group.py +++ b/plugins/modules/cloud/rackspace/rax_scaling_group.py @@ -37,7 +37,6 @@ options: - manual files: type: dict - default: {} description: - 'Files to insert into the instance. Hash of C(remotepath: localpath)' flavor: @@ -67,7 +66,6 @@ options: required: true meta: type: dict - default: {} description: - A hash of metadata to associate with the instance min_entities: diff --git a/plugins/modules/cloud/scaleway/scaleway_container_registry.py b/plugins/modules/cloud/scaleway/scaleway_container_registry.py index 294be2cb4c..ed10ddf292 100644 --- a/plugins/modules/cloud/scaleway/scaleway_container_registry.py +++ b/plugins/modules/cloud/scaleway/scaleway_container_registry.py @@ -60,7 +60,6 @@ options: description: - Description of the container registry. type: str - default: '' privacy_policy: type: str diff --git a/plugins/modules/cloud/scaleway/scaleway_lb.py b/plugins/modules/cloud/scaleway/scaleway_lb.py index 124cba5945..b323064012 100644 --- a/plugins/modules/cloud/scaleway/scaleway_lb.py +++ b/plugins/modules/cloud/scaleway/scaleway_lb.py @@ -66,7 +66,6 @@ options: tags: type: list elements: str - default: [] description: - List of tags to apply to the load-balancer diff --git a/plugins/modules/cloud/softlayer/sl_vm.py b/plugins/modules/cloud/softlayer/sl_vm.py index 56b3ccdd39..851f7a7f53 100644 --- a/plugins/modules/cloud/softlayer/sl_vm.py +++ b/plugins/modules/cloud/softlayer/sl_vm.py @@ -143,7 +143,6 @@ options: - List of ssh keys by their Id to be assigned to a virtual instance. type: list elements: str - default: [] post_uri: description: - URL of a post provisioning script to be loaded and executed on virtual instance. diff --git a/plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py b/plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py index df2b8d84db..40d0270800 100644 --- a/plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py +++ b/plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py @@ -503,12 +503,6 @@ options: Only works if wait_for_instances is True. type: int - do_not_update: - description: - - TODO document. - type: list - default: [] - ''' EXAMPLES = ''' # Basic configuration YAML example diff --git a/plugins/modules/cloud/univention/udm_dns_zone.py b/plugins/modules/cloud/univention/udm_dns_zone.py index b75cbe95ac..9b80368536 100644 --- a/plugins/modules/cloud/univention/udm_dns_zone.py +++ b/plugins/modules/cloud/univention/udm_dns_zone.py @@ -43,13 +43,11 @@ options: nameserver: type: list elements: str - default: [] description: - List of appropriate name servers. Required if I(state=present). interfaces: type: list elements: str - default: [] description: - List of interface IP addresses, on which the server should response this zone. Required if I(state=present). diff --git a/plugins/modules/cloud/univention/udm_group.py b/plugins/modules/cloud/univention/udm_group.py index 74916cfee2..034cdca1c3 100644 --- a/plugins/modules/cloud/univention/udm_group.py +++ b/plugins/modules/cloud/univention/udm_group.py @@ -45,13 +45,11 @@ options: - define the whole ldap position of the group, e.g. C(cn=g123m-1A,cn=classes,cn=schueler,cn=groups,ou=schule,dc=example,dc=com). type: str - default: '' ou: required: false description: - LDAP OU, e.g. school for LDAP OU C(ou=school,dc=example,dc=com). type: str - default: '' subpath: required: false description: diff --git a/plugins/modules/cloud/univention/udm_user.py b/plugins/modules/cloud/univention/udm_user.py index d5b26fbb28..5fef1a337a 100644 --- a/plugins/modules/cloud/univention/udm_user.py +++ b/plugins/modules/cloud/univention/udm_user.py @@ -169,7 +169,6 @@ options: description: - List of telephone numbers. type: list - default: [] postcode: description: - Postal code of users business address. @@ -201,13 +200,11 @@ options: join." aliases: [ sambaPrivileges ] type: list - default: [] samba_user_workstations: description: - Allow the authentication only on this Microsoft Windows host. aliases: [ sambaUserWorkstations ] type: list - default: [] sambahome: description: - Windows home path, e.g. C('\\$FQDN\$USERNAME'). diff --git a/plugins/modules/database/mssql/mssql_db.py b/plugins/modules/database/mssql/mssql_db.py index a7d16b2710..7e64dcc2cc 100644 --- a/plugins/modules/database/mssql/mssql_db.py +++ b/plugins/modules/database/mssql/mssql_db.py @@ -27,12 +27,10 @@ options: description: - The username used to authenticate with type: str - default: '' login_password: description: - The password used to authenticate with type: str - default: '' login_host: description: - Host running the database diff --git a/plugins/modules/files/iso_customize.py b/plugins/modules/files/iso_customize.py index c3a2ae2651..a6136cdd8f 100644 --- a/plugins/modules/files/iso_customize.py +++ b/plugins/modules/files/iso_customize.py @@ -40,7 +40,6 @@ options: type: list required: false elements: str - default: [] add_files: description: - Allows to add and replace files in the ISO file. @@ -48,7 +47,6 @@ options: type: list required: false elements: dict - default: [] suboptions: src_file: description: diff --git a/plugins/modules/files/xml.py b/plugins/modules/files/xml.py index a35cc31ef0..05bbdf00c8 100644 --- a/plugins/modules/files/xml.py +++ b/plugins/modules/files/xml.py @@ -40,7 +40,6 @@ options: - The namespace C(prefix:uri) mapping for the XPath expression. - Needs to be a C(dict), not a C(list) of items. type: dict - default: {} state: description: - Set or remove an xpath selection (node(s), attribute(s)). diff --git a/plugins/modules/identity/onepassword_info.py b/plugins/modules/identity/onepassword_info.py index ddf8579cb1..8118709b17 100644 --- a/plugins/modules/identity/onepassword_info.py +++ b/plugins/modules/identity/onepassword_info.py @@ -86,6 +86,7 @@ options: description: - The secret key for your subdomain. - Only required for initial sign in. + default: {} required: false cli_path: type: path diff --git a/plugins/modules/monitoring/sensu/sensu_check.py b/plugins/modules/monitoring/sensu/sensu_check.py index 07b7a060e1..943a653249 100644 --- a/plugins/modules/monitoring/sensu/sensu_check.py +++ b/plugins/modules/monitoring/sensu/sensu_check.py @@ -53,12 +53,14 @@ options: elements: str description: - List of handlers to notify when the check fails + default: [] subscribers: type: list elements: str description: - List of subscribers/channels this check should run for - See sensu_subscribers to subscribe a machine to a channel + default: [] interval: type: int description: @@ -90,6 +92,7 @@ options: elements: str description: - Other checks this check depends on, if dependencies fail handling of this check will be disabled + default: [] metric: description: - Whether the check is a metric @@ -135,6 +138,7 @@ options: description: - A hash/dictionary of custom parameters for mixing to the configuration. - You can't rewrite others module parameters using this + default: {} source: type: str description: diff --git a/plugins/modules/monitoring/statsd.py b/plugins/modules/monitoring/statsd.py index aed1c08397..26c8e7c283 100644 --- a/plugins/modules/monitoring/statsd.py +++ b/plugins/modules/monitoring/statsd.py @@ -62,7 +62,6 @@ options: type: str description: - The prefix to add to the metric. - default: '' value: type: int required: true diff --git a/plugins/modules/net_tools/dnsmadeeasy.py b/plugins/modules/net_tools/dnsmadeeasy.py index cb27a5a68a..ec9e9951cd 100644 --- a/plugins/modules/net_tools/dnsmadeeasy.py +++ b/plugins/modules/net_tools/dnsmadeeasy.py @@ -127,6 +127,7 @@ options: description: - Name or id of the contact list that the monitor will notify. - The default C('') means the Account Owner. + default: '' type: str httpFqdn: diff --git a/plugins/modules/net_tools/infinity/infinity.py b/plugins/modules/net_tools/infinity/infinity.py index 4b0e835209..53fa7efd48 100644 --- a/plugins/modules/net_tools/infinity/infinity.py +++ b/plugins/modules/net_tools/infinity/infinity.py @@ -42,22 +42,27 @@ options: description: - Network ID. type: str + default: '' ip_address: description: - IP Address for a reservation or a release. type: str + default: '' network_address: description: - Network address with CIDR format (e.g., 192.168.310.0). type: str + default: '' network_size: description: - Network bitmask (e.g. 255.255.255.220) or CIDR format (e.g., /26). type: str + default: '' network_name: description: - The name of a network. type: str + default: '' network_location: description: - The parent network id for a given network. diff --git a/plugins/modules/net_tools/ldap/ldap_entry.py b/plugins/modules/net_tools/ldap/ldap_entry.py index d15b31f6d3..affdafeb6c 100644 --- a/plugins/modules/net_tools/ldap/ldap_entry.py +++ b/plugins/modules/net_tools/ldap/ldap_entry.py @@ -37,7 +37,6 @@ options: entries are never modified. To assert specific attribute values on an existing entry, use M(community.general.ldap_attrs) module instead. type: dict - default: {} objectClass: description: - If I(state=present), value or list of values to use when creating diff --git a/plugins/modules/notification/mail.py b/plugins/modules/notification/mail.py index 9d01fc59a7..697ed49ee7 100644 --- a/plugins/modules/notification/mail.py +++ b/plugins/modules/notification/mail.py @@ -49,14 +49,12 @@ options: - This is a list, which may contain address and phrase portions. type: list elements: str - default: [] bcc: description: - The email-address(es) the mail is being 'blind' copied to. - This is a list, which may contain address and phrase portions. type: list elements: str - default: [] subject: description: - The subject of the email being sent. diff --git a/plugins/modules/packaging/language/composer.py b/plugins/modules/packaging/language/composer.py index 34a15edda5..64310c760e 100644 --- a/plugins/modules/packaging/language/composer.py +++ b/plugins/modules/packaging/language/composer.py @@ -31,7 +31,6 @@ options: type: str description: - Composer arguments like required package, version and so on. - default: '' executable: type: path description: diff --git a/plugins/modules/packaging/language/maven_artifact.py b/plugins/modules/packaging/language/maven_artifact.py index 754c2392ba..b909f509a4 100644 --- a/plugins/modules/packaging/language/maven_artifact.py +++ b/plugins/modules/packaging/language/maven_artifact.py @@ -51,7 +51,6 @@ options: type: str description: - The maven classifier coordinate - default: '' extension: type: str description: diff --git a/plugins/modules/packaging/os/opkg.py b/plugins/modules/packaging/os/opkg.py index 60d2adc958..f7f3e6ab27 100644 --- a/plugins/modules/packaging/os/opkg.py +++ b/plugins/modules/packaging/os/opkg.py @@ -47,7 +47,6 @@ options: - "remove" - "checksum" - "removal-of-dependent-packages" - default: "" type: str update_cache: description: diff --git a/plugins/modules/packaging/os/pacman.py b/plugins/modules/packaging/os/pacman.py index 1066f10e88..c8d6caebe5 100644 --- a/plugins/modules/packaging/os/pacman.py +++ b/plugins/modules/packaging/os/pacman.py @@ -73,7 +73,7 @@ options: extra_args: description: - Additional option to pass to pacman when enforcing C(state). - default: '' + default: type: str update_cache: @@ -89,7 +89,7 @@ options: update_cache_extra_args: description: - Additional option to pass to pacman when enforcing C(update_cache). - default: '' + default: type: str upgrade: @@ -102,7 +102,7 @@ options: upgrade_extra_args: description: - Additional option to pass to pacman when enforcing C(upgrade). - default: '' + default: type: str reason: diff --git a/plugins/modules/packaging/os/redhat_subscription.py b/plugins/modules/packaging/os/redhat_subscription.py index 69aa550c5d..26b7d9df2a 100644 --- a/plugins/modules/packaging/os/redhat_subscription.py +++ b/plugins/modules/packaging/os/redhat_subscription.py @@ -152,6 +152,7 @@ options: When some attribute is not listed in the new list of attributes, the existing attribute will be removed from C(syspurpose.json) file. Unknown attributes are ignored. type: dict + default: {} suboptions: usage: description: Syspurpose attribute usage diff --git a/plugins/modules/packaging/os/sorcery.py b/plugins/modules/packaging/os/sorcery.py index bd16da1f52..23070ad3b3 100644 --- a/plugins/modules/packaging/os/sorcery.py +++ b/plugins/modules/packaging/os/sorcery.py @@ -76,7 +76,6 @@ options: - especially useful for SCM and rsync grimoires - makes sense only in pair with C(update_cache) type: int - default: 0 ''' diff --git a/plugins/modules/remote_management/lenovoxcc/xcc_redfish_command.py b/plugins/modules/remote_management/lenovoxcc/xcc_redfish_command.py index 4fb0dfe178..8a213d85ff 100644 --- a/plugins/modules/remote_management/lenovoxcc/xcc_redfish_command.py +++ b/plugins/modules/remote_management/lenovoxcc/xcc_redfish_command.py @@ -70,7 +70,6 @@ options: - The list of media types appropriate for the image. type: list elements: str - default: [] image_url: description: - The URL of the image to insert or eject. diff --git a/plugins/modules/remote_management/manageiq/manageiq_tenant.py b/plugins/modules/remote_management/manageiq/manageiq_tenant.py index 0f4473092b..f696934b2f 100644 --- a/plugins/modules/remote_management/manageiq/manageiq_tenant.py +++ b/plugins/modules/remote_management/manageiq/manageiq_tenant.py @@ -65,7 +65,7 @@ options: - ' - C(vms_allocated) (int): use null to remove the quota.' - ' - C(templates_allocated) (int): use null to remove the quota.' required: false - default: {} + default: null ''' EXAMPLES = ''' diff --git a/plugins/modules/remote_management/redfish/redfish_command.py b/plugins/modules/remote_management/redfish/redfish_command.py index 43443cf38e..4ab519f5a4 100644 --- a/plugins/modules/remote_management/redfish/redfish_command.py +++ b/plugins/modules/remote_management/redfish/redfish_command.py @@ -116,7 +116,6 @@ options: description: - Properties of account service to update. type: dict - default: {} version_added: '0.2.0' resource_id: required: false @@ -142,7 +141,6 @@ options: - List of target resource URIs to apply the update to. type: list elements: str - default: [] version_added: '0.2.0' update_creds: required: false @@ -174,7 +172,6 @@ options: - List of media types appropriate for the image. type: list elements: str - default: [] image_url: required: false description: diff --git a/plugins/modules/remote_management/redfish/redfish_config.py b/plugins/modules/remote_management/redfish/redfish_config.py index 07ac2e1588..0e7d1537bf 100644 --- a/plugins/modules/remote_management/redfish/redfish_config.py +++ b/plugins/modules/remote_management/redfish/redfish_config.py @@ -72,7 +72,6 @@ options: description: - Setting dict of manager services to update. type: dict - default: {} version_added: '0.2.0' resource_id: required: false @@ -92,7 +91,6 @@ options: description: - Setting dict of EthernetInterface on OOB controller. type: dict - default: {} version_added: '0.2.0' strip_etag_quotes: description: @@ -108,7 +106,6 @@ options: description: - Setting dict of HostInterface on OOB controller. type: dict - default: {} version_added: '4.1.0' hostinterface_id: required: false @@ -121,7 +118,6 @@ options: description: - Setting dict of Sessions. type: dict - default: {} version_added: '5.7.0' author: "Jose Delarosa (@jose-delarosa)" diff --git a/plugins/modules/remote_management/stacki/stacki_host.py b/plugins/modules/remote_management/stacki/stacki_host.py index d5f968c909..2e339bf280 100644 --- a/plugins/modules/remote_management/stacki/stacki_host.py +++ b/plugins/modules/remote_management/stacki/stacki_host.py @@ -74,14 +74,12 @@ options: - Rack to be used in host creation. - Required if I(state) is C(present) and host does not yet exist. type: int - default: 0 rank: description: - Rank to be used in host creation. - In Stacki terminology, the rank is the position of the machine in a rack. - Required if I(state) is C(present) and host does not yet exist. type: int - default: 0 network: description: - Network to be configured in the host. diff --git a/plugins/modules/source_control/gitlab/gitlab_hook.py b/plugins/modules/source_control/gitlab/gitlab_hook.py index c10cb45324..f69ed8f4e1 100644 --- a/plugins/modules/source_control/gitlab/gitlab_hook.py +++ b/plugins/modules/source_control/gitlab/gitlab_hook.py @@ -55,7 +55,6 @@ options: - Branch name of wildcard to trigger hook on push events type: str version_added: '0.2.0' - default: '' issues_events: description: - Trigger hook on issues events. diff --git a/plugins/modules/storage/zfs/zfs.py b/plugins/modules/storage/zfs/zfs.py index 84e5c05b1f..a09a386f41 100644 --- a/plugins/modules/storage/zfs/zfs.py +++ b/plugins/modules/storage/zfs/zfs.py @@ -38,7 +38,6 @@ options: - A dictionary of zfs properties to be set. - See the zfs(8) man page for more information. type: dict - default: {} notes: - C(check_mode) is supported, but in certain situations it may report a task as changed that will not be reported as changed when C(check_mode) is disabled. diff --git a/plugins/modules/storage/zfs/zfs_facts.py b/plugins/modules/storage/zfs/zfs_facts.py index 15eef706e5..ee0884f995 100644 --- a/plugins/modules/storage/zfs/zfs_facts.py +++ b/plugins/modules/storage/zfs/zfs_facts.py @@ -52,7 +52,6 @@ options: description: - Specifies recursion depth. type: int - default: 0 ''' EXAMPLES = ''' diff --git a/plugins/modules/system/aix_lvol.py b/plugins/modules/system/aix_lvol.py index 6219bdb8e3..99bd3ead9b 100644 --- a/plugins/modules/system/aix_lvol.py +++ b/plugins/modules/system/aix_lvol.py @@ -62,13 +62,11 @@ options: description: - Free-form options to be passed to the mklv command. type: str - default: '' pvs: description: - A list of physical volumes e.g. C(hdisk1,hdisk2). type: list elements: str - default: [] ''' EXAMPLES = r''' diff --git a/plugins/modules/system/java_cert.py b/plugins/modules/system/java_cert.py index 1d1327ed71..a78d71155a 100644 --- a/plugins/modules/system/java_cert.py +++ b/plugins/modules/system/java_cert.py @@ -56,6 +56,7 @@ options: description: - Password for importing from PKCS12 keystore. type: str + default: '' pkcs12_alias: description: - Alias in the PKCS12 keystore. diff --git a/plugins/modules/system/lvg.py b/plugins/modules/system/lvg.py index ca38565f4a..0bb91583fa 100644 --- a/plugins/modules/system/lvg.py +++ b/plugins/modules/system/lvg.py @@ -42,7 +42,6 @@ options: description: - Additional options to pass to C(pvcreate) when creating the volume group. type: str - default: '' pvresize: description: - If C(true), resize the physical volume to the maximum available size. @@ -53,7 +52,6 @@ options: description: - Additional options to pass to C(vgcreate) when creating the volume group. type: str - default: '' state: description: - Control if the volume group exists. diff --git a/plugins/modules/system/selinux_permissive.py b/plugins/modules/system/selinux_permissive.py index 3563775d14..2578519909 100644 --- a/plugins/modules/system/selinux_permissive.py +++ b/plugins/modules/system/selinux_permissive.py @@ -38,7 +38,6 @@ options: description: - Name of the SELinux policy store to use. type: str - default: '' notes: - Requires a recent version of SELinux and C(policycoreutils-python) (EL 6 or newer). requirements: [ policycoreutils-python ] diff --git a/plugins/modules/web_infrastructure/jira.py b/plugins/modules/web_infrastructure/jira.py index 3b006a55bb..979dd6d69c 100644 --- a/plugins/modules/web_infrastructure/jira.py +++ b/plugins/modules/web_infrastructure/jira.py @@ -161,7 +161,6 @@ options: and the JIRA REST API for the structure required for various fields. - When passed to comment, the data structure is merged at the first level since community.general 4.6.0. Useful to add JIRA properties for example. - Note that JIRA may not allow changing field values on specific transitions or states. - default: {} jql: required: false diff --git a/plugins/modules/web_infrastructure/sophos_utm/utm_aaa_group.py b/plugins/modules/web_infrastructure/sophos_utm/utm_aaa_group.py index cff1834c93..7d55449f63 100644 --- a/plugins/modules/web_infrastructure/sophos_utm/utm_aaa_group.py +++ b/plugins/modules/web_infrastructure/sophos_utm/utm_aaa_group.py @@ -33,12 +33,10 @@ options: - List of adirectory group strings. type: list elements: str - default: [] adirectory_groups_sids: description: - Dictionary of group sids. type: dict - default: {} backend_match: description: - The backend for the group. @@ -70,22 +68,18 @@ options: - List of edirectory group strings. type: list elements: str - default: [] ipsec_dn: description: - The ipsec dn string. type: str - default: '' ldap_attribute: description: - The ldap attribute to check against. type: str - default: '' ldap_attribute_value: description: - The ldap attribute value to check against. type: str - default: '' members: description: - A list of user ref names (aaa/user). diff --git a/plugins/modules/web_infrastructure/sophos_utm/utm_dns_host.py b/plugins/modules/web_infrastructure/sophos_utm/utm_dns_host.py index af91e2433b..387b8301a0 100644 --- a/plugins/modules/web_infrastructure/sophos_utm/utm_dns_host.py +++ b/plugins/modules/web_infrastructure/sophos_utm/utm_dns_host.py @@ -42,7 +42,6 @@ options: type: str description: - An optional comment to add to the dns host object - default: '' hostname: type: str description: @@ -51,7 +50,6 @@ options: type: str description: - The reference name of the interface to use. If not provided the default interface will be used - default: '' resolved: description: - whether the hostname's ipv4 address is already resolved or not diff --git a/plugins/modules/web_infrastructure/sophos_utm/utm_network_interface_address.py b/plugins/modules/web_infrastructure/sophos_utm/utm_network_interface_address.py index e980a0221b..cb10ad49f4 100644 --- a/plugins/modules/web_infrastructure/sophos_utm/utm_network_interface_address.py +++ b/plugins/modules/web_infrastructure/sophos_utm/utm_network_interface_address.py @@ -42,7 +42,6 @@ options: type: str description: - An optional comment to add to the object - default: '' resolved: type: bool description: diff --git a/plugins/modules/web_infrastructure/sophos_utm/utm_proxy_location.py b/plugins/modules/web_infrastructure/sophos_utm/utm_proxy_location.py index c6ff1bd26b..5864cf1924 100644 --- a/plugins/modules/web_infrastructure/sophos_utm/utm_proxy_location.py +++ b/plugins/modules/web_infrastructure/sophos_utm/utm_proxy_location.py @@ -48,7 +48,6 @@ options: type: str description: - The reference name of the auth profile - default: '' backend: type: list elements: str @@ -59,12 +58,10 @@ options: type: str description: - The path of the backend - default: '' comment: type: str description: - The optional comment string - default: '' denied_networks: type: list elements: str diff --git a/tests/integration/targets/lookup_passwordstore/tasks/password_tests.yml b/tests/integration/targets/lookup_passwordstore/tasks/password_tests.yml index a94529e460..c701e199ae 100644 --- a/tests/integration/targets/lookup_passwordstore/tasks/password_tests.yml +++ b/tests/integration/targets/lookup_passwordstore/tasks/password_tests.yml @@ -5,7 +5,7 @@ - name: Create a password ({{ backend }}) set_fact: - newpass: "{{ lookup('community.general.passwordstore', 'test-pass', length=8, create=true, backend=backend) }}" + newpass: "{{ lookup('community.general.passwordstore', 'test-pass length=8 create=yes', backend=backend) }}" - name: Fetch password from an existing file ({{ backend }}) set_fact: @@ -18,7 +18,7 @@ - name: Create a password with equal sign ({{ backend }}) set_fact: - newpass: "{{ lookup('community.general.passwordstore', 'test-pass-equal userpass=SimpleSample= create=true', backend=backend) }}" + newpass: "{{ lookup('community.general.passwordstore', 'test-pass-equal userpass=SimpleSample= create=yes', backend=backend) }}" - name: Fetch a password with equal sign ({{ backend }}) set_fact: @@ -31,7 +31,7 @@ - name: Create a password using missing=create ({{ backend }}) set_fact: - newpass: "{{ lookup('community.general.passwordstore', 'test-missing-create', missing='create', length=8, backend=backend) }}" + newpass: "{{ lookup('community.general.passwordstore', 'test-missing-create missing=create length=8', backend=backend) }}" - name: Fetch password from an existing file ({{ backend }}) set_fact: @@ -44,7 +44,7 @@ - name: Fetch password from existing file using missing=empty ({{ backend }}) set_fact: - readpass: "{{ lookup('community.general.passwordstore', 'test-missing-create', missing='empty', backend=backend) }}" + readpass: "{{ lookup('community.general.passwordstore', 'test-missing-create missing=empty', backend=backend) }}" - name: Verify password ({{ backend }}) assert: @@ -53,7 +53,7 @@ - name: Fetch password from non-existing file using missing=empty ({{ backend }}) set_fact: - readpass: "{{ query('community.general.passwordstore', 'test-missing-pass', missing='empty', backend=backend) }}" + readpass: "{{ query('community.general.passwordstore', 'test-missing-pass missing=empty', backend=backend) }}" - name: Verify password ({{ backend }}) assert: @@ -71,7 +71,7 @@ - name: Fetch a password with YAML subkey ({{ backend }}) set_fact: - readyamlpass: "{{ lookup('community.general.passwordstore', 'test-yaml-pass', subkey='key', backend=backend) }}" + readyamlpass: "{{ lookup('community.general.passwordstore', 'test-yaml-pass subkey=key', backend=backend) }}" - name: Read a yaml subkey ({{ backend }}) assert: @@ -96,7 +96,7 @@ - name: Fetch all from multiline file ({{ backend }}) set_fact: - readyamlpass: "{{ lookup('community.general.passwordstore', 'test-multiline-pass', returnall='yes', backend=backend) }}" + readyamlpass: "{{ lookup('community.general.passwordstore', 'test-multiline-pass returnall=yes', backend=backend) }}" - name: Multiline pass returnall returns everything in the file ({{ backend }}) assert: @@ -105,7 +105,7 @@ - name: Create a password in a folder ({{ backend }}) set_fact: - newpass: "{{ lookup('community.general.passwordstore', 'folder/test-pass', length=8, create=true, backend=backend) }}" + newpass: "{{ lookup('community.general.passwordstore', 'folder/test-pass length=8 create=yes', backend=backend) }}" - name: Fetch password from folder ({{ backend }}) set_fact: diff --git a/tests/integration/targets/lookup_passwordstore/tasks/tests.yml b/tests/integration/targets/lookup_passwordstore/tasks/tests.yml index 583aafd108..a18b58d651 100644 --- a/tests/integration/targets/lookup_passwordstore/tasks/tests.yml +++ b/tests/integration/targets/lookup_passwordstore/tasks/tests.yml @@ -125,9 +125,7 @@ that: - eval_error is failed - >- - "Passwordstore directory '" in eval_error.msg - - >- - "/somenonexistentplace' does not exist" in eval_error.msg + "Passwordstore directory 'somenonexistentplace' does not exist" in eval_error.msg - name: Test pass compatibility shim detection block: