Merge "Allow extra plugin installation ironic/inspector venvs"
This commit is contained in:
commit
9fb6b3df3c
@ -233,10 +233,16 @@ ironic_pip_packages:
|
|||||||
- sushy
|
- sushy
|
||||||
- systemd-python
|
- systemd-python
|
||||||
|
|
||||||
|
# Specific pip packages provided by the user for the ironic service
|
||||||
|
ironic_user_pip_packages: []
|
||||||
|
|
||||||
ironic_inspector_pip_packages:
|
ironic_inspector_pip_packages:
|
||||||
- "git+{{ ironic_inspector_git_repo }}@{{ ironic_inspector_git_install_branch }}#egg=ironic-inspector"
|
- "git+{{ ironic_inspector_git_repo }}@{{ ironic_inspector_git_install_branch }}#egg=ironic-inspector"
|
||||||
- python-ironic-inspector-client
|
- python-ironic-inspector-client
|
||||||
|
|
||||||
|
# Specific pip packages provided by the user for the ironic inspector service
|
||||||
|
ironic_inspector_user_pip_packages: []
|
||||||
|
|
||||||
# Memcached override
|
# Memcached override
|
||||||
ironic_memcached_servers: "{{ memcached_servers }}"
|
ironic_memcached_servers: "{{ memcached_servers }}"
|
||||||
|
|
||||||
|
@ -307,10 +307,12 @@ filtered_ironic_drivers: |-
|
|||||||
|
|
||||||
ironic_venv_packages: |-
|
ironic_venv_packages: |-
|
||||||
{%- set pkg_list = ironic_pip_packages %}
|
{%- set pkg_list = ironic_pip_packages %}
|
||||||
|
{%- set _ = pkg_list.extend(ironic_user_pip_packages) %}
|
||||||
{%- if (ironic_oslomsg_amqp1_enabled | bool) %}
|
{%- if (ironic_oslomsg_amqp1_enabled | bool) %}
|
||||||
{%- set _ = pkg_list.extend(ironic_optional_oslomsg_amqp1_pip_packages) %}
|
{%- set _ = pkg_list.extend(ironic_optional_oslomsg_amqp1_pip_packages) %}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- if (ironic_services['ironic-inspector']['group'] in group_names) %}
|
{%- if (ironic_services['ironic-inspector']['group'] in group_names) %}
|
||||||
{%- set _ = pkg_list.extend(ironic_inspector_pip_packages) %}
|
{%- set _ = pkg_list.extend(ironic_inspector_pip_packages) %}
|
||||||
|
{%- set _ = pkg_list.extend(ironic_inspector_user_pip_packages) %}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{{- pkg_list | unique }}
|
{{- pkg_list | unique }}
|
||||||
|
Loading…
Reference in New Issue
Block a user