From 5c96de1dd18b8d800bc86125f9a1b9660f130438 Mon Sep 17 00:00:00 2001
From: zhubingbing <1392607554@qq.com>
Date: Fri, 2 Dec 2016 06:03:41 +0000
Subject: Install designate dashboard into horizon image

Change-Id: Ic28d984dd2ca3db3633ee535d9475907fa4e2d3b
Closes-Bug: #1646688
---
 docker/horizon/Dockerfile.j2   | 3 ++-
 docker/horizon/extend_start.sh | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'docker')

diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index a480735ce..33abde0c7 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
@@ -36,7 +36,8 @@ RUN useradd --user-group horizon \
     && (cd /usr/lib/python2.7/site-packages/openstack_dashboard && /usr/bin/python /usr/bin/manage.py compilemessages) \
     && rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_148*_project*loadbalancersv2_panel.py* \
     && rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_18*_data_processing_*.py* \
-    && rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_17*_database*.py*
+    && rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_17*_database*.py* \
+    && rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_17*_panel*.py*
 {% endblock %}
 
     {% elif base_distro in ['ubuntu'] %}
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index 9bebdf94c..7a770a9ba 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -43,6 +43,14 @@ function config_cloudkitty_dashboard {
     done
 }
 
+function config_designate_dashboard {
+    for file in ${SITE_PACKAGES}/designatedashboard/enabled/_*[^__].py; do
+        config_dashboard "${ENABLE_DESIGNATE}" \
+            "${SITE_PACKAGES}/designatedashboard/enabled/${file##*/}" \
+            "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
+    done
+}
+
 function config_ironic_dashboard {
     for file in ${SITE_PACKAGES}/ironic_ui/enabled/_*[^__].py; do
         config_dashboard "${ENABLE_IRONIC}" \
@@ -82,6 +90,7 @@ function config_trove_dashboard {
 }
 
 config_cloudkitty_dashboard
+config_designate_dashboard
 config_ironic_dashboard
 config_manila_ui
 config_neutron_lbaas
-- 
cgit v1.2.3