diff --git a/defaults/main.yml b/defaults/main.yml index 07f03b3e..a0b747d8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -397,6 +397,9 @@ horizon_pip_packages: - python-memcached - python-keystoneclient +# Specific pip packages provided by the user +horizon_user_pip_packages: [] + # Optional pip packages for additional dashboards # TODO(odyssey4me): # Simplify this when we are no longer using the py_pkgs plugin diff --git a/tasks/horizon_install_source.yml b/tasks/horizon_install_source.yml index c87f21d0..9e82175d 100644 --- a/tasks/horizon_install_source.yml +++ b/tasks/horizon_install_source.yml @@ -67,7 +67,7 @@ venv_install_destination_path: "{{ horizon_bin | dirname }}" venv_pip_install_args: "{{ horizon_pip_install_args }}" venv_pip_packages: >- - {{ horizon_pip_packages + horizon_optional_pip_packages + + {{ horizon_pip_packages | union(horizon_user_pip_packages) + horizon_optional_pip_packages + (horizon_enable_blazar_ui | bool) | ternary(horizon_blazar_optional_pip_packages, []) + (horizon_enable_cloudkitty_ui | bool) | ternary(horizon_cloudkitty_optional_pip_packages, []) + (horizon_enable_designate_ui | bool) | ternary(horizon_designate_optional_pip_packages, []) +