diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2017-12-11 13:57:38 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2017-12-11 13:57:40 +0800 |
| commit | 2ece1a513ae36dc4284e7d82f4e81f2137dde236 (patch) | |
| tree | 32e70f0eaa12611471069f01250a6fd3b5cee754 | |
| parent | 2a150c8908228e962bad8445cc47f53516806dce (diff) | |
| download | kolla-2ece1a513ae36dc4284e7d82f4e81f2137dde236.tar.gz kolla-2ece1a513ae36dc4284e7d82f4e81f2137dde236.zip | |
Add heat dashboard to horizon image
heat dashboard is split from horizon code base in Queens cycle.[0][1]
[0] https://review.openstack.org/#/c/523402/
[1] https://github.com/openstack/heat-dashboard
Closes-Bug: #1737475
Change-Id: I920394b8cb6eb7027df9110fe88de6842d2bd8b3
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 54d6bcce0..0e863b9ee 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - + # TODO(jeffrey4l): openstack-heat-dashboard is missing {% set horizon_packages = [ 'gettext', 'httpd', @@ -47,7 +47,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% endblock %} {% elif base_distro in ['debian', 'ubuntu'] %} - + # TODO(jeffrey4l): heat dashboard is missing {% set horizon_packages = [ 'apache2', 'gettext', diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index ddde030a9..454e1fa49 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -72,6 +72,14 @@ function config_freezer_ui { done } +function config_heat_dashboard { + for file in ${SITE_PACKAGES}/heat_dashboard/enabled/_*[^__].py; do + config_dashboard "${ENABLE_HEAT}" \ + "${SITE_PACKAGES}/heat_dashboard/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}" \ @@ -223,6 +231,7 @@ config_cloudkitty_dashboard config_designate_dashboard config_fwaas_dashboard config_freezer_ui +config_heat_dashboard config_ironic_dashboard config_karbor_dashboard config_magnum_dashboard diff --git a/kolla/common/config.py b/kolla/common/config.py index f7e3d1be3..31fe2b9e9 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -371,6 +371,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/freezer-web-ui/' 'freezer-web-ui-master.tar.gz')}, + 'horizon-plugin-heat-dashboard': { + 'type': 'url', + 'location': ('$tarballs_base/heat-dashboard/' + 'heat-dashboard-master.tar.gz')}, 'horizon-plugin-ironic-ui': { 'type': 'url', 'location': ('$tarballs_base/ironic-ui/' |