From e4be201f2075b6a9e273393ca6e1f9da4742b93d Mon Sep 17 00:00:00 2001 From: Jakob Meng Date: Mon, 16 Jan 2023 13:15:26 +0100 Subject: [PATCH] Properly documented openstacksdk version requirements With "extends_documentation_fragment: ['openstack.cloud.openstack']" it is not necessary to list required Python libraries in section 'requirements' of DOCUMENTATION docstring in modules. Ansible will merge requirements from doc fragments and DOCUMENTATION docstring which previously resulted in duplicates such as in server module [0]: * openstacksdk * openstacksdk >= 0.36, < 0.99.0 * python >= 3.6 When removing the 'requirements' section from server module, then Ansible will list openstacksdk once only: * openstacksdk >= 0.36, < 0.99.0 * python >= 3.6 To see what documentation Ansible will produce for server module run: ansible-doc --type module openstack.cloud.server [0] https://docs.ansible.com/ansible/latest/collections/openstack/\ cloud/server_module.html Change-Id: Ia53c2c34436c7a72080602f5699e82d20f677b8b --- plugins/doc_fragments/openstack.py | 4 ++-- plugins/inventory/openstack.py | 3 +-- plugins/modules/address_scope.py | 4 ---- plugins/modules/auth.py | 3 --- plugins/modules/baremetal_inspect.py | 5 ----- plugins/modules/baremetal_node.py | 3 --- plugins/modules/baremetal_node_action.py | 4 ---- plugins/modules/baremetal_node_info.py | 4 ---- plugins/modules/baremetal_port.py | 4 ---- plugins/modules/baremetal_port_info.py | 3 --- plugins/modules/catalog_service.py | 4 ---- plugins/modules/coe_cluster.py | 3 --- plugins/modules/coe_cluster_template.py | 3 --- plugins/modules/compute_flavor.py | 4 ---- plugins/modules/compute_flavor_info.py | 4 ---- plugins/modules/compute_service_info.py | 4 ---- plugins/modules/config.py | 4 ++-- plugins/modules/dns_zone.py | 4 ---- plugins/modules/dns_zone_info.py | 5 ----- plugins/modules/endpoint.py | 4 ---- plugins/modules/federation_idp.py | 3 +-- plugins/modules/federation_idp_info.py | 3 +-- plugins/modules/federation_mapping.py | 3 +-- plugins/modules/federation_mapping_info.py | 3 +-- plugins/modules/floating_ip.py | 4 ---- plugins/modules/floating_ip_info.py | 4 ---- plugins/modules/group_assignment.py | 4 ---- plugins/modules/host_aggregate.py | 4 ---- plugins/modules/identity_domain.py | 4 ---- plugins/modules/identity_domain_info.py | 4 ---- plugins/modules/identity_group.py | 4 ---- plugins/modules/identity_group_info.py | 4 ---- plugins/modules/identity_role.py | 4 ---- plugins/modules/identity_role_info.py | 5 ----- plugins/modules/identity_user.py | 4 ---- plugins/modules/identity_user_info.py | 4 ---- plugins/modules/image.py | 4 ---- plugins/modules/image_info.py | 4 ---- plugins/modules/keypair.py | 4 ---- plugins/modules/keypair_info.py | 4 ---- plugins/modules/keystone_federation_protocol.py | 3 +-- plugins/modules/keystone_federation_protocol_info.py | 3 +-- plugins/modules/lb_health_monitor.py | 1 - plugins/modules/lb_listener.py | 4 ---- plugins/modules/lb_member.py | 4 ---- plugins/modules/lb_pool.py | 4 ---- plugins/modules/loadbalancer.py | 4 ---- plugins/modules/network.py | 4 ---- plugins/modules/networks_info.py | 4 ---- plugins/modules/neutron_rbac_policies_info.py | 1 - plugins/modules/neutron_rbac_policy.py | 1 - plugins/modules/object.py | 4 ---- plugins/modules/object_container.py | 4 ---- plugins/modules/port.py | 4 ---- plugins/modules/port_info.py | 4 ---- plugins/modules/project.py | 4 ---- plugins/modules/project_access.py | 5 ----- plugins/modules/project_info.py | 4 ---- plugins/modules/quota.py | 4 ---- plugins/modules/recordset.py | 4 ---- plugins/modules/role_assignment.py | 4 ---- plugins/modules/router.py | 4 ---- plugins/modules/routers_info.py | 3 --- plugins/modules/security_group.py | 4 ---- plugins/modules/security_group_info.py | 2 -- plugins/modules/security_group_rule.py | 4 ---- plugins/modules/security_group_rule_info.py | 5 ----- plugins/modules/server.py | 4 ---- plugins/modules/server_action.py | 5 ----- plugins/modules/server_group.py | 4 ---- plugins/modules/server_info.py | 4 ---- plugins/modules/server_metadata.py | 4 ---- plugins/modules/server_volume.py | 4 ---- plugins/modules/stack.py | 4 ---- plugins/modules/stack_info.py | 5 ----- plugins/modules/subnet.py | 4 ---- plugins/modules/subnet_pool.py | 4 ---- plugins/modules/subnets_info.py | 4 ---- plugins/modules/volume.py | 4 ---- plugins/modules/volume_backup.py | 1 - plugins/modules/volume_backup_info.py | 1 - plugins/modules/volume_info.py | 5 ----- plugins/modules/volume_snapshot.py | 4 ---- plugins/modules/volume_snapshot_info.py | 1 - 84 files changed, 11 insertions(+), 300 deletions(-) diff --git a/plugins/doc_fragments/openstack.py b/plugins/doc_fragments/openstack.py index 37d51bb2..7afc184f 100644 --- a/plugins/doc_fragments/openstack.py +++ b/plugins/doc_fragments/openstack.py @@ -99,8 +99,8 @@ options: default: INFO choices: [INFO, DEBUG] requirements: - - python >= 3.6 - - openstacksdk >= 0.36, < 0.99.0 + - "python >= 3.6" + - "openstacksdk >= 0.36, < 0.99.0" notes: - The standard OpenStack environment variables, such as C(OS_USERNAME) may be used instead of providing explicit values. diff --git a/plugins/inventory/openstack.py b/plugins/inventory/openstack.py index def6c04b..62947aba 100644 --- a/plugins/inventory/openstack.py +++ b/plugins/inventory/openstack.py @@ -111,11 +111,10 @@ options: default: true requirements: - "python >= 3.6" - - "openstacksdk >= 0.28, < 0.99.0" + - "openstacksdk >= 0.36, < 0.99.0" extends_documentation_fragment: - inventory_cache - constructed - ''' EXAMPLES = ''' diff --git a/plugins/modules/address_scope.py b/plugins/modules/address_scope.py index eb5b187a..7b086542 100644 --- a/plugins/modules/address_scope.py +++ b/plugins/modules/address_scope.py @@ -44,10 +44,6 @@ options: required: false default: {} type: dict -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/auth.py b/plugins/modules/auth.py index 1f2c516e..d0e085ca 100644 --- a/plugins/modules/auth.py +++ b/plugins/modules/auth.py @@ -10,9 +10,6 @@ short_description: Retrieve an auth token author: OpenStack Ansible SIG description: - Retrieve an auth token from an OpenStack Cloud -requirements: - - "python >= 3.6" - - "openstacksdk" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/baremetal_inspect.py b/plugins/modules/baremetal_inspect.py index f7d90d1c..51187dfa 100644 --- a/plugins/modules/baremetal_inspect.py +++ b/plugins/modules/baremetal_inspect.py @@ -36,11 +36,6 @@ 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 type: int - -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/baremetal_node.py b/plugins/modules/baremetal_node.py index 1adb560d..303fa495 100644 --- a/plugins/modules/baremetal_node.py +++ b/plugins/modules/baremetal_node.py @@ -165,10 +165,7 @@ options: aliases: - skip_update_of_driver_password requirements: - - "python >= 3.6" - - "openstacksdk" - "jsonpatch" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/baremetal_node_action.py b/plugins/modules/baremetal_node_action.py index 267e4308..262b319e 100644 --- a/plugins/modules/baremetal_node_action.py +++ b/plugins/modules/baremetal_node_action.py @@ -91,10 +91,6 @@ options: wait for the node activation or deactivation to complete. default: 1800 type: int -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/baremetal_node_info.py b/plugins/modules/baremetal_node_info.py index 8141fcdf..c648ddd1 100644 --- a/plugins/modules/baremetal_node_info.py +++ b/plugins/modules/baremetal_node_info.py @@ -26,10 +26,6 @@ options: endpoint URL for the Ironic API. Use with "auth" and "auth_type" settings set to None. type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/baremetal_port.py b/plugins/modules/baremetal_port.py index a72c1da6..30562362 100644 --- a/plugins/modules/baremetal_port.py +++ b/plugins/modules/baremetal_port.py @@ -71,10 +71,6 @@ options: endpoint URL for the Ironic API. Use with "auth" and "auth_type" settings set to None. type: str - -requirements: - - "python >= 3.6" - - "openstacksdk" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/baremetal_port_info.py b/plugins/modules/baremetal_port_info.py index d70c284d..1e8d1752 100644 --- a/plugins/modules/baremetal_port_info.py +++ b/plugins/modules/baremetal_port_info.py @@ -30,9 +30,6 @@ options: endpoint URL for the Ironic API. Use with "auth" and "auth_type" settings set to None. type: str -requirements: - - "python >= 3.6" - - "openstacksdk" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/catalog_service.py b/plugins/modules/catalog_service.py index 6d1962f3..49ed9c39 100644 --- a/plugins/modules/catalog_service.py +++ b/plugins/modules/catalog_service.py @@ -39,10 +39,6 @@ options: choices: [present, absent] default: present type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/coe_cluster.py b/plugins/modules/coe_cluster.py index b12e2ab5..abbe4710 100644 --- a/plugins/modules/coe_cluster.py +++ b/plugins/modules/coe_cluster.py @@ -77,9 +77,6 @@ notes: - Return values of this module are preliminary and will most likely change when openstacksdk has finished its transition of cloud layer functions to resource proxies. -requirements: - - "python >= 3.6" - - "openstacksdk" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/coe_cluster_template.py b/plugins/modules/coe_cluster_template.py index fb14fee8..2f6a96a8 100644 --- a/plugins/modules/coe_cluster_template.py +++ b/plugins/modules/coe_cluster_template.py @@ -143,9 +143,6 @@ notes: - Return values of this module are preliminary and will most likely change when openstacksdk has finished its transition of cloud layer functions to resource proxies. -requirements: - - "python >= 3.6" - - "openstacksdk" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/compute_flavor.py b/plugins/modules/compute_flavor.py index 8a993ca5..c18322a9 100644 --- a/plugins/modules/compute_flavor.py +++ b/plugins/modules/compute_flavor.py @@ -67,10 +67,6 @@ options: description: - Metadata dictionary type: dict -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/compute_flavor_info.py b/plugins/modules/compute_flavor_info.py index 61ee7a5b..1cc6ed0e 100644 --- a/plugins/modules/compute_flavor_info.py +++ b/plugins/modules/compute_flavor_info.py @@ -55,10 +55,6 @@ options: - A string used for filtering flavors based on the amount of ephemeral storage. Format is the same as the I(ram) parameter type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/compute_service_info.py b/plugins/modules/compute_service_info.py index 6665dd63..1d7550fd 100644 --- a/plugins/modules/compute_service_info.py +++ b/plugins/modules/compute_service_info.py @@ -18,10 +18,6 @@ options: description: - Filter by service host. Requires openstacksdk>=0.53. type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/config.py b/plugins/modules/config.py index 94036e49..de4026fa 100644 --- a/plugins/modules/config.py +++ b/plugins/modules/config.py @@ -21,8 +21,8 @@ options: type: list elements: str requirements: - - "python >= 3.6" - - "openstacksdk" + - "python >= 3.6" + - "openstacksdk >= 0.36, < 0.99.0" author: OpenStack Ansible SIG ''' diff --git a/plugins/modules/dns_zone.py b/plugins/modules/dns_zone.py index 98cf655e..528f18a7 100644 --- a/plugins/modules/dns_zone.py +++ b/plugins/modules/dns_zone.py @@ -45,10 +45,6 @@ options: choices: [present, absent] default: present type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/dns_zone_info.py b/plugins/modules/dns_zone_info.py index 22a3da5c..13e01a4c 100644 --- a/plugins/modules/dns_zone_info.py +++ b/plugins/modules/dns_zone_info.py @@ -34,11 +34,6 @@ options: description: - TTL (Time To Live) value in seconds. type: int - -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/endpoint.py b/plugins/modules/endpoint.py index e7864ecf..3b524e6f 100644 --- a/plugins/modules/endpoint.py +++ b/plugins/modules/endpoint.py @@ -44,10 +44,6 @@ options: choices: [present, absent] default: present type: str -requirements: - - "python >= 3.6" - - "openstacksdk >= 0.13.0" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/federation_idp.py b/plugins/modules/federation_idp.py index 35606cca..b029ab68 100644 --- a/plugins/modules/federation_idp.py +++ b/plugins/modules/federation_idp.py @@ -46,8 +46,7 @@ options: type: list elements: str requirements: - - "python >= 3.6" - - "openstacksdk >= 0.44" + - "openstacksdk >= 0.44, < 0.99.0" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/federation_idp_info.py b/plugins/modules/federation_idp_info.py index 4fe71949..322a8a30 100644 --- a/plugins/modules/federation_idp_info.py +++ b/plugins/modules/federation_idp_info.py @@ -19,8 +19,7 @@ options: type: str aliases: ['id'] requirements: - - "python >= 3.6" - - "openstacksdk >= 0.44" + - "openstacksdk >= 0.44, < 0.99.0" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/federation_mapping.py b/plugins/modules/federation_mapping.py index 6c07a41d..d2b0c284 100644 --- a/plugins/modules/federation_mapping.py +++ b/plugins/modules/federation_mapping.py @@ -45,8 +45,7 @@ options: type: list elements: dict requirements: - - "python >= 3.6" - - "openstacksdk >= 0.44" + - "openstacksdk >= 0.44, < 0.99.0" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/federation_mapping_info.py b/plugins/modules/federation_mapping_info.py index 2ba317c9..023b7957 100644 --- a/plugins/modules/federation_mapping_info.py +++ b/plugins/modules/federation_mapping_info.py @@ -18,8 +18,7 @@ options: type: str aliases: ['id'] requirements: - - "python >= 3.6" - - "openstacksdk >= 0.44" + - "openstacksdk >= 0.44, < 0.99.0" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/floating_ip.py b/plugins/modules/floating_ip.py index 6b5fb0d6..38e57d9e 100644 --- a/plugins/modules/floating_ip.py +++ b/plugins/modules/floating_ip.py @@ -71,10 +71,6 @@ options: IP completely, or only detach it from the server. Default is to detach only. type: bool default: 'no' -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/floating_ip_info.py b/plugins/modules/floating_ip_info.py index 50e7c879..ddcd5201 100644 --- a/plugins/modules/floating_ip_info.py +++ b/plugins/modules/floating_ip_info.py @@ -45,10 +45,6 @@ options: - The status of a floating IP, which can be ``ACTIVE``or ``DOWN``. choices: ['active', 'down'] type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/group_assignment.py b/plugins/modules/group_assignment.py index ce8f28e1..f76e1b15 100644 --- a/plugins/modules/group_assignment.py +++ b/plugins/modules/group_assignment.py @@ -26,10 +26,6 @@ options: choices: [present, absent] default: present type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/host_aggregate.py b/plugins/modules/host_aggregate.py index 4c95fd29..74d84b3e 100644 --- a/plugins/modules/host_aggregate.py +++ b/plugins/modules/host_aggregate.py @@ -35,10 +35,6 @@ options: choices: [present, absent] default: present type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/identity_domain.py b/plugins/modules/identity_domain.py index 660748c4..9e171261 100644 --- a/plugins/modules/identity_domain.py +++ b/plugins/modules/identity_domain.py @@ -32,10 +32,6 @@ options: choices: [present, absent] default: present type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/identity_domain_info.py b/plugins/modules/identity_domain_info.py index e0e33cde..8cd8d49e 100644 --- a/plugins/modules/identity_domain_info.py +++ b/plugins/modules/identity_domain_info.py @@ -21,10 +21,6 @@ options: - A dictionary of meta data to use for filtering. Elements of this dictionary may be additional dictionaries. type: dict -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/identity_group.py b/plugins/modules/identity_group.py index 5b45efa4..8ea251e0 100644 --- a/plugins/modules/identity_group.py +++ b/plugins/modules/identity_group.py @@ -30,10 +30,6 @@ options: choices: [present, absent] default: present type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/identity_group_info.py b/plugins/modules/identity_group_info.py index 68f00d73..9ac9f322 100644 --- a/plugins/modules/identity_group_info.py +++ b/plugins/modules/identity_group_info.py @@ -24,10 +24,6 @@ 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 ''' diff --git a/plugins/modules/identity_role.py b/plugins/modules/identity_role.py index 272d9821..a0c598ab 100644 --- a/plugins/modules/identity_role.py +++ b/plugins/modules/identity_role.py @@ -21,10 +21,6 @@ options: choices: [present, absent] default: present type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/identity_role_info.py b/plugins/modules/identity_role_info.py index 42de17bd..1ec7fe96 100644 --- a/plugins/modules/identity_role_info.py +++ b/plugins/modules/identity_role_info.py @@ -22,11 +22,6 @@ options: - Name or ID of the role type: str required: false - -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/identity_user.py b/plugins/modules/identity_user.py index 047b3ed8..19260600 100644 --- a/plugins/modules/identity_user.py +++ b/plugins/modules/identity_user.py @@ -58,10 +58,6 @@ options: choices: [present, absent] default: present type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/identity_user_info.py b/plugins/modules/identity_user_info.py index c0e0d949..ab58ad77 100644 --- a/plugins/modules/identity_user_info.py +++ b/plugins/modules/identity_user_info.py @@ -25,10 +25,6 @@ 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 ''' diff --git a/plugins/modules/image.py b/plugins/modules/image.py index fae13a2e..d74674e9 100644 --- a/plugins/modules/image.py +++ b/plugins/modules/image.py @@ -102,10 +102,6 @@ options: - ID of a volume to create an image from. - The volume must be in AVAILABLE state. type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/image_info.py b/plugins/modules/image_info.py index f02079c0..a97a5ad0 100644 --- a/plugins/modules/image_info.py +++ b/plugins/modules/image_info.py @@ -24,10 +24,6 @@ options: type: dict required: false aliases: ['properties'] -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/keypair.py b/plugins/modules/keypair.py index 232d4985..1aa22125 100644 --- a/plugins/modules/keypair.py +++ b/plugins/modules/keypair.py @@ -36,10 +36,6 @@ options: choices: [present, absent, replace] default: present type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/keypair_info.py b/plugins/modules/keypair_info.py index 1fffe2c8..af9d83d1 100644 --- a/plugins/modules/keypair_info.py +++ b/plugins/modules/keypair_info.py @@ -28,10 +28,6 @@ options: description: - The last-seen item. type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/keystone_federation_protocol.py b/plugins/modules/keystone_federation_protocol.py index 5a33d8a3..bfb733ad 100644 --- a/plugins/modules/keystone_federation_protocol.py +++ b/plugins/modules/keystone_federation_protocol.py @@ -35,8 +35,7 @@ options: type: str aliases: ['mapping_name'] requirements: - - "python >= 3.6" - - "openstacksdk >= 0.44" + - "openstacksdk >= 0.44, < 0.99.0" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/keystone_federation_protocol_info.py b/plugins/modules/keystone_federation_protocol_info.py index b281b13e..4616fbac 100644 --- a/plugins/modules/keystone_federation_protocol_info.py +++ b/plugins/modules/keystone_federation_protocol_info.py @@ -22,8 +22,7 @@ options: required: true type: str requirements: - - "python >= 3.6" - - "openstacksdk >= 0.44" + - "openstacksdk >= 0.44, < 0.99.0" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/lb_health_monitor.py b/plugins/modules/lb_health_monitor.py index 94de4485..eb841bf9 100644 --- a/plugins/modules/lb_health_monitor.py +++ b/plugins/modules/lb_health_monitor.py @@ -78,7 +78,6 @@ options: description: - The HTTP URL path of the request sent by the monitor to test the health of a backend member. Must be a string that begins with a forward slash (/). The default URL path is /. -requirements: ["openstacksdk"] extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/lb_listener.py b/plugins/modules/lb_listener.py index f4cdad48..01c98322 100644 --- a/plugins/modules/lb_listener.py +++ b/plugins/modules/lb_listener.py @@ -59,10 +59,6 @@ options: into ACTIVE state. default: 180 type: int -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/lb_member.py b/plugins/modules/lb_member.py index 264f2b8e..90cd2f87 100644 --- a/plugins/modules/lb_member.py +++ b/plugins/modules/lb_member.py @@ -59,10 +59,6 @@ options: description: - Port used to monitor this member type: int -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/lb_pool.py b/plugins/modules/lb_pool.py index 6f73ea1c..2c9d4f09 100644 --- a/plugins/modules/lb_pool.py +++ b/plugins/modules/lb_pool.py @@ -55,10 +55,6 @@ options: into ACTIVE state. default: 180 type: int -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/loadbalancer.py b/plugins/modules/loadbalancer.py index 336da966..6efdfd38 100644 --- a/plugins/modules/loadbalancer.py +++ b/plugins/modules/loadbalancer.py @@ -135,10 +135,6 @@ options: - The amount of time the module should wait. default: 180 type: int -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/network.py b/plugins/modules/network.py index 780d49ba..e54950a5 100644 --- a/plugins/modules/network.py +++ b/plugins/modules/network.py @@ -76,10 +76,6 @@ options: Network will use Openstack defaults if this option is not provided. type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/networks_info.py b/plugins/modules/networks_info.py index 251af3e7..65439c40 100644 --- a/plugins/modules/networks_info.py +++ b/plugins/modules/networks_info.py @@ -24,10 +24,6 @@ options: this dictionary may be additional dictionaries. required: false type: dict -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/neutron_rbac_policies_info.py b/plugins/modules/neutron_rbac_policies_info.py index b451bc26..e4f55a0a 100644 --- a/plugins/modules/neutron_rbac_policies_info.py +++ b/plugins/modules/neutron_rbac_policies_info.py @@ -61,7 +61,6 @@ options: - Logically AND'ed with other filters choices: ['access_as_shared', 'access_as_external'] type: str - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/neutron_rbac_policy.py b/plugins/modules/neutron_rbac_policy.py index f5162e08..36a049f2 100644 --- a/plugins/modules/neutron_rbac_policy.py +++ b/plugins/modules/neutron_rbac_policy.py @@ -58,7 +58,6 @@ options: choices: ['present', 'absent'] default: present type: str - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/object.py b/plugins/modules/object.py index 4a22604e..db388b38 100644 --- a/plugins/modules/object.py +++ b/plugins/modules/object.py @@ -41,10 +41,6 @@ options: choices: [present, absent] default: present type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/object_container.py b/plugins/modules/object_container.py index 23ed38e5..96bdeab0 100644 --- a/plugins/modules/object_container.py +++ b/plugins/modules/object_container.py @@ -43,10 +43,6 @@ options: default: 'present' choices: ['present', 'absent'] type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/port.py b/plugins/modules/port.py index accef4fc..091e679b 100644 --- a/plugins/modules/port.py +++ b/plugins/modules/port.py @@ -131,10 +131,6 @@ options: description: - The dns domain of the port ( only with dns-integration enabled ) type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/port_info.py b/plugins/modules/port_info.py index 0ed3f059..6b7cd31d 100644 --- a/plugins/modules/port_info.py +++ b/plugins/modules/port_info.py @@ -23,10 +23,6 @@ options: dictionaries. Matching is currently limited to strings within the port dictionary, or strings within nested dictionaries. type: dict -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/project.py b/plugins/modules/project.py index 9719452d..5ecd8208 100644 --- a/plugins/modules/project.py +++ b/plugins/modules/project.py @@ -45,10 +45,6 @@ options: choices: [present, absent] default: present type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/project_access.py b/plugins/modules/project_access.py index c49a8449..d7f005a8 100644 --- a/plugins/modules/project_access.py +++ b/plugins/modules/project_access.py @@ -44,11 +44,6 @@ options: - The resource name (eg. tiny). required: true type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/project_info.py b/plugins/modules/project_info.py index fb1e2767..bb78467b 100644 --- a/plugins/modules/project_info.py +++ b/plugins/modules/project_info.py @@ -25,10 +25,6 @@ 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 ''' diff --git a/plugins/modules/quota.py b/plugins/modules/quota.py index 0d6a4f04..decb7a5e 100644 --- a/plugins/modules/quota.py +++ b/plugins/modules/quota.py @@ -133,12 +133,8 @@ options: project: description: Unused, kept for compatability type: int - requirements: - - "python >= 3.6" - - "openstacksdk >= 0.13.0" - "keystoneauth1 >= 3.4.0" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/recordset.py b/plugins/modules/recordset.py index 921d6efa..49a2e5dc 100644 --- a/plugins/modules/recordset.py +++ b/plugins/modules/recordset.py @@ -48,10 +48,6 @@ options: - Name or ID of the zone which manages the recordset required: true type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/role_assignment.py b/plugins/modules/role_assignment.py index 5ad7dce4..3ae73fb1 100644 --- a/plugins/modules/role_assignment.py +++ b/plugins/modules/role_assignment.py @@ -43,10 +43,6 @@ options: choices: [present, absent] default: present type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/router.py b/plugins/modules/router.py index 58c5c124..71e686b3 100644 --- a/plugins/modules/router.py +++ b/plugins/modules/router.py @@ -72,10 +72,6 @@ options: been already used. type: list elements: raw -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/routers_info.py b/plugins/modules/routers_info.py index 990eef8d..7864d3fc 100644 --- a/plugins/modules/routers_info.py +++ b/plugins/modules/routers_info.py @@ -50,9 +50,6 @@ options: - A list of tags to filter the list result by. Resources that match all tags in this list will be returned. type: list elements: str -requirements: - - "python >= 3.6" - - "openstacksdk" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/security_group.py b/plugins/modules/security_group.py index 8208a1c2..770bda94 100644 --- a/plugins/modules/security_group.py +++ b/plugins/modules/security_group.py @@ -33,10 +33,6 @@ options: - Unique name or ID of the project. required: false type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/security_group_info.py b/plugins/modules/security_group_info.py index bc05356a..1cbe5432 100644 --- a/plugins/modules/security_group_info.py +++ b/plugins/modules/security_group_info.py @@ -54,8 +54,6 @@ options: - Resources that match any tag in this list will be excluded. type: list elements: str - -requirements: ["openstacksdk"] ''' RETURN = ''' diff --git a/plugins/modules/security_group_rule.py b/plugins/modules/security_group_rule.py index 53fe6f59..140adf7b 100644 --- a/plugins/modules/security_group_rule.py +++ b/plugins/modules/security_group_rule.py @@ -68,10 +68,6 @@ options: description: - Description of the rule. type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/security_group_rule_info.py b/plugins/modules/security_group_rule_info.py index b00f7192..38bf84e5 100644 --- a/plugins/modules/security_group_rule_info.py +++ b/plugins/modules/security_group_rule_info.py @@ -68,11 +68,6 @@ options: description: - Name or ID of the security group type: str - -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/server.py b/plugins/modules/server.py index a3ca7d05..a6ac4f61 100644 --- a/plugins/modules/server.py +++ b/plugins/modules/server.py @@ -193,10 +193,6 @@ options: description: - Description of the server. type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/server_action.py b/plugins/modules/server_action.py index 341ff374..060b520b 100644 --- a/plugins/modules/server_action.py +++ b/plugins/modules/server_action.py @@ -52,11 +52,6 @@ options: auth scoped project. type: bool default: 'no' - -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/server_group.py b/plugins/modules/server_group.py index 84f59e6c..7e507070 100644 --- a/plugins/modules/server_group.py +++ b/plugins/modules/server_group.py @@ -33,10 +33,6 @@ options: required: false type: list elements: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/server_info.py b/plugins/modules/server_info.py index bac1d211..e3a81615 100644 --- a/plugins/modules/server_info.py +++ b/plugins/modules/server_info.py @@ -37,10 +37,6 @@ options: scoped project. type: bool default: 'no' -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/server_metadata.py b/plugins/modules/server_metadata.py index a1207e3b..47fe83e4 100644 --- a/plugins/modules/server_metadata.py +++ b/plugins/modules/server_metadata.py @@ -36,10 +36,6 @@ options: - Availability zone in which to create the snapshot. required: false type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/server_volume.py b/plugins/modules/server_volume.py index 1deb8fa6..6202e19a 100644 --- a/plugins/modules/server_volume.py +++ b/plugins/modules/server_volume.py @@ -33,10 +33,6 @@ options: description: - Device you want to attach. Defaults to auto finding a device name. type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/stack.py b/plugins/modules/stack.py index 95b7bef5..05151ba8 100644 --- a/plugins/modules/stack.py +++ b/plugins/modules/stack.py @@ -51,10 +51,6 @@ options: - Maximum number of seconds to wait for the stack creation default: 3600 type: int -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/stack_info.py b/plugins/modules/stack_info.py index ce56995a..93881aca 100644 --- a/plugins/modules/stack_info.py +++ b/plugins/modules/stack_info.py @@ -32,11 +32,6 @@ options: - Owner (parent) of the stack to be used as a filter type: str required: false - -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/subnet.py b/plugins/modules/subnet.py index dfe1eaca..1a53d66b 100644 --- a/plugins/modules/subnet.py +++ b/plugins/modules/subnet.py @@ -110,10 +110,6 @@ options: required: false default: {} type: dict -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/subnet_pool.py b/plugins/modules/subnet_pool.py index 4272438f..19bbe6b3 100644 --- a/plugins/modules/subnet_pool.py +++ b/plugins/modules/subnet_pool.py @@ -79,10 +79,6 @@ options: required: false default: {} type: dict -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/subnets_info.py b/plugins/modules/subnets_info.py index 7a771b53..f334824f 100644 --- a/plugins/modules/subnets_info.py +++ b/plugins/modules/subnets_info.py @@ -26,10 +26,6 @@ options: this dictionary may be additional dictionaries. required: false type: dict -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/volume.py b/plugins/modules/volume.py index 3a50c05a..837f4abd 100644 --- a/plugins/modules/volume.py +++ b/plugins/modules/volume.py @@ -62,10 +62,6 @@ options: description: - Metadata for the volume type: dict -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/volume_backup.py b/plugins/modules/volume_backup.py index 43cacc72..e7bdbced 100644 --- a/plugins/modules/volume_backup.py +++ b/plugins/modules/volume_backup.py @@ -52,7 +52,6 @@ options: description: The backup mode type: bool default: False -requirements: ["openstacksdk"] ''' RETURN = ''' diff --git a/plugins/modules/volume_backup_info.py b/plugins/modules/volume_backup_info.py index fdb61834..99c6a715 100644 --- a/plugins/modules/volume_backup_info.py +++ b/plugins/modules/volume_backup_info.py @@ -21,7 +21,6 @@ options: description: - Name of the volume. type: str -requirements: ["openstacksdk"] extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/volume_info.py b/plugins/modules/volume_info.py index bcce4994..849a9d62 100644 --- a/plugins/modules/volume_info.py +++ b/plugins/modules/volume_info.py @@ -30,11 +30,6 @@ options: - Value of the status of the volume so that you can filter on "available" for example type: str required: false - -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/volume_snapshot.py b/plugins/modules/volume_snapshot.py index 8625984c..bfbb6350 100644 --- a/plugins/modules/volume_snapshot.py +++ b/plugins/modules/volume_snapshot.py @@ -40,10 +40,6 @@ options: choices: [present, absent] default: present type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/volume_snapshot_info.py b/plugins/modules/volume_snapshot_info.py index fa50055d..34864339 100644 --- a/plugins/modules/volume_snapshot_info.py +++ b/plugins/modules/volume_snapshot_info.py @@ -31,7 +31,6 @@ options: choices: [creating, available, error, deleting, error_deleting, rollbacking, backing-up] type: str -requirements: ["openstacksdk"] extends_documentation_fragment: - openstack.cloud.openstack '''