From 65f09e114b9cb1fd7a0a20cb9425c62b987cd106 Mon Sep 17 00:00:00 2001 From: ArchiFleKs Date: Tue, 13 Feb 2018 17:49:25 +0100 Subject: [PATCH] Add support for Horizon Octavia Dashboard Octavia dashboard will be enabled if any octavia hosts are defined Change-Id: I893cc59cc27c24ce39fb7ec0bc90b95c75c567be Depends-On: I65c9d117f8e74d9a2e1e5b3cfad34a4dbb06ca60 --- inventory/group_vars/horizon_all.yml | 1 + playbooks/defaults/repo_packages/openstack_services.yml | 8 ++++++-- ...orizon-octavia-dashboard-support-faed0fd8e11e8f50.yaml | 7 +++++++ 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/add-horizon-octavia-dashboard-support-faed0fd8e11e8f50.yaml diff --git a/inventory/group_vars/horizon_all.yml b/inventory/group_vars/horizon_all.yml index 4f591d204a..a408537872 100644 --- a/inventory/group_vars/horizon_all.yml +++ b/inventory/group_vars/horizon_all.yml @@ -20,6 +20,7 @@ horizon_enable_heat_ui: "{{ (groups['heat_all'] is defined) and (groups['heat_al horizon_enable_ironic_ui: "{{ (groups['ironic_all'] is defined) and (groups['ironic_all'] | length > 0) }}" horizon_enable_magnum_ui: "{{ (groups['magnum_all'] is defined) and (groups['magnum_all'] | length > 0) }}" horizon_enable_designate_ui: "{{ (groups['designate_all'] is defined) and (groups['designate_all'] | length > 0) }}" +horizon_enable_octavia_ui: "{{ (groups['octavia-infra_all'] is defined) and (groups['octavia-infra_all'] | length > 0) }}" # NOTE(mhayden): neutron-lbaas is a separate plugin and requires the full # namespace to be specified. Also, LBaaS v1 was removed in Newton. horizon_enable_neutron_lbaas: "{{ neutron_plugin_base is defined and 'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2' in neutron_plugin_base }}" diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index ecc18e1957..9fac323826 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -239,8 +239,12 @@ tacker_git_repo: https://git.openstack.org/openstack/tacker tacker_git_install_branch: 1df345f8dc984d84df362980703616d78a3465b6 # HEAD of "master" as of 16.02.2018 tacker_git_project_group: tacker_all - ## Congress service congress_git_repo: https://git.openstack.org/openstack/congress congress_git_install_branch: d3abc388515ba6456944093a6accde003dfea33f # HEAD of "master" as of 16.02.2018 -congress_git_project_group: congress_all \ No newline at end of file +congress_git_project_group: congress_all + +## Horizon Octavia dashboard plugin +octavia_dashboard_git_repo: https://git.openstack.org/openstack/octavia-dashboard +octavia_dashboard_git_install_branch: 1ba875ac378215c9f0fe8d8bcd1eae42c0d7274d # HEAD of "master" as of 16.02.2018 +octavia_dashboard_git_project_group: horizon_all diff --git a/releasenotes/notes/add-horizon-octavia-dashboard-support-faed0fd8e11e8f50.yaml b/releasenotes/notes/add-horizon-octavia-dashboard-support-faed0fd8e11e8f50.yaml new file mode 100644 index 0000000000..b3bedf40cc --- /dev/null +++ b/releasenotes/notes/add-horizon-octavia-dashboard-support-faed0fd8e11e8f50.yaml @@ -0,0 +1,7 @@ +--- +features: + - Adds support for the horizon octavia-ui dashboard. The + dashboard will be automatically enabled if any octavia + hosts are defined. If both Neutron LBaaSv2 and Octavia + are enabled, two Load Balancer panels will be visible + in Horizon.