diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-11-28 13:01:21 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-11-28 13:01:21 +0800 |
| commit | 366250467d5326fd3afa45db8b9f747a4b7b9440 (patch) | |
| tree | c6ef8382520292f4f1ba9bba76cd0bbdfd8dd7b1 | |
| parent | 91d120cbf0951bda5bd7d96fbaef9b8e099f0bdb (diff) | |
| download | kolla-366250467d5326fd3afa45db8b9f747a4b7b9440.tar.gz kolla-366250467d5326fd3afa45db8b9f747a4b7b9440.zip | |
Install sahara dashboard into horizon image
Change-Id: I0ee4672252710605970751efa756a2dd405ad8c8
Closes-Bug: #1645195
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 | ||||
| -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 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 diff --git a/kolla/common/config.py b/kolla/common/config.py index 174e4d7af..d6ce6bbbb 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -222,6 +222,10 @@ SOURCES = { 'type': 'url', 'location': ('http://tarballs.openstack.org/neutron-lbaas-dashboard/' 'neutron-lbaas-dashboard-master.tar.gz')}, + 'horizon-plugin-sahara-dashboard': { + 'type': 'url', + 'location': ('http://tarballs.openstack.org/sahara-dashboard/' + 'sahara-dashboard-master.tar.gz')}, 'ironic-base': { 'type': 'url', 'location': ('http://tarballs.openstack.org/ironic/' |