summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuilherme Steinm├╝ller <gsteinmuller@vexxhost.com>2019-02-20 17:41:59 +0000
committerGuilherme Steinm├╝ller <gsteinmuller@vexxhost.com>2019-02-22 16:38:25 +0000
commite24fe31e2e3ded2868474efd53b317faaea34d9c (patch)
tree1b7a9b641447558699e1a9f3a1324b8cf7a62825
parent2edb1b1a4d5aa8e63a506e2a9506c42c75f51379 (diff)
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
Notes
Notes (review): Code-Review+2: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk> Code-Review+2: Jesse Pretorius (odyssey4me) <jesse.pretorius@rackspace.co.uk> Workflow+1: Jesse Pretorius (odyssey4me) <jesse.pretorius@rackspace.co.uk> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 27 Feb 2019 11:33:14 +0000 Reviewed-on: https://review.openstack.org/638229 Project: openstack/openstack-ansible-os_glance Branch: refs/heads/master
-rw-r--r--defaults/main.yml3
-rw-r--r--tasks/glance_install_source.yml3
2 files changed, 5 insertions, 1 deletions
diff --git a/defaults/main.yml b/defaults/main.yml
index 632dd07..6923851 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -263,6 +263,9 @@ glance_pip_packages:
263 - uwsgi 263 - uwsgi
264 - warlock 264 - warlock
265 265
266# Specific pip packages provided by the user
267glance_user_pip_packages: []
268
266glance_optional_oslomsg_amqp1_pip_packages: 269glance_optional_oslomsg_amqp1_pip_packages:
267 - oslo.messaging[amqp1] 270 - oslo.messaging[amqp1]
268 271
diff --git a/tasks/glance_install_source.yml b/tasks/glance_install_source.yml
index 99e9795..c1b10fe 100644
--- a/tasks/glance_install_source.yml
+++ b/tasks/glance_install_source.yml
@@ -43,7 +43,8 @@
43 venv_install_destination_path: "{{ glance_bin | dirname }}" 43 venv_install_destination_path: "{{ glance_bin | dirname }}"
44 venv_install_distro_package_list: "{{ glance_distro_packages }}" 44 venv_install_distro_package_list: "{{ glance_distro_packages }}"
45 venv_pip_install_args: "{{ glance_pip_install_args }}" 45 venv_pip_install_args: "{{ glance_pip_install_args }}"
46 venv_pip_packages: "{{ (glance_oslomsg_amqp1_enabled | bool) | ternary(glance_pip_packages + glance_optional_oslomsg_amqp1_pip_packages, glance_pip_packages) }}" 46 venv_pip_packages: "{{ glance_pip_packages | union(glance_user_pip_packages) +
47 (glance_oslomsg_amqp1_enabled | bool) | ternary(glance_optional_oslomsg_amqp1_pip_packages, []) }}"
47 venv_facts_when_changed: 48 venv_facts_when_changed:
48 - section: "glance" 49 - section: "glance"
49 option: "need_service_restart" 50 option: "need_service_restart"