Fix doc requirements, and consistently require python 3.6+

Change-Id: I43f4ba5718422f75f553e3cae88fa887722aa044

plugins/modules/os_auth.py

@@ -17,9 +17,8 @@ author: "Monty Taylor (@emonty)"
 description:
     - Retrieve an auth token from an OpenStack Cloud
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
     - "openstacksdk"
-
 extends_documentation_fragment:
 - openstack.cloud.openstack
 '''

plugins/modules/os_coe_cluster.py

@@ -61,7 +61,9 @@ options:
          - Timeout for creating the cluster in minutes. Default to 60 mins
            if not set
       default: 60
-requirements: ["openstacksdk"]
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_coe_cluster_template.py

@@ -117,7 +117,9 @@ options:
       description:
          - The name of the driver used for instantiating container volumes
       choices: [cinder, rexray]
-requirements: ["openstacksdk"]
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_flavor_info.py

@@ -25,9 +25,6 @@ description:
       Note that the M(os_flavor_info) module no longer returns C(ansible_facts)!
 notes:
     - The result contains a list of unsorted flavors.
-requirements:
-    - "python >= 3.6""
-    - "openstacksdk"
 options:
    name:
      description:
@@ -64,6 +61,9 @@ options:
          storage. Format is the same as the I(ram) parameter
      type: bool
      default: 'no'
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_floating_ip.py

@@ -69,7 +69,9 @@ options:
           IP completely, or only detach it from the server. Default is to detach only.
      type: bool
      default: 'no'
-requirements: ["openstacksdk"]
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_group.py

@@ -33,7 +33,7 @@ options:
      choices: [present, absent]
      default: present
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_group_info.py

@@ -16,9 +16,6 @@ short_description: Retrieve info about one or more OpenStack groups
 author: "Phillipe Smith (@phsmith)"
 description:
     - Retrieve info about a one or more OpenStack groups.
-requirements:
-    - "python >= 3.6""
-    - "openstacksdk"
 options:
    name:
      description:
@@ -34,6 +31,9 @@ options:
         - A dictionary of meta data to use for further filtering.  Elements of
           this dictionary may be additional dictionaries.
      type: dict
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_image.py

@@ -79,7 +79,9 @@ options:
      description:
        - ID of a volume to create an image from.
        - The volume must be in AVAILABLE state.
-requirements: ["openstacksdk"]
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_image_info.py

@@ -17,9 +17,6 @@ description:
     - Retrieve information about a image image from OpenStack.
     - This module was called C(os_image_facts) before Ansible 2.9, returning C(ansible_facts).
       Note that the M(os_image_info) module no longer returns C(ansible_facts)!
-requirements:
-    - "python >= 3.6""
-    - "openstacksdk"
 options:
    image:
      description:
@@ -30,6 +27,9 @@ options:
         - Dict of properties of the images used for query
      type: dict
      required: false
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_ironic.py

@@ -112,7 +112,10 @@ options:
       type: bool
       default: 'no'
       aliases: [ skip_update_of_driver_password ]
-requirements: ["openstacksdk", "jsonpatch"]
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
+    - "jsonpatch"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_ironic_inspect.py

@@ -38,7 +38,9 @@ options:
         - A timeout in seconds to tell the role to wait for the node to complete introspection if wait is set to True.
       default: 1200
 
-requirements: ["openstacksdk"]
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_ironic_node.py

@@ -84,6 +84,9 @@ options:
       description:
         - An integer value representing the number of seconds to
           wait for the node activation or deactivation to complete.
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_keypair.py

@@ -38,6 +38,9 @@ options:
         with the new content.
     choices: [present, absent, replace]
     default: present
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_keystone_domain.py

@@ -38,7 +38,7 @@ options:
      choices: [present, absent]
      default: present
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_keystone_domain_info.py

@@ -17,9 +17,6 @@ description:
     - Retrieve information about a one or more OpenStack domains
     - This module was called C(os_keystone_domain_facts) before Ansible 2.9, returning C(ansible_facts).
       Note that the M(os_keystone_domain_info) module no longer returns C(ansible_facts)!
-requirements:
-    - "python >= 3.6""
-    - "sdk"
 options:
    name:
      description:
@@ -28,6 +25,9 @@ options:
      description:
         - A dictionary of meta data to use for further filtering.  Elements of
           this dictionary may be additional dictionaries.
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_keystone_endpoint.py

@@ -47,7 +47,8 @@ options:
      choices: [present, absent]
      default: present
 requirements:
-    - openstacksdk >= 0.13.0
+    - "python >= 3.6"
+    - "openstacksdk >= 0.13.0"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_keystone_role.py

@@ -28,7 +28,7 @@ options:
      choices: [present, absent]
      default: present
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_keystone_service.py

@@ -40,7 +40,7 @@ options:
      choices: [present, absent]
      default: present
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_listener.py

@@ -48,7 +48,9 @@ options:
         - The amount of time the module should wait for the load balancer to get
           into ACTIVE state.
      default: 180
-requirements: ["openstacksdk"]
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_loadbalancer.py

@@ -119,7 +119,9 @@ options:
     description:
       - The amount of time the module should wait.
     default: 180
-requirements: ["openstacksdk"]
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_member.py

@@ -49,7 +49,9 @@ options:
         - The amount of time the module should wait for the load balancer to get
           into ACTIVE state.
      default: 180
-requirements: ["openstacksdk"]
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_network.py

@@ -75,7 +75,8 @@ options:
           Network will use Openstack defaults if this option is
           not provided.
 requirements:
-     - "openstacksdk"
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_networks_info.py

@@ -18,9 +18,6 @@ description:
     - Retrieve information about one or more networks from OpenStack.
     - This module was called C(os_networks_facts) before Ansible 2.9, returning C(ansible_facts).
       Note that the M(os_networks_info) module no longer returns C(ansible_facts)!
-requirements:
-    - "python >= 3.6""
-    - "sdk"
 options:
    name:
      description:
@@ -31,6 +28,9 @@ options:
         - A dictionary of meta data to use for further filtering.  Elements of
           this dictionary may be additional dictionaries.
      required: false
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_nova_flavor.py

@@ -64,7 +64,9 @@ options:
    extra_specs:
      description:
         - Metadata dictionary
-requirements: ["openstacksdk"]
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_object.py

@@ -42,6 +42,9 @@ options:
        - Should the resource be present or absent.
      choices: [present, absent]
      default: present
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_pool.py

@@ -53,7 +53,9 @@ options:
         - The amount of time the module should wait for the pool to get
           into ACTIVE state.
      default: 180
-requirements: ["openstacksdk"]
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_port.py

@@ -17,9 +17,6 @@ author: "Davide Agnello (@dagnello)"
 description:
    - Add, Update or Remove ports from an OpenStack cloud. A I(state) of
      'present' will ensure the port is created or updated if required.
-requirements:
-    - "ordereddict unless python >= 3.6""
-    - "openstacksdk"
 options:
    network:
      description:
@@ -85,6 +82,9 @@ options:
      description:
        - Whether to enable or disable the port security on the network.
      type: bool
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_port_info.py

@@ -17,9 +17,6 @@ description:
     - Retrieve information about ports from OpenStack.
     - This module was called C(os_port_facts) before Ansible 2.9, returning C(ansible_facts).
       Note that the M(os_port_info) module no longer returns C(ansible_facts)!
-requirements:
-    - "python >= 3.6""
-    - "openstacksdk"
 options:
     port:
         description:
@@ -30,6 +27,9 @@ options:
               of this dictionary will be matched against the returned port
               dictionaries. Matching is currently limited to strings within
               the port dictionary, or strings within nested dictionaries.
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_project.py

@@ -42,7 +42,7 @@ options:
      choices: [present, absent]
      default: present
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_project_access.py

@@ -43,6 +43,7 @@ options:
     description:
       - The resource name (eg. tiny).
 requirements:
+    - "python >= 3.6"
     - "openstacksdk"
 
 

plugins/modules/os_project_info.py

@@ -17,9 +17,6 @@ description:
     - Retrieve information about a one or more OpenStack projects
     - This module was called C(os_project_facts) before Ansible 2.9, returning C(ansible_facts).
       Note that the M(os_project_info) module no longer returns C(ansible_facts)!
-requirements:
-    - "python >= 3.6""
-    - "openstacksdk"
 options:
    name:
      description:
@@ -32,6 +29,9 @@ options:
      description:
         - A dictionary of meta data to use for further filtering.  Elements of
           this dictionary may be additional dictionaries.
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_quota.py

@@ -94,7 +94,7 @@ options:
         description: Number of LVM volumes to allow.
 
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
     - "openstacksdk >= 0.13.0"
     - "keystoneauth1 >= 3.4.0"
 

plugins/modules/os_recordset.py

@@ -46,7 +46,7 @@ options:
      choices: [present, absent]
      default: present
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_router.py

@@ -62,7 +62,9 @@ options:
           User defined portip is often required when a multiple router need
           to be connected to a single subnet for which the default gateway has
           been already used.
-requirements: ["openstacksdk"]
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_routers_info.py

@@ -17,9 +17,6 @@ version_added: "2.10"
 author: "Bram Verschueren (@bverschueren)"
 description:
     - Retrieve information about one or more routers from OpenStack.
-requirements:
-    - "python >= 3.6""
-    - "openstacksdk"
 options:
    name:
      description:
@@ -59,6 +56,9 @@ options:
          description:
            - A list of tags to filter the list result by. Resources that match all tags in this list will be returned.
          type: list
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 extends_documentation_fragment: openstack
 '''
 

plugins/modules/os_security_group.py

@@ -35,6 +35,9 @@ options:
      description:
         - Unique name or ID of the project.
      required: false
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_security_group_rule.py

@@ -62,7 +62,9 @@ options:
      description:
         - Unique name or ID of the project.
      required: false
-requirements: ["openstacksdk"]
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_server.py

@@ -169,7 +169,7 @@ options:
      description:
        - Availability zone in which to create the server.
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_server_action.py

@@ -45,7 +45,7 @@ options:
      description:
        - Image the server should be rebuilt with
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_server_group.py

@@ -36,7 +36,7 @@ options:
           and soft-affinity.
      required: false
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_server_info.py

@@ -20,9 +20,6 @@ description:
       Note that the M(os_server_info) module no longer returns C(ansible_facts)!
 notes:
     - The result contains a list of servers.
-requirements:
-    - "python >= 3.6""
-    - "openstacksdk"
 options:
    server:
      description:
@@ -44,6 +41,9 @@ options:
          scoped project.
      type: bool
      default: 'no'
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_server_metadata.py

@@ -38,8 +38,8 @@ options:
        - Availability zone in which to create the snapshot.
      required: false
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
-    - "openstack"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_server_volume.py

@@ -36,7 +36,7 @@ options:
      description:
       - Device you want to attach. Defaults to auto finding a device name.
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_stack.py

@@ -52,7 +52,7 @@ options:
         - Maximum number of seconds to wait for the stack creation
       default: 3600
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_subnet.py

@@ -91,7 +91,7 @@ options:
      required: false
      default: {}
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_subnets_info.py

@@ -18,9 +18,6 @@ description:
     - Retrieve information about one or more subnets from OpenStack.
     - This module was called C(os_subnets_facts) before Ansible 2.9, returning C(ansible_facts).
       Note that the M(os_subnets_info) module no longer returns C(ansible_facts)!
-requirements:
-    - "python >= 3.6""
-    - "openstacksdk"
 options:
    name:
      description:
@@ -33,6 +30,9 @@ options:
         - A dictionary of meta data to use for further filtering.  Elements of
           this dictionary may be additional dictionaries.
      required: false
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_user.py

@@ -56,7 +56,7 @@ options:
      choices: [present, absent]
      default: present
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_user_group.py

@@ -30,7 +30,7 @@ options:
      choices: [present, absent]
      default: present
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_user_info.py

@@ -17,9 +17,6 @@ description:
     - Retrieve information about a one or more OpenStack users
     - This module was called C(os_user_facts) before Ansible 2.9, returning C(ansible_facts).
       Note that the M(os_user_info) module no longer returns C(ansible_facts)!
-requirements:
-    - "python >= 3.6""
-    - "openstacksdk"
 options:
    name:
      description:
@@ -32,6 +29,9 @@ options:
      description:
         - A dictionary of meta data to use for further filtering.  Elements of
           this dictionary may be additional dictionaries.
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_user_role.py

@@ -44,7 +44,7 @@ options:
      choices: [present, absent]
      default: present
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
     - "openstacksdk"
 
 extends_documentation_fragment:

plugins/modules/os_volume.py

@@ -57,8 +57,8 @@ options:
      description:
        - Metadata for the volume
 requirements:
-     - "python >= 3.6""
+    - "python >= 3.6"
-     - "openstacksdk"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_volume_snapshot.py

@@ -42,8 +42,8 @@ options:
      choices: [present, absent]
      default: present
 requirements:
-     - "python >= 3.6""
+    - "python >= 3.6"
-     - "openstacksdk"
+    - "openstacksdk"
 
 extends_documentation_fragment:
 - openstack.cloud.openstack

plugins/modules/os_zone.py

@@ -44,7 +44,7 @@ options:
      choices: [present, absent]
      default: present
 requirements:
-    - "python >= 3.6""
+    - "python >= 3.6"
     - "openstacksdk"
 
 extends_documentation_fragment: