openstack
/
openstack-ansible-os_nova
Code Issues Proposed changes

Merge "Add nova_user_pip_packages variable"

This commit is contained in:
Zuul 2019-02-18 04:30:37 +00:00 committed by Gerrit Code Review
parent 76a1b307a0 9c06d69e6d
commit 70af4aee3d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -588,6 +588,9 @@ nova_pip_packages:
- python-openstackclient
- uWSGI
# Specific pip packages provided by the user
nova_user_pip_packages: []
nova_optional_oslomsg_amqp1_pip_packages:
- oslo.messaging[amqp1]

2
tasks/nova_install_source.yml
View File

@ -45,7 +45,7 @@
venv_pip_install_args: "{{ nova_pip_install_args }}"
venv_packages_to_symlink: "{{ (nova_services['nova-compute']['group'] in group_names) | ternary(nova_compute_kvm_packages_to_symlink, []) }}"
venv_pip_packages: >-
{{ nova_pip_packages +
{{ nova_pip_packages | union(nova_user_pip_packages) +
((nova_services['nova-novncproxy']['group'] in group_names) and (nova_console_type == 'novnc')) | ternary(nova_novnc_pip_packages, []) +
(nova_oslomsg_amqp1_enabled | bool) | ternary(nova_optional_oslomsg_amqp1_pip_packages, []) }}
venv_facts_when_changed: