openstack/ansible-collections-openstack
Code Issues Proposed changes

Constrain filters in compute_service_info to SDK >= 0.53.0

Browse Source 
Older releases of OpenStack SDK do not support filtering services.

Change-Id: I613c76b8f794ea2024939e07250a50edc5b9e49a
This commit is contained in:
Jakob Meng 2022-04-26 11:17:40 +02:00
parent bba1da17c9
commit e85a0b809a
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ci/roles/nova_services/tasks/main.yml
View File

@ -3,20 +3,22 @@
- name: Get nova compute services info - name: Get nova compute services info
openstack.cloud.compute_service_info: openstack.cloud.compute_service_info:
cloud: "{{ cloud }}" cloud: "{{ cloud }}"
binary: "nova-compute"
register: result register: result
failed_when: "result.openstack_compute_services | length <= 0" failed_when: "result.openstack_compute_services | length <= 0"
- name: Assert fields - name: Assert fields
assert: assert:
that: that:
- '["availability_zone", "binary", "disabled_reason", "is_forced_down", - '["availability_zone", "binary", "disabled_reason", "is_forced_down",
"host", "name", "state", "status", "updated_at", "id"] | "host", "name", "state", "status", "updated_at", "id"] |
difference(result.openstack_compute_services.0.keys()) | length == 0' difference(result.openstack_compute_services.0.keys()) | length == 0'
- name: Get nova conductor services info - name: Filter compute services. Supported since OpenStack SDK 0.53.0 (Wallaby).
openstack.cloud.compute_service_info: when: sdk_version is version(0.53, '>=')
cloud: "{{ cloud }}" block:
binary: "nova-conductor" - name: Get nova compute services info
register: result openstack.cloud.compute_service_info:
failed_when: "result.openstack_compute_services | length <= 0" cloud: "{{ cloud }}"
binary: "nova-compute"
register: result
failed_when: "result.openstack_compute_services | length <= 0"

17
plugins/modules/compute_service_info.py
View File

@ -12,11 +12,11 @@ description:
options: options:
binary: binary:
description: description:
- Filter by service binary type - Filter by service binary type. Requires openstacksdk>=0.53.
type: str type: str
host: host:
description: description:
- Filter by service host - Filter by service host. Requires openstacksdk>=0.53.
type: str type: str
requirements: requirements:
- "python >= 3.6" - "python >= 3.6"
@ -94,21 +94,16 @@ from ansible_collections.openstack.cloud.plugins.module_utils.openstack import O
class ComputeServiceInfoModule(OpenStackModule): class ComputeServiceInfoModule(OpenStackModule):
argument_spec = dict( argument_spec = dict(
binary=dict(required=False, default=None), binary=dict(required=False, default=None, min_ver='0.53.0'),
host=dict(required=False, default=None), host=dict(required=False, default=None, min_ver='0.53.0'),
) )
module_kwargs = dict( module_kwargs = dict(
supports_check_mode=True supports_check_mode=True
) )
def run(self): def run(self):
binary = self.params['binary'] filters = self.check_versioned(binary=self.params['binary'], host=self.params['host'])
host = self.params['host'] filters = {k: v for k, v in filters.items() if v is not None}
filters = {}
if binary:
filters['binary'] = binary
if host:
filters['host'] = host
services = self.conn.compute.services(**filters) services = self.conn.compute.services(**filters)
services = [service.to_dict(computed=False) for service in services] services = [service.to_dict(computed=False) for service in services]
self.exit_json(changed=False, openstack_compute_services=services) self.exit_json(changed=False, openstack_compute_services=services)