Merge "Add manila-ui in horizon image"

docker/horizon/Dockerfile.j2

@@ -14,6 +14,7 @@ MAINTAINER {{ maintainer }}
                 'mod_wsgi',
                 'gettext',
                 'openstack-cloudkitty-ui',
+                'openstack-manila-ui',
                 'openstack-neutron-lbaas-ui',
                 'openstack-sahara-ui'
         ] %}
@@ -41,7 +42,8 @@ RUN useradd --user-group horizon \
                 'openstack-dashboard',
                 'apache2',
                 'libapache2-mod-wsgi',
-                'gettext'
+                'gettext',
+                'python-manila-ui'
         ] %}
 
 {{ macros.install_packages(horizon_packages | customizable("packages")) }}

docker/horizon/extend_start.sh

@@ -51,6 +51,14 @@ function config_ironic_dashboard {
     done
 }
 
+function config_manila_ui {
+    for file in ${SITE_PACKAGES}/manila_ui/enabled/_*[^__].py; do
+        config_dashboard "${ENABLE_MANILA}" \
+            "${SITE_PACKAGES}/manila_ui/enabled/${file##*/}" \
+            "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
+    done
+}
+
 function config_neutron_lbaas {
     config_dashboard "${ENABLE_NEUTRON_LBAAS}" \
         "${SITE_PACKAGES}/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py" \
@@ -66,9 +74,10 @@ function config_sahara_dashboard {
 }
 
 config_cloudkitty_dashboard
-config_sahara_dashboard
 config_ironic_dashboard
+config_manila_ui
 config_neutron_lbaas
+config_sahara_dashboard
 
 # NOTE(pbourke): httpd will not clean up after itself in some cases which
 # results in the container not being able to restart. (bug #1489676, 1557036)

kolla/common/config.py

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