From aa2db2cf0125c0bf86a984c72926e503b829f83f Mon Sep 17 00:00:00 2001 From: ArchiFleKs Date: Tue, 13 Feb 2018 17:41:12 +0100 Subject: [PATCH] Add support for Horizon Octavia UI Change-Id: I65c9d117f8e74d9a2e1e5b3cfad34a4dbb06ca60 (cherry picked from commit 4814cb17d49d97cd41086278361c122c673336f6) --- defaults/main.yml | 8 ++++++++ vars/main.yml | 3 +++ 2 files changed, 11 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 3734374c..945fc797 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -32,6 +32,10 @@ horizon_git_install_branch: "stable/queens" magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui magnum_dashboard_git_install_branch: "master" # "stable/queens" isn't branched yet. +## 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 + ## The git source/branch for the Designate UI plugin designate_dashboard_git_repo: https://git.openstack.org/openstack/designate-dashboard designate_dashboard_git_install_branch: "stable/queens" @@ -203,6 +207,9 @@ horizon_enable_ironic_ui: False ## Magnum UI Panel horizon_enable_magnum_ui: False +## Magnum UI Panel +horizon_enable_octavia_ui: False + ## Sahara UI Panel horizon_enable_sahara_ui: False @@ -305,6 +312,7 @@ horizon_pip_packages: - sahara_dashboard - trove_dashboard - designate_dashboard + - octavia_dashboard # This variable is used to install additional pip packages # that could be needed for additional dashboards diff --git a/vars/main.yml b/vars/main.yml index 588eff2f..61147f53 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -98,3 +98,6 @@ _horizon_panels: - src: "{{ horizon_lib_dir }}/neutron_fwaas_dashboard/enabled/_7010_project_firewalls_panel.py" path: "{{ horizon_lib_dir }}/openstack_dashboard/local/enabled/_7010_project_firewalls_panel.py" state: "{{ (horizon_enable_neutron_fwaas | bool) | ternary('link', 'absent') }}" + - src: "{{ horizon_lib_dir }}/octavia_dashboard/enabled/_1482_project_load_balancer_panel.py" + path: "{{ horizon_lib_dir }}/openstack_dashboard/local/enabled/_1482_project_load_balancer_panel.py" + state: "{{ (horizon_enable_octavia_ui | bool) | ternary('link', 'absent') }}"