summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuilherme Steinm├╝ller <gsteinmuller@vexxhost.com>2019-02-20 17:57:04 +0000
committerGuilherme Steinm├╝ller <gsteinmuller@vexxhost.com>2019-02-22 16:34:22 +0000
commitda833077e084192a185f4215a1d574cf69d581ad (patch)
treeacbe93b0a67e83d46639aae9cd142156c55607b4
parent33b192bfd986e4e166ef13af994d0ecf5acf47ce (diff)
Add magnum_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: Iaa94479ea780aa0b79b880327b807223f66874d6
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 12:09:50 +0000 Reviewed-on: https://review.openstack.org/638232 Project: openstack/openstack-ansible-os_magnum Branch: refs/heads/master
-rw-r--r--defaults/main.yml3
-rw-r--r--tasks/magnum_install.yml3
2 files changed, 5 insertions, 1 deletions
diff --git a/defaults/main.yml b/defaults/main.yml
index c4df42a..4235b00 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -160,6 +160,9 @@ magnum_pip_packages:
160 - python-memcached 160 - python-memcached
161 - uwsgi 161 - uwsgi
162 162
163# Specific pip packages provided by the user
164magnum_user_pip_packages: []
165
163magnum_optional_oslomsg_amqp1_pip_packages: 166magnum_optional_oslomsg_amqp1_pip_packages:
164 - oslo.messaging[amqp1] 167 - oslo.messaging[amqp1]
165 168
diff --git a/tasks/magnum_install.yml b/tasks/magnum_install.yml
index 3038869..a90a5c0 100644
--- a/tasks/magnum_install.yml
+++ b/tasks/magnum_install.yml
@@ -42,7 +42,8 @@
42 venv_install_destination_path: "{{ magnum_bin | dirname }}" 42 venv_install_destination_path: "{{ magnum_bin | dirname }}"
43 venv_install_distro_package_list: "{{ magnum_distro_packages }}" 43 venv_install_distro_package_list: "{{ magnum_distro_packages }}"
44 venv_pip_install_args: "{{ magnum_pip_install_args }}" 44 venv_pip_install_args: "{{ magnum_pip_install_args }}"
45 venv_pip_packages: "{{ (magnum_oslomsg_amqp1_enabled | bool) | ternary(magnum_pip_packages + magnum_optional_oslomsg_amqp1_pip_packages, magnum_pip_packages) }}" 45 venv_pip_packages: "{{ magnum_pip_packages | union(magnum_user_pip_packages) +
46 (magnum_oslomsg_amqp1_enabled | bool) | ternary(magnum_optional_oslomsg_amqp1_pip_packages, []) }}"
46 venv_facts_when_changed: 47 venv_facts_when_changed:
47 - section: "magnum" 48 - section: "magnum"
48 option: "venv_tag" 49 option: "venv_tag"