diff --git a/defaults/main.yml b/defaults/main.yml index 0397ace0..44c6252d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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] diff --git a/tasks/cinder_install_source.yml b/tasks/cinder_install_source.yml index f163c0e5..676df658 100644 --- a/tasks/cinder_install_source.yml +++ b/tasks/cinder_install_source.yml @@ -43,7 +43,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"