diff --git a/defaults/main.yml b/defaults/main.yml index b1fb6676..67f4bfc8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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] diff --git a/tasks/nova_install_source.yml b/tasks/nova_install_source.yml index ba45d227..3729b2c8 100644 --- a/tasks/nova_install_source.yml +++ b/tasks/nova_install_source.yml @@ -44,7 +44,7 @@ venv_install_destination_path: "{{ nova_bin | dirname }}" venv_pip_install_args: "{{ nova_pip_install_args }}" 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: