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

* 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

plugins/modules/remote_management/ipmi/ipmi_boot.py

@@ -34,22 +34,31 @@ options:
   bootdev:
     description:
       - Set boot device to use on next reboot
+      - "The choices for the device are:
+          - network -- Request network boot
+          - floppy -- Boot from floppy
+          - hd -- Boot from hard drive
+          - safe -- Boot from hard drive, requesting 'safe mode'
+          - optical -- boot from CD/DVD/BD drive
+          - setup -- Boot into setup utility
+          - default -- remove any IPMI directed boot device request"
     required: true
     choices:
-      - network -- Request network boot
-      - floppy -- Boot from floppy
-      - hd -- Boot from hard drive
-      - safe -- Boot from hard drive, requesting 'safe mode'
-      - optical -- boot from CD/DVD/BD drive
-      - setup -- Boot into setup utility
-      - default -- remove any IPMI directed boot device request
+      - network
+      - floppy
+      - hd
+      - safe
+      - optical
+      - setup
+      - default
   state:
     description:
       - Whether to ensure that boot devices is desired.
+      - "The choices for the state are:
+            - present -- Request system turn on
+            - absent -- Request system turn on"
     default: present
-    choices:
-        - present -- Request system turn on
-        - absent -- Request system turn on
+    choices: [ present, absent ]
   persistent:
     description:
       - If set, ask that system firmware uses this device beyond next boot.

plugins/modules/remote_management/ipmi/ipmi_power.py

@@ -34,13 +34,14 @@ options:
   state:
     description:
       - Whether to ensure that the machine in desired state.
+      - "The choices for state are:
+            - on -- Request system turn on
+            - off -- Request system turn off without waiting for OS to shutdown
+            - shutdown -- Have system request OS proper shutdown
+            - reset -- Request system reset without waiting for OS
+            - boot -- If system is off, then 'on', else 'reset'"
+    choices: ['on', 'off', shutdown, reset, boot]
     required: true
-    choices:
-        - on -- Request system turn on
-        - off -- Request system turn off without waiting for OS to shutdown
-        - shutdown -- Have system request OS proper shutdown
-        - reset -- Request system reset without waiting for OS
-        - boot -- If system is off, then 'on', else 'reset'
   timeout:
     description:
       - Maximum number of seconds before interrupt request.