Ensure documented choices match spec

Change-Id: Ia40e846f970a05a894601a7a37af0231f136bab6

plugins/modules/os_image.py

@@ -37,11 +37,13 @@ options:
      description:
         - The format of the disk that is getting uploaded
      default: qcow2
+     choices: ['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2', 'vdi', 'iso', 'vhdx', 'ploop']
      type: str
    container_format:
      description:
         - The format of the container
      default: bare
+     choices: ['ami', 'aki', 'ari', 'bare', 'ovf', 'ova', 'docker']
      type: str
    owner:
      description:

plugins/modules/os_ironic.py

@@ -239,7 +239,7 @@ def main():
             aliases=['skip_update_of_driver_password'],
             deprecated_aliases=[dict(name='skip_update_of_driver_password', version='2.14')]
         ),
-        state=dict(required=False, default='present')
+        state=dict(required=False, default='present', choices=['present', 'absent'])
     )
     module_kwargs = openstack_module_kwargs()
     module = AnsibleModule(argument_spec, **module_kwargs)

plugins/modules/os_quota.py

@@ -28,6 +28,7 @@ options:
             - A value of present sets the quota and a value of absent resets the quota to system defaults.
         default: present
         type: str
+        choices: ['absent', 'present']
     backup_gigabytes:
         description: Maximum size of backups in GB's.
         type: int

plugins/modules/os_subnet.py

@@ -47,6 +47,7 @@ options:
         - The IP version of the subnet 4 or 6
      default: 4
      type: str
+     choices: ['4', '6']
    enable_dhcp:
      description:
         - Whether DHCP should be enabled for this subnet.

tests/sanity/ignore-2.10.txt

@@ -1,9 +1,5 @@
 plugins/module_utils/openstack.py future-import-boilerplate
 plugins/module_utils/openstack.py metaclass-boilerplate
-plugins/modules/os_image.py validate-modules:doc-choices-do-not-match-spec
-plugins/modules/os_ironic.py validate-modules:doc-choices-do-not-match-spec
-plugins/modules/os_quota.py validate-modules:doc-choices-do-not-match-spec
-plugins/modules/os_subnet.py validate-modules:doc-choices-do-not-match-spec
 plugins/doc_fragments/openstack.py future-import-boilerplate
 plugins/doc_fragments/openstack.py metaclass-boilerplate
 tests/unit/mock/path.py future-import-boilerplate

tests/sanity/ignore-2.9.txt

@@ -1,10 +1,5 @@
 plugins/module_utils/openstack.py future-import-boilerplate
 plugins/module_utils/openstack.py metaclass-boilerplate
-plugins/modules/os_image.py validate-modules:doc-choices-do-not-match-spec
-plugins/modules/os_ironic.py validate-modules:doc-choices-do-not-match-spec
-plugins/modules/os_ironic_node.py validate-modules:doc-choices-do-not-match-spec
-plugins/modules/os_quota.py validate-modules:doc-choices-do-not-match-spec
-plugins/modules/os_subnet.py validate-modules:doc-choices-do-not-match-spec
 plugins/doc_fragments/openstack.py future-import-boilerplate
 plugins/doc_fragments/openstack.py metaclass-boilerplate
 tests/unit/mock/path.py future-import-boilerplate