diff options
| author | liyingjun <yingjun.li@kylin-cloud.com> | 2016-12-02 14:56:47 +0800 |
|---|---|---|
| committer | liyingjun <yingjun.li@kylin-cloud.com> | 2016-12-02 22:45:43 +0800 |
| commit | 2614dd697c16497cc3aa04e8052fd06b618c40a6 (patch) | |
| tree | 40fd97f16742ece392d969c5b04cd3b0379fadea | |
| parent | 8b57bb070e03f07c27c8370c70e2a3bb79f76660 (diff) | |
| download | kolla-2614dd697c16497cc3aa04e8052fd06b618c40a6.tar.gz kolla-2614dd697c16497cc3aa04e8052fd06b618c40a6.zip | |
Install searchlight-ui to horizon
Change-Id: Ie65c374dd319e38fe50fc3dca15c64d07edc8e1a
Closes-bug: #1646690
| -rw-r--r-- | docker/horizon/extend_start.sh | 17 | ||||
| -rw-r--r-- | kolla/common/config.py | 4 |
2 files changed, 21 insertions, 0 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 9bebdf94c..6e1f82b1b 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -81,11 +81,28 @@ function config_trove_dashboard { done } +function config_searchlight_ui { + for file in ${SITE_PACKAGES}/searchlight_ui/enabled/_*[^__].py; do + config_dashboard "${ENABLE_SEARCHLIGHT}" \ + "${SITE_PACKAGES}/searchlight_ui/enabled/${file##*/}" \ + "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" + done + + config_dashboard "${ENABLE_SEARCHLIGHT}" \ + "${SITE_PACKAGES}searchlight_ui/local_settings.d/_1001_search_settings.py" \ + "${SITE_PACKAGES}/openstack_dashboard/local/local_settings.d/_1001_search_settings.py" + + config_dashboard "${ENABLE_SEARCHLIGHT}" \ + "${SITE_PACKAGES}searchlight_ui/conf/searchlight_policy.json" \ + "${SITE_PACKAGES}/openstack_dashboard/conf/searchlight_policy.json" +} + config_cloudkitty_dashboard config_ironic_dashboard config_manila_ui config_neutron_lbaas config_sahara_dashboard +config_searchlight_ui 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 487e24a17..aa663c48b 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -222,6 +222,10 @@ SOURCES = { 'type': 'url', 'location': ('http://tarballs.openstack.org/sahara-dashboard/' 'sahara-dashboard-master.tar.gz')}, + 'horizon-plugin-searchlight-ui': { + 'type': 'url', + 'location': ('http://tarballs.openstack.org/searchlight-ui/' + 'searchlight-ui-master.tar.gz')}, 'horizon-plugin-trove-dashboard': { 'type': 'url', 'location': ('http://tarballs.openstack.org/trove-dashboard/' |