From f32909cb7f20a702ac483276aa55747d7a54d7eb Mon Sep 17 00:00:00 2001 From: jacky06 Date: Mon, 17 Sep 2018 08:01:59 -0400 Subject: [PATCH] Add watcher dashboard into horizon Co-Authored-By: zhulingjie Change-Id: I2b2739bf1f0d746e0ef9582078f0720300354b06 Closes-Bug: #1792951 --- defaults/main.yml | 10 ++++++++++ .../notes/watcher-horizon-panel-c3b616273c21d70a.yaml | 9 +++++++++ tasks/horizon_install_source.yml | 1 + 3 files changed, 20 insertions(+) create mode 100644 releasenotes/notes/watcher-horizon-panel-c3b616273c21d70a.yaml diff --git a/defaults/main.yml b/defaults/main.yml index df13f5c4..bdb81d9a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -73,6 +73,10 @@ trove_dashboard_git_install_branch: master heat_dashboard_git_repo: https://git.openstack.org/openstack/heat-dashboard heat_dashboard_git_install_branch: master +## The git source/branch for the Watcher UI plugin +watcher_dashboard_git_repo: https://git.openstack.org/openstack/watcher-dashboard +watcher_dashboard_git_install_branch: master + ## The git source/branch for the Zun UI plugin zun_dashboard_git_repo: https://git.openstack.org/openstack/zun-ui zun_dashboard_git_install_branch: master @@ -92,6 +96,7 @@ horizon_developer_constraints: - "git+{{ tacker_dashboard_git_repo }}@{{ tacker_dashboard_git_install_branch }}#egg=tacker_horizon" - "git+{{ trove_dashboard_git_repo }}@{{ trove_dashboard_git_install_branch }}#egg=trove_dashboard" - "git+{{ heat_dashboard_git_repo }}@{{ heat_dashboard_git_install_branch }}#egg=heat_dashboard" + - "git+{{ watcher_dashboard_git_repo }}@{{ watcher_dashboard_git_install_branch }}#egg=watcher_dashboard" - "git+{{ zun_dashboard_git_repo }}@{{ zun_dashboard_git_install_branch }}#egg=zun_ui" - "git+{{ neutron_vpnaas_dashboard_git_repo }}@{{ neutron_vpnaas_dashboard_git_install_branch }}#egg=neutron_vpnaas_dashboard" @@ -306,6 +311,9 @@ horizon_enable_neutron_lbaas: False horizon_enable_neutron_fwaas: False horizon_enable_neutron_vpnaas: False +## Watcher UI Panel +horizon_enable_watcher_ui: False + ## Zun UI Panel horizon_enable_zun_ui: False @@ -416,6 +424,8 @@ horizon_tacker_optional_pip_packages: - tacker_horizon horizon_trove_optional_pip_packages: - trove_dashboard +horizon_watcher_optional_pip_packages: + - watcher_dashboard horizon_zun_optional_pip_packages: - zun_ui diff --git a/releasenotes/notes/watcher-horizon-panel-c3b616273c21d70a.yaml b/releasenotes/notes/watcher-horizon-panel-c3b616273c21d70a.yaml new file mode 100644 index 00000000..42726207 --- /dev/null +++ b/releasenotes/notes/watcher-horizon-panel-c3b616273c21d70a.yaml @@ -0,0 +1,9 @@ +--- +features: + - | + The watcher dashboard is available in Horizon. Deployers can enable + the panel by setting the following Ansible variable: + + .. code-block:: yaml + + horizon_enable_watcher_ui: True diff --git a/tasks/horizon_install_source.yml b/tasks/horizon_install_source.yml index 85cbad2b..5d6955c8 100644 --- a/tasks/horizon_install_source.yml +++ b/tasks/horizon_install_source.yml @@ -82,6 +82,7 @@ (horizon_enable_sahara_ui | bool) | ternary(horizon_sahara_optional_pip_packages, []) + (horizon_enable_tacker_ui | bool) | ternary(horizon_tacker_optional_pip_packages, []) + (horizon_enable_trove_ui | bool) | ternary(horizon_trove_optional_pip_packages, []) + + (horizon_enable_watcher_ui | bool) | ternary(horizon_watcher_optional_pip_packages, []) + (horizon_enable_zun_ui | bool) | ternary(horizon_zun_optional_pip_packages, []) }} venv_facts_when_changed: - section: "horizon"