Tidy up validate-modules:doc-choices-do-not-match-spec II: The Rebase (…

…ansible-collections#1409) (ansible-collections#1416)

* fixed validation-modules for plugins/modules/cloud/lxc/lxc_container.py

* fixed validation-modules for plugins/modules/cloud/smartos/vmadm.py

* fixed validation-modules for plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py

* fixed validation-modules for plugins/modules/cloud/univention/udm_dns_record.py

* fixed validation-modules for plugins/modules/cloud/univention/udm_dns_zone.py

* fixed validation-modules for plugins/modules/cloud/lxc/lxc_container.py

* fixed validation-modules for plugins/modules/cloud/univention/udm_user.py

* fixed validation-modules for plugins/modules/clustering/etcd3.py

* fixed validation-modules for plugins/modules/clustering/znode.py

* fixed validation-modules for plugins/modules/remote_management/hpilo/hpilo_boot.py

* fixed validation-modules for plugins/modules/remote_management/ipmi/ipmi_boot.py

* fixed validation-modules for plugins/modules/remote_management/ipmi/ipmi_power.py

* fixed validation-modules for plugins/modules/remote_management/manageiq/manageiq_provider.py

* fixed validation-modules for plugins/modules/remote_management/stacki/stacki_host.py

* fixed validation-modules for plugins/modules/cloud/univention/udm_share.py

* Removed validate-modules:doc-choices-do-not-match-spec from ignore files

* fixed alias samba_inherit_permissions in udm_share.py

* Rolled back a couple of lines

* Removed duplicate key in docs

* Rolled back a couple of troublesome lines

* Removed no-longer necessary ignore lines

* Removed no-longer necessary ignore lines on 2.11 as well

* Removed no-longer necessary ignore lines on 2.9 this time

(cherry picked from commit cff8463)

Co-authored-by: Alexei Znamensky <[email protected]>

plugins/modules/cloud/lxc/lxc_container.py

@@ -19,6 +19,7 @@
     name:
         description:
           - Name of a container.
+        type: str
         required: true
     backing_store:
         choices:
@@ -30,63 +31,80 @@
           - zfs
         description:
           - Backend storage type for the container.
+        type: str
         default: dir
     template:
         description:
           - Name of the template to use within an LXC create.
+        type: str
         default: ubuntu
     template_options:
         description:
           - Template options when building the container.
+        type: str
     config:
         description:
           - Path to the LXC configuration file.
+        type: path
     lv_name:
         description:
           - Name of the logical volume, defaults to the container name.
-        default: $CONTAINER_NAME
+          - If not specified, it defaults to C($CONTAINER_NAME).
+        type: str
     vg_name:
         description:
           - If Backend store is lvm, specify the name of the volume group.
+        type: str
         default: lxc
     thinpool:
         description:
           - Use LVM thin pool called TP.
+        type: str
     fs_type:
         description:
           - Create fstype TYPE.
+        type: str
         default: ext4
     fs_size:
         description:
           - File system Size.
+        type: str
         default: 5G
     directory:
         description:
           - Place rootfs directory under DIR.
+        type: path
     zfs_root:
         description:
           - Create zfs under given zfsroot.
+        type: str
     container_command:
         description:
           - Run a command within a container.
+        type: str
     lxc_path:
         description:
           - Place container under PATH
+        type: path
     container_log:
-        choices:
-          - true
-          - false
         description:
           - Enable a container log for host actions to the container.
         type: bool
         default: 'no'
     container_log_level:
         choices:
+          - Info
+          - info
           - INFO
+          - Error
+          - error
           - ERROR
+          - Debug
+          - debug
           - DEBUG
         description:
           - Set the log level for a container where *container_log* was set.
+        type: str
         required: false
         default: INFO
     clone_name:
@@ -95,19 +113,13 @@
             clone.
         type: str
     clone_snapshot:
-        choices:
-          - true
-          - false
         description:
           - Create a snapshot a container when cloning. This is not supported
             by all container storage backends. Enabling this may fail if the
             backing store does not support snapshots.
         type: bool
         default: 'no'
     archive:
-        choices:
-          - true
-          - false
         description:
           - Create an archive of a container. This will create a tarball of the
             running container.
@@ -117,6 +129,7 @@
         description:
           - Path the save the archived container. If the path does not exist
             the archive method will attempt to create it.
+        type: path
     archive_compression:
         choices:
           - gzip
@@ -125,6 +138,7 @@
         description:
           - Type of compression to use when creating an archive of a running
             container.
+        type: str
         default: gzip
     state:
         choices:
@@ -133,12 +147,14 @@
           - restarted
           - absent
           - frozen
+          - clone
         description:
           - Define the state of a container. If you clone a container using
             `clone_name` the newly cloned container created in a stopped state.
             The running container will be stopped while the clone operation is
             happening and upon completion of the clone the original container
             state will be restored.
+        type: str
         default: started
     container_config:
         description:
@@ -1695,7 +1711,7 @@ def main():
             ),
             container_log=dict(
                 type='bool',
-                default='false'
+                default=False
             ),
             container_log_level=dict(
                 choices=[n for i in LXC_LOGGING_LEVELS.values() for n in i],
@@ -1711,7 +1727,7 @@ def main():
             ),
             archive=dict(
                 type='bool',
-                default='false'
+                default=False
             ),
             archive_path=dict(
                 type='path',

plugins/modules/cloud/smartos/vmadm.py

@@ -207,7 +207,7 @@
         Please note this can be read from the Global Zone.
   state:
     required: true
-    choices: [ present, absent, stopped, restarted ]
+    choices: [ present, running, absent, deleted, stopped, created, restarted, rebooted ]
     description:
       - States for the VM to be in. Please note that C(present), C(stopped) and C(restarted)
         operate on a VM that is currently provisioned. C(present) means that the VM will be

plugins/modules/cloud/spotinst/spotinst_aws_elastigroup.py

@@ -32,12 +32,9 @@
        By default this is retrieved from the credentials path
 
   availability_vs_cost:
-    choices:
-      - availabilityOriented
-      - costOriented
-      - balanced
     description:
       - (String) The strategy orientation.
+      - "The choices available are: C(availabilityOriented), C(costOriented), C(balanced)."
     required: true
 
   availability_zones:
@@ -119,14 +116,9 @@
       - (Integer) Minimal mount of time instance should be unhealthy for us to consider it unhealthy.
 
   health_check_type:
-    choices:
-      - ELB
-      - HCS
-      - TARGET_GROUP
-      - MLB
-      - EC2
     description:
       - (String) The service to use for the health check.
+      - "The choices available are: C(ELB), C(HCS), C(TARGET_GROUP), C(MLB), C(EC2)."
 
   iam_role_name:
     description:
@@ -239,15 +231,9 @@
         should_persist_private_ip (Boolean)
 
   product:
-    choices:
-      - Linux/UNIX
-      - SUSE Linux
-      - Windows
-      - Linux/UNIX (Amazon VPC)
-      - SUSE Linux (Amazon VPC)
-      - Windows
     description:
-      - (String) Operation system type._
+      - (String) Operation system type.
+      - "Available choices are: C(Linux/UNIX), C(SUSE Linux), C(Windows), C(Linux/UNIX (Amazon VPC)), C(SUSE Linux (Amazon VPC))."
     required: true
 
   rancher:
@@ -344,22 +330,18 @@
       - (List of Strings) List of target group arns instances should be registered to
 
   tenancy:
-    choices:
-      - default
-      - dedicated
     description:
-      - (String) dedicated vs shared tenancy
+      - (String) dedicated vs shared tenancy.
+      - "The available choices are: C(default), C(dedicated)."
 
   terminate_at_end_of_billing_hour:
     description:
       - (Boolean) terminate at the end of billing hour
     type: bool
   unit:
-    choices:
-      - instance
-      - weight
     description:
       - (String) The capacity unit to launch instances by.
+      - "The available choices are: C(instance), C(weight)."
     required: true
 
   up_scaling_policies:

plugins/modules/cloud/univention/udm_dns_record.py

@@ -39,11 +39,11 @@
             - Corresponding DNS zone for this record, e.g. example.com.
     type:
         required: true
-        choices: [ host_record, alias, ptr_record, srv_record, txt_record ]
         description:
             - "Define the record type. C(host_record) is a A or AAAA record,
                C(alias) is a CNAME, C(ptr_record) is a PTR record, C(srv_record)
                is a SRV record and C(txt_record) is a TXT record."
+            - "The available choices are: C(host_record), C(alias), C(ptr_record), C(srv_record), C(txt_record)."
     data:
         required: false
         default: []

plugins/modules/cloud/univention/udm_dns_zone.py

@@ -29,9 +29,9 @@
             - Whether the dns zone is present or not.
     type:
         required: true
-        choices: [ forward_zone, reverse_zone ]
         description:
             - Define if the zone is a forward or reverse DNS zone.
+            - "The available choices are: C(forward_zone), C(reverse_zone)."
     zone:
         required: true
         description: