diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-28 16:23:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-28 16:23:20 +0000 |
| commit | 1cffe8a8dc4dfac8be5bc5a6a97373552827ddc9 (patch) | |
| tree | 41976103092e90978dc72e07720e2c00e179d207 /docker | |
| parent | c57cdb6edffb3b05598631e6ae428d3462650b9b (diff) | |
| parent | 366250467d5326fd3afa45db8b9f747a4b7b9440 (diff) | |
| download | kolla-1cffe8a8dc4dfac8be5bc5a6a97373552827ddc9.tar.gz kolla-1cffe8a8dc4dfac8be5bc5a6a97373552827ddc9.zip | |
Merge "Install sahara dashboard into horizon image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 |
2 files changed, 13 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 |