diff --git a/defaults/main.yml b/defaults/main.yml index 46690864..de44dc08 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -263,6 +263,9 @@ glance_pip_packages: - uwsgi - warlock +# Specific pip packages provided by the user +glance_user_pip_packages: [] + glance_optional_oslomsg_amqp1_pip_packages: - oslo.messaging[amqp1] diff --git a/tasks/glance_install_source.yml b/tasks/glance_install_source.yml index aee6571c..dace7d97 100644 --- a/tasks/glance_install_source.yml +++ b/tasks/glance_install_source.yml @@ -42,7 +42,8 @@ venv_install_destination_path: "{{ glance_bin | dirname }}" venv_install_distro_package_list: "{{ glance_distro_packages }}" venv_pip_install_args: "{{ glance_pip_install_args }}" - venv_pip_packages: "{{ (glance_oslomsg_amqp1_enabled | bool) | ternary(glance_pip_packages + glance_optional_oslomsg_amqp1_pip_packages, glance_pip_packages) }}" + venv_pip_packages: "{{ glance_pip_packages | union(glance_user_pip_packages) + + (glance_oslomsg_amqp1_enabled | bool) | ternary(glance_optional_oslomsg_amqp1_pip_packages, []) }}" venv_facts_when_changed: - section: "glance" option: "need_service_restart"