From e24fe31e2e3ded2868474efd53b317faaea34d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guilherme=20Steinm=C3=BCller?= Date: Wed, 20 Feb 2019 17:41:59 +0000 Subject: [PATCH] Add glance_user_pip_packages variable With this variable, users would be able to extend the list of pip packages in case of needing an extra pip package. Currently if we need an extra pip package we need to override the existing list. Change-Id: I59bd71a581b23574323db55f0f16194e7788e22e --- defaults/main.yml | 3 +++ tasks/glance_install_source.yml | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 632dd07c..69238515 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 99e9795b..c1b10fef 100644 --- a/tasks/glance_install_source.yml +++ b/tasks/glance_install_source.yml @@ -43,7 +43,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"