From 1b38b7c500dddcfd7e8193e28acc826c06d4d5c0 Mon Sep 17 00:00:00 2001 From: Jakob Meng Date: Mon, 16 Jan 2023 13:50:32 +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: I727ed95ee480bb644b5a533f6a9526973677064c --- plugins/doc_fragments/openstack.py | 4 ++-- plugins/inventory/openstack.py | 4 ++-- plugins/modules/address_scope.py | 4 ---- plugins/modules/auth.py | 3 --- plugins/modules/baremetal_inspect.py | 5 ----- plugins/modules/baremetal_node.py | 4 ---- plugins/modules/baremetal_node_action.py | 4 ---- plugins/modules/baremetal_node_info.py | 4 ---- plugins/modules/baremetal_port.py | 3 --- plugins/modules/baremetal_port_info.py | 3 --- plugins/modules/catalog_service.py | 4 ---- plugins/modules/catalog_service_info.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_access.py | 3 --- plugins/modules/compute_flavor_info.py | 3 --- plugins/modules/compute_service_info.py | 3 --- plugins/modules/config.py | 4 ++-- plugins/modules/dns_zone.py | 3 --- plugins/modules/dns_zone_info.py | 3 --- 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 | 3 --- plugins/modules/image_info.py | 3 --- 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 | 3 --- plugins/modules/lb_listener.py | 3 --- plugins/modules/lb_member.py | 3 --- plugins/modules/lb_pool.py | 3 --- plugins/modules/loadbalancer.py | 3 --- 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 | 3 --- plugins/modules/object.py | 3 --- plugins/modules/object_container.py | 3 --- plugins/modules/port.py | 4 ---- plugins/modules/port_info.py | 4 ---- plugins/modules/project.py | 3 --- plugins/modules/project_info.py | 3 --- plugins/modules/quota.py | 5 ----- 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 | 3 --- plugins/modules/security_group_info.py | 3 --- plugins/modules/security_group_rule.py | 3 --- plugins/modules/security_group_rule_info.py | 3 --- 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 | 3 --- 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 | 6 ------ plugins/modules/volume_backup_info.py | 5 ----- plugins/modules/volume_info.py | 5 ----- plugins/modules/volume_snapshot.py | 5 ----- plugins/modules/volume_snapshot_info.py | 5 ----- plugins/modules/volume_type_access.py | 3 --- 86 files changed, 6 insertions(+), 310 deletions(-) diff --git a/plugins/doc_fragments/openstack.py b/plugins/doc_fragments/openstack.py index 3ca34e57..ba4ce6e1 100644 --- a/plugins/doc_fragments/openstack.py +++ b/plugins/doc_fragments/openstack.py @@ -96,8 +96,8 @@ options: default: INFO choices: [INFO, DEBUG] requirements: - - python >= 3.6 - - openstacksdk >= 0.103.0 + - "python >= 3.6" + - "openstacksdk >= 0.103.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 86b271a8..b9dab479 100644 --- a/plugins/inventory/openstack.py +++ b/plugins/inventory/openstack.py @@ -112,8 +112,8 @@ options: type: bool default: true requirements: - - "python >= 3.6" - - "openstacksdk" + - "python >= 3.6" + - "openstacksdk >= 0.103.0" extends_documentation_fragment: - inventory_cache - constructed diff --git a/plugins/modules/address_scope.py b/plugins/modules/address_scope.py index eb133a64..a2592147 100644 --- a/plugins/modules/address_scope.py +++ b/plugins/modules/address_scope.py @@ -47,10 +47,6 @@ options: - Dictionary with extra key/value pairs passed to the API 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 c187f243..e991209d 100644 --- a/plugins/modules/auth.py +++ b/plugins/modules/auth.py @@ -11,9 +11,6 @@ short_description: Retrieve auth token from OpenStack cloud author: OpenStack Ansible SIG description: - Retrieve auth token from 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 d77ee837..0f9c3735 100644 --- a/plugins/modules/baremetal_inspect.py +++ b/plugins/modules/baremetal_inspect.py @@ -25,11 +25,6 @@ options: - Mutually exclusive with I(mac) type: str aliases: [id, uuid] - -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 b1fd24f9..b8ef84e2 100644 --- a/plugins/modules/baremetal_node.py +++ b/plugins/modules/baremetal_node.py @@ -164,10 +164,6 @@ options: - Interface for all vendor-specific actions on this node, e.g. C(no-vendor). type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/baremetal_node_action.py b/plugins/modules/baremetal_node_action.py index 27bebcb3..6af6c1c7 100644 --- a/plugins/modules/baremetal_node_action.py +++ b/plugins/modules/baremetal_node_action.py @@ -81,10 +81,6 @@ options: to complete. type: int default: 1800 -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 97ce5598..45761171 100644 --- a/plugins/modules/baremetal_node_info.py +++ b/plugins/modules/baremetal_node_info.py @@ -21,10 +21,6 @@ options: - Name or ID of the baremetal node. type: str aliases: ['node'] -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 31515c70..9a83d247 100644 --- a/plugins/modules/baremetal_port.py +++ b/plugins/modules/baremetal_port.py @@ -69,9 +69,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/baremetal_port_info.py b/plugins/modules/baremetal_port_info.py index 9fb070d0..bf923ea4 100644 --- a/plugins/modules/baremetal_port_info.py +++ b/plugins/modules/baremetal_port_info.py @@ -25,9 +25,6 @@ options: description: - Name or ID of a Bare Metal node. 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 a1bfb945..2587169f 100644 --- a/plugins/modules/catalog_service.py +++ b/plugins/modules/catalog_service.py @@ -38,10 +38,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/catalog_service_info.py b/plugins/modules/catalog_service_info.py index a3cfdb72..f48d9545 100644 --- a/plugins/modules/catalog_service_info.py +++ b/plugins/modules/catalog_service_info.py @@ -16,10 +16,6 @@ options: description: - Name or ID of the service. 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 75672a84..78cf7ba8 100644 --- a/plugins/modules/coe_cluster.py +++ b/plugins/modules/coe_cluster.py @@ -78,9 +78,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 bdc4251c..d6f482d1 100644 --- a/plugins/modules/coe_cluster_template.py +++ b/plugins/modules/coe_cluster_template.py @@ -144,9 +144,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 94bcd31e..7a2ee25e 100644 --- a/plugins/modules/compute_flavor.py +++ b/plugins/modules/compute_flavor.py @@ -76,10 +76,6 @@ options: - Number of virtual CPUs. - Required when I(state) is C(present). type: int -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/compute_flavor_access.py b/plugins/modules/compute_flavor_access.py index 4ca54218..baef550b 100644 --- a/plugins/modules/compute_flavor_access.py +++ b/plugins/modules/compute_flavor_access.py @@ -35,9 +35,6 @@ options: choices: ['present', 'absent'] notes: - A compute flavor must not be private to manage project access. -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 d9a62943..0fc24054 100644 --- a/plugins/modules/compute_flavor_info.py +++ b/plugins/modules/compute_flavor_info.py @@ -44,9 +44,6 @@ options: - Filter flavors based on the number of virtual CPUs. - I(vcpus) supports same format as I(ram) option. 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 9e922bc1..f3ad0794 100644 --- a/plugins/modules/compute_service_info.py +++ b/plugins/modules/compute_service_info.py @@ -20,9 +20,6 @@ options: description: - Filter the service list result by the host name. 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 a928de3f..f7b24fda 100644 --- a/plugins/modules/config.py +++ b/plugins/modules/config.py @@ -22,8 +22,8 @@ options: type: list elements: str requirements: - - "python >= 3.6" - - "openstacksdk" + - "python >= 3.6" + - "openstacksdk >= 0.103.0" ''' RETURN = r''' diff --git a/plugins/modules/dns_zone.py b/plugins/modules/dns_zone.py index 1669c1e9..3464b61c 100644 --- a/plugins/modules/dns_zone.py +++ b/plugins/modules/dns_zone.py @@ -49,9 +49,6 @@ options: choices: ['primary', 'secondary'] type: str aliases: ['zone_type'] -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 cb3d7afc..ed7b67d7 100644 --- a/plugins/modules/dns_zone_info.py +++ b/plugins/modules/dns_zone_info.py @@ -35,9 +35,6 @@ options: - Zone type. choices: ['primary', 'secondary'] type: str -requirements: - - "python >= 3.6" - - "openstacksdk" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/endpoint.py b/plugins/modules/endpoint.py index 1c84f7ba..be7cc7c5 100644 --- a/plugins/modules/endpoint.py +++ b/plugins/modules/endpoint.py @@ -47,10 +47,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 babde798..b6b94a65 100644 --- a/plugins/modules/federation_idp.py +++ b/plugins/modules/federation_idp.py @@ -47,9 +47,6 @@ options: - Will default to an empty list when creating a new Identity Provider. type: list elements: str -requirements: - - "python >= 3.6" - - "openstacksdk >= 0.44" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/federation_idp_info.py b/plugins/modules/federation_idp_info.py index 9ed1b64c..92e251c0 100644 --- a/plugins/modules/federation_idp_info.py +++ b/plugins/modules/federation_idp_info.py @@ -18,9 +18,6 @@ options: - The name of the identity provider to fetch. type: str aliases: ['id'] -requirements: - - "python >= 3.6" - - "openstacksdk" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/federation_mapping.py b/plugins/modules/federation_mapping.py index 05e2e62e..6603a3d2 100644 --- a/plugins/modules/federation_mapping.py +++ b/plugins/modules/federation_mapping.py @@ -48,9 +48,6 @@ options: type: str notes: - Name equals the ID of a mapping. -requirements: - - "python >= 3.6" - - "openstacksdk" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/federation_mapping_info.py b/plugins/modules/federation_mapping_info.py index e183b1c5..7acc7506 100644 --- a/plugins/modules/federation_mapping_info.py +++ b/plugins/modules/federation_mapping_info.py @@ -19,9 +19,6 @@ options: aliases: ['id'] notes: - Name equals the ID of a federation mapping. -requirements: - - "python >= 3.6" - - "openstacksdk" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/floating_ip.py b/plugins/modules/floating_ip.py index a2dc1db4..ed192136 100644 --- a/plugins/modules/floating_ip.py +++ b/plugins/modules/floating_ip.py @@ -65,10 +65,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/floating_ip_info.py b/plugins/modules/floating_ip_info.py index f15eaef1..e9a9097d 100644 --- a/plugins/modules/floating_ip_info.py +++ b/plugins/modules/floating_ip_info.py @@ -46,10 +46,6 @@ options: - The status of a floating IP. 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 ea105a22..478a7d88 100644 --- a/plugins/modules/group_assignment.py +++ b/plugins/modules/group_assignment.py @@ -28,10 +28,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 07047994..c57e739f 100644 --- a/plugins/modules/host_aggregate.py +++ b/plugins/modules/host_aggregate.py @@ -37,10 +37,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 da89ac00..5151134e 100644 --- a/plugins/modules/identity_domain.py +++ b/plugins/modules/identity_domain.py @@ -34,10 +34,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 430d2ee8..079ff0b1 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 0e4cc6f4..50d410b2 100644 --- a/plugins/modules/identity_group.py +++ b/plugins/modules/identity_group.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_group_info.py b/plugins/modules/identity_group_info.py index 829764c6..483f04fd 100644 --- a/plugins/modules/identity_group_info.py +++ b/plugins/modules/identity_group_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/identity_role.py b/plugins/modules/identity_role.py index 3f629089..1eb08c4f 100644 --- a/plugins/modules/identity_role.py +++ b/plugins/modules/identity_role.py @@ -23,10 +23,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 0f92c16e..5816403b 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 aa8c2c93..ca6feb2c 100644 --- a/plugins/modules/identity_user.py +++ b/plugins/modules/identity_user.py @@ -60,10 +60,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 4c76e279..1a0f3b7a 100644 --- a/plugins/modules/identity_user_info.py +++ b/plugins/modules/identity_user_info.py @@ -26,10 +26,6 @@ options: this dictionary may be additional dictionaries. type: dict default: {} -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/image.py b/plugins/modules/image.py index 4c8f1dca..449e7fa7 100644 --- a/plugins/modules/image.py +++ b/plugins/modules/image.py @@ -122,9 +122,6 @@ options: - I(volume) has been deprecated. Use module M(openstack.cloud.volume) instead. 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 9ef10caf..157e9d02 100644 --- a/plugins/modules/image_info.py +++ b/plugins/modules/image_info.py @@ -22,9 +22,6 @@ options: - Dict of properties of the images used for query type: dict 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 0419ec3a..1e75ae3b 100644 --- a/plugins/modules/keypair.py +++ b/plugins/modules/keypair.py @@ -37,10 +37,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 874ce1eb..52111eae 100644 --- a/plugins/modules/keypair_info.py +++ b/plugins/modules/keypair_info.py @@ -29,10 +29,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 2d6aae7f..ef6d892f 100644 --- a/plugins/modules/keystone_federation_protocol.py +++ b/plugins/modules/keystone_federation_protocol.py @@ -42,9 +42,6 @@ notes: - Name equals the ID of a federation protocol. - Name equals the ID of an identity provider. - Name equals the ID of a mapping. -requirements: - - "python >= 3.6" - - "openstacksdk" 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 d02c1972..fdb31593 100644 --- a/plugins/modules/keystone_federation_protocol_info.py +++ b/plugins/modules/keystone_federation_protocol_info.py @@ -26,9 +26,6 @@ options: notes: - Name equals the ID of a federation protocol. - Name equals the ID of an identity provider. -requirements: - - "python >= 3.6" - - "openstacksdk" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/lb_health_monitor.py b/plugins/modules/lb_health_monitor.py index 5f009606..a8678b53 100644 --- a/plugins/modules/lb_health_monitor.py +++ b/plugins/modules/lb_health_monitor.py @@ -89,9 +89,6 @@ options: - Must be a string that begins with a forward slash (C(/)). - "Octavia's default URL path is C(/)." type: str -requirements: - - "python >= 3.6" - - "openstacksdk" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/lb_listener.py b/plugins/modules/lb_listener.py index c2b10c7f..bd38cc63 100644 --- a/plugins/modules/lb_listener.py +++ b/plugins/modules/lb_listener.py @@ -70,9 +70,6 @@ options: description: - Member inactivity timeout in milliseconds. 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 a170745d..99c32e53 100644 --- a/plugins/modules/lb_member.py +++ b/plugins/modules/lb_member.py @@ -64,9 +64,6 @@ options: connections. A valid value is from 0 to 256. - "Octavia's default for I(weight) is C(1)." 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 558c20c3..cd9f7284 100644 --- a/plugins/modules/lb_pool.py +++ b/plugins/modules/lb_pool.py @@ -57,9 +57,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/loadbalancer.py b/plugins/modules/loadbalancer.py index 3b2c87de..8f024b32 100644 --- a/plugins/modules/loadbalancer.py +++ b/plugins/modules/loadbalancer.py @@ -90,9 +90,6 @@ options: for creation. - This attribute cannot be updated. type: str -requirements: - - "python >= 3.6" - - "openstacksdk" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/network.py b/plugins/modules/network.py index bd1a6a7f..a5ad4f08 100644 --- a/plugins/modules/network.py +++ b/plugins/modules/network.py @@ -74,10 +74,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 8fbb8987..67883de7 100644 --- a/plugins/modules/networks_info.py +++ b/plugins/modules/networks_info.py @@ -23,10 +23,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 a70714d3..f25e9d7f 100644 --- a/plugins/modules/neutron_rbac_policies_info.py +++ b/plugins/modules/neutron_rbac_policies_info.py @@ -57,7 +57,6 @@ options: - Filters the RBAC rules based on the target project id. - Logically AND'ed with other filters. 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 c0e30523..024df2a9 100644 --- a/plugins/modules/neutron_rbac_policy.py +++ b/plugins/modules/neutron_rbac_policy.py @@ -13,8 +13,6 @@ author: OpenStack Ansible SIG description: - Create, update or delete a policy to apply a RBAC rule against a network, security group or QoS Policy. - - options: action: description: @@ -73,7 +71,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 d28546bc..e5b930f8 100644 --- a/plugins/modules/object.py +++ b/plugins/modules/object.py @@ -41,9 +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 984ed6ca..188224d7 100644 --- a/plugins/modules/object_container.py +++ b/plugins/modules/object_container.py @@ -61,9 +61,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 fb8f48bb..fa3598b2 100644 --- a/plugins/modules/port.py +++ b/plugins/modules/port.py @@ -153,10 +153,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/port_info.py b/plugins/modules/port_info.py index 717480f1..f8229ac1 100644 --- a/plugins/modules/port_info.py +++ b/plugins/modules/port_info.py @@ -22,10 +22,6 @@ options: of this dictionary will be matched passed to the API as query parameter filters. 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 77d92dc1..7db66012 100644 --- a/plugins/modules/project.py +++ b/plugins/modules/project.py @@ -44,9 +44,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_info.py b/plugins/modules/project_info.py index e92aee42..6ecbd87f 100644 --- a/plugins/modules/project_info.py +++ b/plugins/modules/project_info.py @@ -26,9 +26,6 @@ options: - Elements of I(filters) are passed as query parameters to OpenStack Identity API. 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 7f25df40..572d1d7f 100644 --- a/plugins/modules/quota.py +++ b/plugins/modules/quota.py @@ -133,11 +133,6 @@ options: volumes: description: Number of volumes to allow. type: int - -requirements: - - "python >= 3.6" - - openstacksdk - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/recordset.py b/plugins/modules/recordset.py index 2e7f52bb..34db0e22 100644 --- a/plugins/modules/recordset.py +++ b/plugins/modules/recordset.py @@ -50,10 +50,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 a69ee5bf..8bae40b3 100644 --- a/plugins/modules/role_assignment.py +++ b/plugins/modules/role_assignment.py @@ -51,10 +51,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 5d4bb3f0..e8d443b1 100644 --- a/plugins/modules/router.py +++ b/plugins/modules/router.py @@ -112,10 +112,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/routers_info.py b/plugins/modules/routers_info.py index 44f88a5f..707aaa41 100644 --- a/plugins/modules/routers_info.py +++ b/plugins/modules/routers_info.py @@ -56,9 +56,6 @@ options: 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 74da83d1..721bf61f 100644 --- a/plugins/modules/security_group.py +++ b/plugins/modules/security_group.py @@ -113,9 +113,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/security_group_info.py b/plugins/modules/security_group_info.py index 850b0b65..c4f3ae13 100644 --- a/plugins/modules/security_group_info.py +++ b/plugins/modules/security_group_info.py @@ -52,9 +52,6 @@ options: - 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_rule.py b/plugins/modules/security_group_rule.py index 51b573b3..97b6f973 100644 --- a/plugins/modules/security_group_rule.py +++ b/plugins/modules/security_group_rule.py @@ -98,9 +98,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/security_group_rule_info.py b/plugins/modules/security_group_rule_info.py index b309f384..ca9fa281 100644 --- a/plugins/modules/security_group_rule_info.py +++ b/plugins/modules/security_group_rule_info.py @@ -69,9 +69,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 85ea23c3..7d99c353 100644 --- a/plugins/modules/server.py +++ b/plugins/modules/server.py @@ -241,10 +241,6 @@ options: - If the module should wait for the instance to be created. type: bool default: 'yes' -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 87a03bab..8b5d74c0 100644 --- a/plugins/modules/server_action.py +++ b/plugins/modules/server_action.py @@ -53,11 +53,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 2b0fa694..58b54416 100644 --- a/plugins/modules/server_group.py +++ b/plugins/modules/server_group.py @@ -35,10 +35,6 @@ options: C(max_server_per_host) rule is supported for the C(anti-affinity) policy. type: dict -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 a3ef7920..bbd7de88 100644 --- a/plugins/modules/server_info.py +++ b/plugins/modules/server_info.py @@ -38,10 +38,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 1d5bd933..5764c5c6 100644 --- a/plugins/modules/server_metadata.py +++ b/plugins/modules/server_metadata.py @@ -34,10 +34,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/server_volume.py b/plugins/modules/server_volume.py index 892c2c1b..a7385c72 100644 --- a/plugins/modules/server_volume.py +++ b/plugins/modules/server_volume.py @@ -32,10 +32,6 @@ options: - Name or id of volume you want to attach to a server required: true 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 638b1170..4c317fe7 100644 --- a/plugins/modules/stack.py +++ b/plugins/modules/stack.py @@ -62,10 +62,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 811e2898..9c123212 100644 --- a/plugins/modules/stack_info.py +++ b/plugins/modules/stack_info.py @@ -30,9 +30,6 @@ options: description: - Status of the stack such as C(available) type: str -requirements: - - "python >= 3.6" - - "openstacksdk" extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/subnet.py b/plugins/modules/subnet.py index be506382..2f55e144 100644 --- a/plugins/modules/subnet.py +++ b/plugins/modules/subnet.py @@ -127,10 +127,6 @@ options: - The subnet pool name or ID from which to obtain a CIDR type: str required: false -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 4c763d50..a46f4145 100644 --- a/plugins/modules/subnet_pool.py +++ b/plugins/modules/subnet_pool.py @@ -72,10 +72,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/subnets_info.py b/plugins/modules/subnets_info.py index 623d656e..a35a0c4b 100644 --- a/plugins/modules/subnets_info.py +++ b/plugins/modules/subnets_info.py @@ -25,10 +25,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 47b6bcb7..735b736f 100644 --- a/plugins/modules/volume.py +++ b/plugins/modules/volume.py @@ -81,10 +81,6 @@ options: description: - Volume type for volume type: str -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 6df7347d..0101e35a 100644 --- a/plugins/modules/volume_backup.py +++ b/plugins/modules/volume_backup.py @@ -50,14 +50,8 @@ options: - Name or ID of the volume. - Required when I(state) is C(present). type: str - notes: - This module does not support updates to existing backups. - -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/volume_backup_info.py b/plugins/modules/volume_backup_info.py index 57f01fed..61c3134d 100644 --- a/plugins/modules/volume_backup_info.py +++ b/plugins/modules/volume_backup_info.py @@ -20,11 +20,6 @@ options: description: - Name or ID of the volume. type: str - -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/volume_info.py b/plugins/modules/volume_info.py index 8c46dc3a..fd6cea00 100644 --- a/plugins/modules/volume_info.py +++ b/plugins/modules/volume_info.py @@ -30,11 +30,6 @@ options: - Status of the volume so that you can filter on C(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 9837f0f8..4f393d56 100644 --- a/plugins/modules/volume_snapshot.py +++ b/plugins/modules/volume_snapshot.py @@ -40,13 +40,8 @@ options: - Volume name or ID to create the snapshot from. - Required when I(state) is C(present). type: str -requirements: - - "python >= 3.6" - - "openstacksdk" - notes: - Updating existing volume snapshots has not been implemented yet. - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/volume_snapshot_info.py b/plugins/modules/volume_snapshot_info.py index db9a8106..0e2e7939 100644 --- a/plugins/modules/volume_snapshot_info.py +++ b/plugins/modules/volume_snapshot_info.py @@ -30,11 +30,6 @@ options: description: - Name or ID of the volume. type: str - -requirements: - - "python >= 3.6" - - "openstacksdk" - extends_documentation_fragment: - openstack.cloud.openstack ''' diff --git a/plugins/modules/volume_type_access.py b/plugins/modules/volume_type_access.py index 2d1e60ec..cf125177 100644 --- a/plugins/modules/volume_type_access.py +++ b/plugins/modules/volume_type_access.py @@ -35,9 +35,6 @@ options: choices: ['present', 'absent'] notes: - A volume type must not be private to manage project access. -requirements: - - "python >= 3.6" - - "openstacksdk" extends_documentation_fragment: - openstack.cloud.openstack '''