Merge "Add cinder_user_pip_packages variable"

This commit is contained in:
Zuul 2019-02-23 12:46:13 +00:00 committed by Gerrit Code Review
commit 7f528040ad
2 changed files with 4 additions and 1 deletions

View File

@ -304,6 +304,9 @@ cinder_pip_packages:
- systemd-python
- uwsgi
# Specific pip packages provided by the user
cinder_user_pip_packages: []
cinder_optional_oslomsg_amqp1_pip_packages:
- oslo.messaging[amqp1]

View File

@ -42,7 +42,7 @@
venv_install_destination_path: "{{ cinder_bin | dirname }}"
venv_pip_install_args: "{{ cinder_pip_install_args }}"
venv_pip_packages: >-
{{ cinder_pip_packages +
{{ cinder_pip_packages | union(cinder_user_pip_packages) +
(cinder_oslomsg_amqp1_enabled | bool) | ternary(cinder_optional_oslomsg_amqp1_pip_packages, []) }}
venv_facts_when_changed:
- section: "cinder"