diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-05 15:18:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-05 15:18:45 +0000 |
| commit | 8e8dacd62ae2f32e4a1d6016dc2d7fcc3665761c (patch) | |
| tree | c5f545bc87fec43e48c50ad9b0e8b1335c8a8dc5 /docker | |
| parent | e7c7d52e54b86c4395644ecdaf627e342b3f45c8 (diff) | |
| parent | 5be2b0ee69e2c1a1a69d1a6ed7fe8f7489f1e953 (diff) | |
| download | kolla-8e8dacd62ae2f32e4a1d6016dc2d7fcc3665761c.tar.gz kolla-8e8dacd62ae2f32e4a1d6016dc2d7fcc3665761c.zip | |
Merge "Install zaqar ui into horizon image"
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 32ce3a409..3ca8363aa 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -105,6 +105,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_magnum_dashboard @@ -113,6 +121,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) |