From 0d487152af77e648c4e74ef029e52a199a02446b Mon Sep 17 00:00:00 2001 From: caoyuan Date: Sun, 4 Dec 2016 22:58:18 +0800 Subject: Install watcher dashboard into horizon image Change-Id: Ief5898f6bf1caa3a7fe6b2a96be2bdb79e402f28 Closes-Bug: #1647162 --- docker/horizon/Dockerfile.j2 | 1 - docker/horizon/extend_start.sh | 13 +++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 8baf048d1..b92bbab2f 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -19,7 +19,6 @@ MAINTAINER {{ maintainer }} 'openstack-sahara-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 050eb289a..3e3ea898e 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -125,6 +125,18 @@ function config_searchlight_ui { "${SITE_PACKAGES}/openstack_dashboard/conf/searchlight_policy.json" } +function config_watcher_dashboard { + for file in ${SITE_PACKAGES}/watcher_dashboard/enabled/_*[^__].py; do + config_dashboard "${ENABLE_WATCHER}" \ + "${SITE_PACKAGES}/watcher_dashboard/enabled/${file##*/}" \ + "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" + done + + config_dashboard "${ENABLE_WATCHER}" \ + "${SITE_PACKAGES}/watcher_dashboard/conf/watcher_policy.json" \ + "${SITE_PACKAGES}/openstack_dashboard/conf/watcher_policy.json" +} + function config_zaqar_dashboard { for file in ${SITE_PACKAGES}/zaqar_dashboard/enabled/_*[^__].py; do config_dashboard "${ENABLE_ZAQAR}" \ @@ -143,6 +155,7 @@ config_sahara_dashboard config_searchlight_ui config_senlin_dashboard config_trove_dashboard +config_watcher_dashboard config_zaqar_dashboard # NOTE(pbourke): httpd will not clean up after itself in some cases which -- cgit v1.2.3