openstack
/
openstack-ansible-os_glance
Code Issues Proposed changes

Merge "Add glance_user_pip_packages variable"

This commit is contained in:
Zuul 2019-02-27 11:33:14 +00:00 committed by Gerrit Code Review
parent 6be257125f e24fe31e2e
commit 9539f40f7c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -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]

3
tasks/glance_install_source.yml
View File

@ -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"