Install barbican-ui when the barbican service is deployed

Change-Id: Id2c7ecdcbd276c9057816c7049dd1a25864b1a32
This commit is contained in:
Jonathan Rosser 2021-02-04 08:59:52 +00:00 committed by Dmitriy Rabotyagov
parent 33461af97d
commit 8e712e93b5
2 changed files with 10 additions and 0 deletions

View File

@ -37,6 +37,10 @@ horizon_git_repo: https://opendev.org/openstack/horizon
horizon_git_track_branch: master
horizon_git_install_branch: "{{ horizon_git_track_branch }}"
## The git source/branch for the Barbican UI plugin
barbican_dashboard_git_repo: https://opendev.org/openstack/barbican-ui
barbican_dashboard_git_install_branch: "{{ horizon_git_track_branch }}"
## The git source/branch for the Blazar UI plugin
blazar_dashboard_git_repo: https://opendev.org/openstack/blazar-dashboard
blazar_dashboard_git_install_branch: "{{ horizon_git_track_branch }}"
@ -279,6 +283,9 @@ horizon_launch_instance_defaults:
disable_volume_snapshot: False
create_volume: True
## Barbican UI Panel
horizon_enable_barbican_ui: "{{ (groups['barbican_all'] is defined) and (groups['barbican_all'] | length > 0) }}"
## Blazar UI Panel
horizon_enable_blazar_ui: "{{ (groups['blazar_all'] is defined) and (groups['blazar_all'] | length > 0) }}"
@ -409,6 +416,8 @@ horizon_user_pip_packages: []
# Optional pip packages for additional dashboards
# TODO(odyssey4me):
# Simplify this when we are no longer using the py_pkgs plugin
horizon_barbican_optional_pip_packages:
- "git+{{ barbican_dashboard_git_repo }}@{{ barbican_dashboard_git_install_branch }}#egg=barbican-ui"
horizon_blazar_optional_pip_packages:
- "git+{{ blazar_dashboard_git_repo }}@{{ blazar_dashboard_git_install_branch }}#egg=blazar-dashboard"
horizon_cloudkitty_optional_pip_packages:

View File

@ -59,6 +59,7 @@
{{ horizon_pip_packages | union(horizon_user_pip_packages) +
horizon_optional_pip_packages +
horizon_service_pip_packages | default([]) +
(horizon_enable_barbican_ui | bool) | ternary(horizon_barbican_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, []) +