From 0aad89884862e8e8fe47d1d9c263f163cf4ee288 Mon Sep 17 00:00:00 2001 From: jacky06 Date: Mon, 17 Sep 2018 07:35:02 -0400 Subject: [PATCH] Add blazar dashboard into horizon Change-Id: I1dfd7fa99a5422877b579caf9bae984fcd5c38a5 Closes-Bug: #1792951 --- defaults/main.yml | 10 ++++++++++ .../notes/blazar-horizon-panel-d5ba19273b21d7aa.yaml | 9 +++++++++ tasks/horizon_install_source.yml | 1 + 3 files changed, 20 insertions(+) create mode 100644 releasenotes/notes/blazar-horizon-panel-d5ba19273b21d7aa.yaml diff --git a/defaults/main.yml b/defaults/main.yml index f350dcdc..5c1f5ac0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -36,6 +36,10 @@ horizon_developer_mode: false horizon_git_repo: https://git.openstack.org/openstack/horizon horizon_git_install_branch: master +## The git source/branch for the Blazar UI plugin +blazar_dashboard_git_repo: https://git.openstack.org/openstack/blazar-dashboard +blazar_dashboard_git_install_branch: master + ## The git source/branch for the Magnum UI plugin magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui magnum_dashboard_git_install_branch: master @@ -59,6 +63,7 @@ heat_dashboard_git_install_branch: master ## The packages to build from source (used in developer mode) horizon_developer_constraints: - "git+{{ horizon_git_repo }}@{{ horizon_git_install_branch }}#egg=horizon" + - "git+{{ blazar_dashboard_git_repo }}@{{ blazar_dashboard_git_install_branch }}#egg=blazar-dashboard" - "git+{{ magnum_dashboard_git_repo }}@{{ magnum_dashboard_git_install_branch }}#egg=magnum-ui" - "git+{{ designate_dashboard_git_repo }}@{{ designate_dashboard_git_install_branch }}#egg=designate_dashboard" - "git+{{ trove_dashboard_git_repo }}@{{ trove_dashboard_git_install_branch }}#egg=trove_dashboard" @@ -227,6 +232,9 @@ horizon_launch_instance_defaults: disable_volume_snapshot: False create_volume: True +## Blazar UI Panel +horizon_enable_blazar_ui: False + ## Ironic UI Panel horizon_enable_ironic_ui: False @@ -331,6 +339,8 @@ horizon_pip_packages: # Optional pip packages for additional dashboards # TODO(odyssey4me): # Simplify this when we are no longer using the py_pkgs plugin +horizon_blazar_optional_pip_packages: + - blazar_dashboard horizon_designate_optional_pip_packages: - designate_dashboard horizon_heat_optional_pip_packages: diff --git a/releasenotes/notes/blazar-horizon-panel-d5ba19273b21d7aa.yaml b/releasenotes/notes/blazar-horizon-panel-d5ba19273b21d7aa.yaml new file mode 100644 index 00000000..73b9e17c --- /dev/null +++ b/releasenotes/notes/blazar-horizon-panel-d5ba19273b21d7aa.yaml @@ -0,0 +1,9 @@ +--- +features: + - | + The blazar dashboard is available in Horizon. Deployers can enable + the panel by setting the following Ansible variable: + + .. code-block:: yaml + + horizon_enable_blazar_ui: True diff --git a/tasks/horizon_install_source.yml b/tasks/horizon_install_source.yml index 9366c293..3e0f74a8 100644 --- a/tasks/horizon_install_source.yml +++ b/tasks/horizon_install_source.yml @@ -69,6 +69,7 @@ venv_pip_install_args: "{{ horizon_pip_install_args }}" venv_pip_packages: >- {{ horizon_pip_packages + horizon_optional_pip_packages + + (horizon_enable_blazar_ui | bool) | ternary(horizon_blazar_optional_pip_packages, []) + (horizon_enable_designate_ui | bool) | ternary(horizon_designate_optional_pip_packages, []) + (horizon_enable_heat_ui | bool) | ternary(horizon_heat_optional_pip_packages, []) + (horizon_enable_ironic_ui | bool) | ternary(horizon_ironic_optional_pip_packages, []) +