From 71d201fcbaef61e39742633c35209a62c148d2e3 Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Tue, 15 Nov 2022 10:28:52 +0000
Subject: [PATCH] Allow extra plugin installation ironic/inspector venvs

Ironic and inspector are extensible via the stevedore framework.
In order to add extra plugins to the ironic and inspector venvs
extra variables are needed to supply user defined lists of python
packages to install.

Change-Id: I656abb90827486bbb69bf0ccd7e990fd680f2c51
---
 defaults/main.yml | 6 ++++++
 vars/main.yml     | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/defaults/main.yml b/defaults/main.yml
index abf187ff..b6df5e3b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -233,10 +233,16 @@ ironic_pip_packages:
   - sushy
   - systemd-python
 
+# Specific pip packages provided by the user for the ironic service
+ironic_user_pip_packages: []
+
 ironic_inspector_pip_packages:
   - "git+{{ ironic_inspector_git_repo }}@{{ ironic_inspector_git_install_branch }}#egg=ironic-inspector"
   - python-ironic-inspector-client
 
+# Specific pip packages provided by the user for the ironic inspector service
+ironic_inspector_user_pip_packages: []
+
 # Memcached override
 ironic_memcached_servers: "{{ memcached_servers }}"
 
diff --git a/vars/main.yml b/vars/main.yml
index c3fa7eb2..a98f332d 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -307,10 +307,12 @@ filtered_ironic_drivers: |-
 
 ironic_venv_packages: |-
   {%- set pkg_list = ironic_pip_packages %}
+  {%- set _ = pkg_list.extend(ironic_user_pip_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 %}
   {{- pkg_list | unique }}