Merge "Add heat dashboard to horizon image"

docker/horizon/Dockerfile.j2

@@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
-
+        # TODO(jeffrey4l): openstack-heat-dashboard is missing
         {% set horizon_packages = [
                 'gettext',
                 'httpd',
@@ -47,7 +47,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
 {% endblock %}
 
     {% elif base_distro in ['debian', 'ubuntu'] %}
-
+        # TODO(jeffrey4l): heat dashboard is missing
         {% set horizon_packages = [
                 'apache2',
                 'gettext',

docker/horizon/extend_start.sh

@@ -72,6 +72,14 @@ function config_freezer_ui {
     done
 }
 
+function config_heat_dashboard {
+    for file in ${SITE_PACKAGES}/heat_dashboard/enabled/_*[^__].py; do
+        config_dashboard "${ENABLE_HEAT}" \
+            "${SITE_PACKAGES}/heat_dashboard/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}" \
@@ -223,6 +231,7 @@ config_cloudkitty_dashboard
 config_designate_dashboard
 config_fwaas_dashboard
 config_freezer_ui
+config_heat_dashboard
 config_ironic_dashboard
 config_karbor_dashboard
 config_magnum_dashboard

kolla/common/config.py

@@ -371,6 +371,10 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/freezer-web-ui/'
                      'freezer-web-ui-master.tar.gz')},
+    'horizon-plugin-heat-dashboard': {
+        'type': 'url',
+        'location': ('$tarballs_base/heat-dashboard/'
+                     'heat-dashboard-master.tar.gz')},
     'horizon-plugin-ironic-ui': {
         'type': 'url',
         'location': ('$tarballs_base/ironic-ui/'