From 5be2b0ee69e2c1a1a69d1a6ed7fe8f7489f1e953 Mon Sep 17 00:00:00 2001 From: caoyuan Date: Sun, 4 Dec 2016 22:42:25 +0800 Subject: Install zaqar ui into horizon image Change-Id: I430340b38ff7642f46d76ec621ae65dcae8157c3 Closes-Bug: #1647164 --- docker/horizon/Dockerfile.j2 | 5 +++-- docker/horizon/extend_start.sh | 9 +++++++++ kolla/common/config.py | 4 ++++ 3 files changed, 16 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) diff --git a/kolla/common/config.py b/kolla/common/config.py index 65b300562..29ffd328e 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -230,6 +230,10 @@ SOURCES = { 'type': 'url', 'location': ('http://tarballs.openstack.org/trove-dashboard/' 'trove-dashboard-master.tar.gz')}, + 'horizon-plugin-zaqar-ui': { + 'type': 'url', + 'location': ('http://tarballs.openstack.org/zaqar-ui/' + 'zaqar-ui-master.tar.gz')}, 'ironic-base': { 'type': 'url', 'location': ('http://tarballs.openstack.org/ironic/' -- cgit v1.2.3