Merge "Add support for Horizon Octavia Dashboard" into stable/queens

This commit is contained in:
Zuul 2018-04-05 13:36:11 +00:00 committed by Gerrit Code Review
commit 7f06340231
3 changed files with 13 additions and 0 deletions

View File

@ -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 }}"

View File

@ -227,6 +227,11 @@ octavia_git_repo: https://git.openstack.org/openstack/octavia
octavia_git_install_branch: 4b5654cac30ecb5f631f9adbb14333488a5b77d6 # HEAD of "stable/queens" as of 03.04.2018
octavia_git_project_group: octavia_all
## Horizon Octavia dashboard plugin
octavia_dashboard_git_repo: https://git.openstack.org/openstack/octavia-dashboard
octavia_dashboard_git_install_branch: 668a88aa6767cbd9c5b62b7a39108ed43b652b23 # HEAD of "stable/queens" as of 01.03.2018
octavia_dashboard_git_project_group: horizon_all
## Molteniron service
molteniron_git_repo: https://git.openstack.org/openstack/molteniron

View File

@ -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.