diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-01 21:41:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-01 21:41:19 +0000 |
| commit | 8b57bb070e03f07c27c8370c70e2a3bb79f76660 (patch) | |
| tree | 4ff3e1745a0862503a1909bdf39cf955358bb61a /docker | |
| parent | c68b233c8016e4bd82cdbcc3282074b43fddc833 (diff) | |
| parent | 51a08690f8719772ab4ecd9714663d0d534c58c0 (diff) | |
| download | kolla-8b57bb070e03f07c27c8370c70e2a3bb79f76660.tar.gz kolla-8b57bb070e03f07c27c8370c70e2a3bb79f76660.zip | |
Merge "Install trove dashboard into horizon image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 66296681f..a480735ce 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -16,7 +16,9 @@ MAINTAINER {{ maintainer }} 'openstack-cloudkitty-ui', 'openstack-manila-ui', 'openstack-neutron-lbaas-ui', - 'openstack-sahara-ui' + 'openstack-sahara-ui', + 'openstack-trove-ui' + ] %} {{ macros.install_packages(horizon_packages | customizable("packages")) }} @@ -33,7 +35,8 @@ RUN useradd --user-group horizon \ && (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/_18*_data_processing_*.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* {% endblock %} {% elif base_distro in ['ubuntu'] %} diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 97c283979..9bebdf94c 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -73,11 +73,20 @@ function config_sahara_dashboard { done } +function config_trove_dashboard { + for file in ${SITE_PACKAGES}/trove_dashboard/enabled/_*[^__].py; do + config_dashboard "${ENABLE_TROVE}" \ + "${SITE_PACKAGES}/trove_dashboard/enabled/${file##*/}" \ + "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" + done +} + config_cloudkitty_dashboard config_ironic_dashboard config_manila_ui config_neutron_lbaas config_sahara_dashboard +config_trove_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) |