diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-05 15:18:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-05 15:18:59 +0000 |
| commit | 68d8866f049662a23bb1d8844e24e22847854fb4 (patch) | |
| tree | b7f7ff88887b8784e596eeb797d31b89c12c75a1 | |
| parent | e182bca6a337bcb96dd1730ff466348882f518b9 (diff) | |
| parent | 05ba070f86686f2f21e23c37c4bfe6dc702ad68c (diff) | |
| download | kolla-68d8866f049662a23bb1d8844e24e22847854fb4.tar.gz kolla-68d8866f049662a23bb1d8844e24e22847854fb4.zip | |
Merge "Install senlin dashboard into horizon image"
| -rw-r--r-- | docker/horizon/extend_start.sh | 13 | ||||
| -rw-r--r-- | kolla/common/config.py | 4 |
2 files changed, 17 insertions, 0 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 233190e17..050eb289a 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -89,6 +89,18 @@ function config_sahara_dashboard { done } +function config_senlin_dashboard { + for file in ${SITE_PACKAGES}/senlin_dashboard/enabled/_*[^__].py; do + config_dashboard "${ENABLE_SENLIN}" \ + "${SITE_PACKAGES}/senlin_dashboard/enabled/${file##*/}" \ + "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" + done + + config_dashboard "${ENABLE_SENLIN}" \ + "${SITE_PACKAGES}/senlin_dashboard/conf/senlin_policy.json" \ + "${SITE_PACKAGES}/openstack_dashboard/conf/senlin_policy.json" +} + function config_trove_dashboard { for file in ${SITE_PACKAGES}/trove_dashboard/enabled/_*[^__].py; do config_dashboard "${ENABLE_TROVE}" \ @@ -129,6 +141,7 @@ config_manila_ui config_neutron_lbaas config_sahara_dashboard config_searchlight_ui +config_senlin_dashboard config_trove_dashboard config_zaqar_dashboard diff --git a/kolla/common/config.py b/kolla/common/config.py index 9589d60be..934cf1b4e 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -234,6 +234,10 @@ SOURCES = { 'type': 'url', 'location': ('http://tarballs.openstack.org/searchlight-ui/' 'searchlight-ui-master.tar.gz')}, + 'horizon-plugin-senlin-dashboard': { + 'type': 'url', + 'location': ('http://tarballs.openstack.org/senlin-dashboard/' + 'senlin-dashboard-master.tar.gz')}, 'horizon-plugin-trove-dashboard': { 'type': 'url', 'location': ('http://tarballs.openstack.org/trove-dashboard/' |