openstack
/
openstack-ansible-os_ironic
Code Issues Proposed changes

Merge "Allow extra plugin installation ironic/inspector venvs"

This commit is contained in:
Zuul 2022-12-08 21:41:51 +00:00 committed by Gerrit Code Review
parent 0737ce3338 71d201fcba
commit 9fb6b3df3c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
defaults/main.yml
View File

@ -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 }}"

2
vars/main.yml
View File

@ -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 }}