diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-10 07:42:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-10 07:42:14 +0000 |
| commit | 9f9021ce59203bced2055d7ca66d828a4138e704 (patch) | |
| tree | b533294098b7ed1b800001a072c512dc468e4f8d | |
| parent | 399d5b1cf4e61434842cc33eb5801603fbf8b4b9 (diff) | |
| parent | 0d487152af77e648c4e74ef029e52a199a02446b (diff) | |
| download | kolla-9f9021ce59203bced2055d7ca66d828a4138e704.tar.gz kolla-9f9021ce59203bced2055d7ca66d828a4138e704.zip | |
Merge "Install watcher dashboard into horizon image"
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 13 | ||||
| -rw-r--r-- | kolla/common/config.py | 4 |
3 files changed, 17 insertions, 1 deletions
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 de5e1dcbf..fc3181791 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_ui/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 diff --git a/kolla/common/config.py b/kolla/common/config.py index 89efa7eaa..1bf9e4dfe 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -246,6 +246,10 @@ SOURCES = { 'type': 'url', 'location': ('http://tarballs.openstack.org/trove-dashboard/' 'trove-dashboard-master.tar.gz')}, + 'horizon-plugin-watcher-dashboard': { + 'type': 'url', + 'location': ('http://tarballs.openstack.org/watcher-dashboard/' + 'watcher-dashboard-master.tar.gz')}, 'horizon-plugin-zaqar-ui': { 'type': 'url', 'location': ('http://tarballs.openstack.org/zaqar-ui/' |