From b0073df5055d11b278d8e55b4ee542e60abf2f8e Mon Sep 17 00:00:00 2001 From: Andrew Bonney Date: Wed, 2 Aug 2023 14:38:42 +0100 Subject: [PATCH] Fix lack of constraints for ironic-inspector OSA playbooks only call this role once for all Ironic containers (API and inspector). As a result, the wheel builds only happen once. If the first host (which is responsible for wheel builds) is an API container, these vars would prevent Ironic inspector requirements being accounted for, and as such no matching constraints will be generated. When the venv is deployed to the Ironic inspector container, the lack of constraints can cause dependencies which are too new to be installed, causing the service to fail. Alternatively this role could be called twice by the playbook for differing container/host roles, but as inspector is expected to be merged into ironic at some point this feels equally valid. Change-Id: I3952a4e5514824381410d87ed6d535f13ec40498 (cherry picked from commit a665f45a696514ab01e913374cd921fa88ce6c0d) (cherry picked from commit d700ff19af6b2f21ca3a00a859c2b072c5809bae) --- vars/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/vars/main.yml b/vars/main.yml index 42a8bde5..5e35f3f8 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -311,8 +311,6 @@ ironic_venv_packages: |- {%- if (ironic_oslomsg_amqp1_enabled | bool) %} {%- set _ = pkg_list.extend(ironic_optional_oslomsg_amqp1_pip_packages) %} {%- endif %} - {%- if (ironic_services['ironic-inspector']['group'] in group_names) %} - {%- set _ = pkg_list.extend(ironic_inspector_pip_packages) %} - {%- set _ = pkg_list.extend(ironic_inspector_user_pip_packages) %} - {%- endif %} + {%- set _ = pkg_list.extend(ironic_inspector_pip_packages) %} + {%- set _ = pkg_list.extend(ironic_inspector_user_pip_packages) %} {{- pkg_list | unique }}