diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-05 15:18:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-05 15:18:52 +0000 |
| commit | e182bca6a337bcb96dd1730ff466348882f518b9 (patch) | |
| tree | 60bace9c19f68cefb50751dd163c87235fe86ad2 /docker | |
| parent | 8e8dacd62ae2f32e4a1d6016dc2d7fcc3665761c (diff) | |
| parent | 5c96de1dd18b8d800bc86125f9a1b9660f130438 (diff) | |
| download | kolla-e182bca6a337bcb96dd1730ff466348882f518b9.tar.gz kolla-e182bca6a337bcb96dd1730ff466348882f518b9.zip | |
Merge "Install designate dashboard into horizon image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index e2e0031e5..8baf048d1 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -37,7 +37,8 @@ RUN useradd --user-group horizon \ && (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/_17*_database*.py* + && rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_17*_database*.py* \ + && rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_17*_panel*.py* {% endblock %} {% elif base_distro in ['ubuntu'] %} diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 3ca8363aa..233190e17 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -43,6 +43,14 @@ function config_cloudkitty_dashboard { done } +function config_designate_dashboard { + for file in ${SITE_PACKAGES}/designatedashboard/enabled/_*[^__].py; do + config_dashboard "${ENABLE_DESIGNATE}" \ + "${SITE_PACKAGES}/designatedashboard/enabled/${file##*/}" \ + "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" + done +} + function config_ironic_dashboard { for file in ${SITE_PACKAGES}/ironic_ui/enabled/_*[^__].py; do config_dashboard "${ENABLE_IRONIC}" \ @@ -114,6 +122,7 @@ function config_zaqar_dashboard { } config_cloudkitty_dashboard +config_designate_dashboard config_ironic_dashboard config_magnum_dashboard config_manila_ui |