openstack
/
openstack-ansible-os_magnum
Code Issues Proposed changes

Merge "Add magnum_user_pip_packages variable"

This commit is contained in:
Zuul 2019-02-27 12:09:50 +00:00 committed by Gerrit Code Review
parent 9dc46485e2 da833077e0
commit f8abeba938
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

@ -160,6 +160,9 @@ magnum_pip_packages:
- python-memcached
- uwsgi
# Specific pip packages provided by the user
magnum_user_pip_packages: []
magnum_optional_oslomsg_amqp1_pip_packages:
- oslo.messaging[amqp1]

3
tasks/magnum_install.yml
View File

@ -41,7 +41,8 @@
venv_install_destination_path: "{{ magnum_bin | dirname }}"
venv_install_distro_package_list: "{{ magnum_distro_packages }}"
venv_pip_install_args: "{{ magnum_pip_install_args }}"
venv_pip_packages: "{{ (magnum_oslomsg_amqp1_enabled | bool) | ternary(magnum_pip_packages + magnum_optional_oslomsg_amqp1_pip_packages, magnum_pip_packages) }}"
venv_pip_packages: "{{ magnum_pip_packages | union(magnum_user_pip_packages) +
(magnum_oslomsg_amqp1_enabled | bool) | ternary(magnum_optional_oslomsg_amqp1_pip_packages, []) }}"
venv_facts_when_changed:
- section: "magnum"
option: "venv_tag"