diff options
| author | zhubingbing <1392607554@qq.com> | 2016-12-02 06:03:41 +0000 |
|---|---|---|
| committer | zhubingbing <1392607554@qq.com> | 2016-12-02 06:03:41 +0000 |
| commit | 5c96de1dd18b8d800bc86125f9a1b9660f130438 (patch) | |
| tree | c472c4a5ad7cafe5aea67aa9b7c6776322e51390 | |
| parent | 8b57bb070e03f07c27c8370c70e2a3bb79f76660 (diff) | |
| download | kolla-5c96de1dd18b8d800bc86125f9a1b9660f130438.tar.gz kolla-5c96de1dd18b8d800bc86125f9a1b9660f130438.zip | |
Install designate dashboard into horizon image
Change-Id: Ic28d984dd2ca3db3633ee535d9475907fa4e2d3b
Closes-Bug: #1646688
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 | ||||
| -rw-r--r-- | kolla/common/config.py | 4 |
3 files changed, 15 insertions, 1 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index a480735ce..33abde0c7 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -36,7 +36,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 9bebdf94c..7a770a9ba 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}" \ @@ -82,6 +90,7 @@ function config_trove_dashboard { } config_cloudkitty_dashboard +config_designate_dashboard config_ironic_dashboard config_manila_ui config_neutron_lbaas diff --git a/kolla/common/config.py b/kolla/common/config.py index 487e24a17..35bd3d746 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -206,6 +206,10 @@ SOURCES = { 'type': 'url', 'location': ('http://tarballs.openstack.org/cloudkitty-dashboard/' 'cloudkitty-dashboard-master.tar.gz')}, + 'horizon-plugin-designate-dashboard': { + 'type': 'url', + 'location': ('http://tarballs.openstack.org/designate-dashboard/' + 'designate-dashboard-master.tar.gz')}, 'horizon-plugin-ironic-ui': { 'type': 'url', 'location': ('http://tarballs.openstack.org/ironic-ui/' |