Merge "Install designate dashboard into horizon image"

docker/horizon/Dockerfile.j2

@@ -37,7 +37,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'] %}

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}" \
@@ -114,6 +122,7 @@ function config_zaqar_dashboard {
 }
 
 config_cloudkitty_dashboard
+config_designate_dashboard
 config_ironic_dashboard
 config_magnum_dashboard
 config_manila_ui

kolla/common/config.py

@@ -206,6 +206,10 @@ SOURCES = {
         'type': 'url',
         'location': ('http://tarballs.openstack.org/cloudkitty-dashboard/'
                      'cloudkitty-dashboard-master.tar.gz')},
+    'horizon-plugin-designate-dashboard': {
+        'type': 'url',
+        'location': ('http://tarballs.openstack.org/designate-dashboard/'
+                     'designate-dashboard-master.tar.gz')},
     'horizon-plugin-ironic-ui': {
         'type': 'url',
         'location': ('http://tarballs.openstack.org/ironic-ui/'