From abdea2ac799e97a11f5054e35d2f88130df5fcb0 Mon Sep 17 00:00:00 2001
From: Carlos Goncalves <cgoncalves@redhat.com>
Date: Tue, 27 Mar 2018 18:18:35 +0300
Subject: [PATCH] Add octavia-dashboard to horizon image

Change-Id: Ic99e9e7b499e82a998386e13dceab4e67f23e989
(cherry picked from commit c2960f73d2002264f627b79a1c052efdd29be852)
---
 docker/horizon/Dockerfile.j2                               | 1 +
 docker/horizon/extend_start.sh                             | 7 +++++++
 kolla/common/config.py                                     | 4 ++++
 .../notes/add-octavia-dashboard-e2b1d1aeebcc0eba.yaml      | 3 +++
 4 files changed, 15 insertions(+)
 create mode 100644 releasenotes/notes/add-octavia-dashboard-e2b1d1aeebcc0eba.yaml

diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index 19c98ea0da..07038a08e3 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
@@ -23,6 +23,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
                 'openstack-mistral-ui',
                 'openstack-murano-ui',
                 'openstack-neutron-lbaas-ui',
+                'openstack-octavia-ui',
                 'openstack-sahara-ui',
                 'openstack-trove-ui',
                 'openstack-vitrage-ui'
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index a0e57e15d7..ac660140c8 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -141,6 +141,12 @@ function config_neutron_lbaas {
         "${SITE_PACKAGES}/openstack_dashboard/local/enabled/_1481_project_ng_loadbalancersv2_panel.py"
 }
 
+function config_octavia_dashboard {
+    config_dashboard "${ENABLE_OCTAVIA}" \
+        "${SITE_PACKAGES}/octavia_dashboard/enabled/_1482_project_load_balancer_panel.py" \
+        "${SITE_PACKAGES}/openstack_dashboard/local/enabled/_1482_project_load_balancer_panel.py"
+}
+
 function config_sahara_dashboard {
     for file in ${SITE_PACKAGES}/sahara_dashboard/enabled/_*[^__].py; do
         config_dashboard "${ENABLE_SAHARA}" \
@@ -249,6 +255,7 @@ config_manila_ui
 config_mistral_dashboard
 config_murano_dashboard
 config_neutron_lbaas
+config_octavia_dashboard
 config_sahara_dashboard
 config_searchlight_ui
 config_senlin_dashboard
diff --git a/kolla/common/config.py b/kolla/common/config.py
index c3cb2f4565..6ef2f37413 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -414,6 +414,10 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/neutron-lbaas-dashboard/'
                      'neutron-lbaas-dashboard-4.0.0.tar.gz')},
+    'horizon-plugin-octavia-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/octavia-dashboard/'
+                     'octavia-dashboard-1.0.0.tar.gz')},
     'horizon-plugin-sahara-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/sahara-dashboard/'
diff --git a/releasenotes/notes/add-octavia-dashboard-e2b1d1aeebcc0eba.yaml b/releasenotes/notes/add-octavia-dashboard-e2b1d1aeebcc0eba.yaml
new file mode 100644
index 0000000000..be46066124
--- /dev/null
+++ b/releasenotes/notes/add-octavia-dashboard-e2b1d1aeebcc0eba.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Add octavia-dashboard to horizon image.