From 9a25d2507b20cbc7469db1982bc90a5d67e7aa8b Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotjagov Date: Tue, 20 Nov 2018 20:30:35 +0200 Subject: [PATCH] Implements masakari-dashboard to be installed in horizon Added masakari dashboard to horizon installation. As for now it's installation is available only from source. Change-Id: I07937e2d97080ec5f4aece61a6bf032cd8790f5f Implements: blueprint masakari-ansible-plugin --- defaults/main.yml | 10 ++++++++++ .../notes/masakari-horizon-panel-c058881e1268b3b7.yaml | 9 +++++++++ tasks/horizon_install_source.yml | 1 + vars/source_install.yml | 2 ++ 4 files changed, 22 insertions(+) create mode 100644 releasenotes/notes/masakari-horizon-panel-c058881e1268b3b7.yaml diff --git a/defaults/main.yml b/defaults/main.yml index c1498662..b707455c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -48,6 +48,10 @@ cloudkitty_dashboard_git_install_branch: master magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui magnum_dashboard_git_install_branch: master +## The git source/branch for the Masakari UI plugin +masakari_dashboard_git_repo: https://git.openstack.org/openstack/masakari-dashboard +masakari_dashboard_git_install_branch: master + ## The git source/branch for the Octavia UI plugin octavia_dashboard_git_repo: https://git.openstack.org/openstack/octavia-dashboard octavia_dashboard_git_install_branch: master @@ -82,6 +86,7 @@ horizon_developer_constraints: - "git+{{ blazar_dashboard_git_repo }}@{{ blazar_dashboard_git_install_branch }}#egg=blazar-dashboard" - "git+{{ cloudkitty_dashboard_git_repo }}@{{ cloudkitty_dashboard_git_install_branch }}#egg=cloudkitty_dashboard" - "git+{{ magnum_dashboard_git_repo }}@{{ magnum_dashboard_git_install_branch }}#egg=magnum-ui" + - "git+{{ masakari_dashboard_git_repo }}@{{ masakari_dashboard_git_install_branch }}#egg=masakari_dashboard" - "git+{{ designate_dashboard_git_repo }}@{{ designate_dashboard_git_install_branch }}#egg=designate_dashboard" - "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" @@ -274,6 +279,9 @@ horizon_enable_ironic_ui: False ## Magnum UI Panel horizon_enable_magnum_ui: False +## Masakari UI Panel +horizon_enable_masakari_ui: False + ## Octavia UI Panel horizon_enable_octavia_ui: False @@ -391,6 +399,8 @@ horizon_ironic_optional_pip_packages: - ironic-ui horizon_magnum_optional_pip_packages: - magnum-ui +horizon_masakari_optional_pip_packages: + - masakari-dashboard horizon_neutron_fwaas_optional_pip_packages: - neutron-fwaas-dashboard horizon_neutron_lbaas_optional_pip_packages: diff --git a/releasenotes/notes/masakari-horizon-panel-c058881e1268b3b7.yaml b/releasenotes/notes/masakari-horizon-panel-c058881e1268b3b7.yaml new file mode 100644 index 00000000..7c8614cf --- /dev/null +++ b/releasenotes/notes/masakari-horizon-panel-c058881e1268b3b7.yaml @@ -0,0 +1,9 @@ +--- +features: + - | + The masakari dashboard is available in Horizon. Deployers can enable + the panel by setting the following Ansible variable: + + .. code-block:: yaml + + horizon_enable_masakari_ui: True \ No newline at end of file diff --git a/tasks/horizon_install_source.yml b/tasks/horizon_install_source.yml index b5aae0e5..85cbad2b 100644 --- a/tasks/horizon_install_source.yml +++ b/tasks/horizon_install_source.yml @@ -74,6 +74,7 @@ (horizon_enable_heat_ui | bool) | ternary(horizon_heat_optional_pip_packages, []) + (horizon_enable_ironic_ui | bool) | ternary(horizon_ironic_optional_pip_packages, []) + (horizon_enable_magnum_ui | bool) | ternary(horizon_magnum_optional_pip_packages, []) + + (horizon_enable_masakari_ui | bool) | ternary(horizon_masakari_optional_pip_packages, []) + (horizon_enable_neutron_fwaas | bool) | ternary(horizon_neutron_fwaas_optional_pip_packages, []) + (horizon_enable_neutron_lbaas | bool) | ternary(horizon_neutron_lbaas_optional_pip_packages, []) + (horizon_enable_neutron_vpnaas | bool) | ternary(horizon_neutron_vpnaas_optional_pip_packages, []) + diff --git a/vars/source_install.yml b/vars/source_install.yml index 3c10586a..8d2eaff9 100644 --- a/vars/source_install.yml +++ b/vars/source_install.yml @@ -23,3 +23,5 @@ _dashboard_panels_location: - "/enabled" - "/conf" - "/local_settings.d" + - "/local/enabled" + - "/local/local_settings.d"