From 366250467d5326fd3afa45db8b9f747a4b7b9440 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Mon, 28 Nov 2016 13:01:21 +0800
Subject: Install sahara dashboard into horizon image

Change-Id: I0ee4672252710605970751efa756a2dd405ad8c8
Closes-Bug: #1645195
---
 docker/horizon/Dockerfile.j2   | 6 ++++--
 docker/horizon/extend_start.sh | 9 +++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'docker')

diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index d4a9ab780..ff98dd8fb 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
@@ -13,7 +13,8 @@ MAINTAINER {{ maintainer }}
                 'httpd',
                 'mod_wsgi',
                 'gettext',
-                'openstack-neutron-lbaas-ui'
+                'openstack-neutron-lbaas-ui',
+                'openstack-sahara-ui'
         ] %}
 
 {{ macros.install_packages(horizon_packages | customizable("packages")) }}
@@ -29,7 +30,8 @@ RUN useradd --user-group horizon \
     && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
     && (cd /usr/lib/python2.7/site-packages/horizon && /usr/bin/python /usr/bin/manage.py compilemessages) \
     && (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/_148*_project*loadbalancersv2_panel.py* \
+    && rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_18*_data_processing_*.py*
 {% endblock %}
 
     {% elif base_distro in ['ubuntu'] %}
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index 3c63229b9..720a547be 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -49,6 +49,15 @@ function config_neutron_lbaas {
         "${SITE_PACKAGES}/openstack_dashboard/local/enabled/_1481_project_ng_loadbalancersv2_panel.py"
 }
 
+function config_sahara_dashboard {
+    for file in ${SITE_PACKAGES}/sahara_dashboard/enabled/_*[^__].py; do
+        config_dashboard "${ENABLE_SAHARA}" \
+            "${SITE_PACKAGES}/sahara_dashboard/enabled/${file##*/}" \
+            "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
+    done
+}
+
+config_sahara_dashboard
 config_ironic_dashboard
 config_neutron_lbaas
 
-- 
cgit v1.2.3