diff options
| author | caoyuan <cao.yuan@99cloud.net> | 2016-12-04 22:42:25 +0800 |
|---|---|---|
| committer | caoyuan <cao.yuan@99cloud.net> | 2016-12-05 14:04:24 +0800 |
| commit | 5be2b0ee69e2c1a1a69d1a6ed7fe8f7489f1e953 (patch) | |
| tree | f0268d1fb42c970b5062d70ab0bf088a5d8e481a /docker | |
| parent | 3dfe8ff566c9a5b701be0c70eaddcc6bcc08387a (diff) | |
| download | kolla-5be2b0ee69e2c1a1a69d1a6ed7fe8f7489f1e953.tar.gz kolla-5be2b0ee69e2c1a1a69d1a6ed7fe8f7489f1e953.zip | |
Install zaqar ui into horizon image
Change-Id: I430340b38ff7642f46d76ec621ae65dcae8157c3
Closes-Bug: #1647164
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index a480735ce..e2e0031e5 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -17,8 +17,9 @@ MAINTAINER {{ maintainer }} 'openstack-manila-ui', 'openstack-neutron-lbaas-ui', 'openstack-sahara-ui', - 'openstack-trove-ui' - + 'openstack-trove-ui', + 'openstack-zaqar-ui' + ] %} {{ macros.install_packages(horizon_packages | customizable("packages")) }} diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 6e1f82b1b..76d894372 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -97,6 +97,14 @@ function config_searchlight_ui { "${SITE_PACKAGES}/openstack_dashboard/conf/searchlight_policy.json" } +function config_zaqar_dashboard { + for file in ${SITE_PACKAGES}/zaqar_dashboard/enabled/_*[^__].py; do + config_dashboard "${ENABLE_ZAQAR}" \ + "${SITE_PACKAGES}/zaqar_dashboard/enabled/${file##*/}" \ + "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" + done +} + config_cloudkitty_dashboard config_ironic_dashboard config_manila_ui @@ -104,6 +112,7 @@ config_neutron_lbaas config_sahara_dashboard config_searchlight_ui config_trove_dashboard +config_zaqar_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) |