diff options
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 11 | ||||
| -rw-r--r-- | kolla/common/config.py | 4 |
3 files changed, 17 insertions, 2 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index fce3c5ac2..66296681f 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/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")) }} diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 60a2a5a88..97c283979 100644 --- a/docker/horizon/extend_start.sh +++ b/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) diff --git a/kolla/common/config.py b/kolla/common/config.py index 932f9fa1a..ce69a82c7 100644 --- a/kolla/common/config.py +++ b/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/' |