diff options
| author | jianyi <jianyi@sgitg.sgcc.com.cn> | 2016-12-05 17:46:57 +0800 |
|---|---|---|
| committer | jianyi <jianyi@sgitg.sgcc.com.cn> | 2016-12-05 17:53:17 +0800 |
| commit | 05ba070f86686f2f21e23c37c4bfe6dc702ad68c (patch) | |
| tree | dad3d2aca5f5de854eadeb94b8a089f3a33287c6 | |
| parent | 3dfe8ff566c9a5b701be0c70eaddcc6bcc08387a (diff) | |
| download | kolla-05ba070f86686f2f21e23c37c4bfe6dc702ad68c.tar.gz kolla-05ba070f86686f2f21e23c37c4bfe6dc702ad68c.zip | |
Install senlin dashboard into horizon image
Change-Id: I27ac67f42ad04ac5cf6d18b6f56506949aa4887c
Closes-Bug: #1646023
| -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 6e1f82b1b..8b6f94c08 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -73,6 +73,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}" \ @@ -103,6 +115,7 @@ config_manila_ui config_neutron_lbaas config_sahara_dashboard config_searchlight_ui +config_senlin_dashboard config_trove_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 65b300562..77cc30055 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -226,6 +226,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/' |