diff options
| author | Zuul <zuul@review.openstack.org> | 2017-12-12 23:22:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-12-12 23:22:11 +0000 |
| commit | 2dc637deb1936dde4bc76afcd2d7a8d2a836b18b (patch) | |
| tree | 3cd0395215abc6a7656cfea6fbd378557d40e647 /docker | |
| parent | d353da209717a99ebb57720c07819abf41119d0b (diff) | |
| parent | 2ece1a513ae36dc4284e7d82f4e81f2137dde236 (diff) | |
| download | kolla-2dc637deb1936dde4bc76afcd2d7a8d2a836b18b.tar.gz kolla-2dc637deb1936dde4bc76afcd2d7a8d2a836b18b.zip | |
Merge "Add heat dashboard to horizon image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 |
2 files changed, 11 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 |