From 96cc4638da4b738767177483a4f2a36106b8e4b5 Mon Sep 17 00:00:00 2001 From: Chao Guo Date: Thu, 15 Dec 2016 15:03:10 +0800 Subject: [PATCH] Trivial fix of horizon image Fix some incorrect indents Fix the alphabet order of config functions Change-Id: Ib11a014141972d4cb06a66ee1289467f344045b9 --- docker/horizon/extend_start.sh | 38 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index a100a2c944..6c0c037a98 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -76,9 +76,9 @@ function config_manila_ui { } function config_mistral_dashboard { - config_dashboard "${ENABLE_MISTRAL}" \ - "${SITE_PACKAGES}/mistral_dashboard/_50_mistral.py.example" \ - "${SITE_PACKAGES}/openstack_dashboard/local/enabled/_50_mistral.py" + config_dashboard "${ENABLE_MISTRAL}" \ + "${SITE_PACKAGES}/mistral_dashboard/_50_mistral.py.example" \ + "${SITE_PACKAGES}/openstack_dashboard/local/enabled/_50_mistral.py" } function config_neutron_lbaas { @@ -95,6 +95,22 @@ function config_sahara_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" +} + function config_senlin_dashboard { for file in ${SITE_PACKAGES}/senlin_dashboard/enabled/_*[^__].py; do config_dashboard "${ENABLE_SENLIN}" \ @@ -115,22 +131,6 @@ 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" -} - function config_watcher_dashboard { for file in ${SITE_PACKAGES}/watcher_dashboard/enabled/_*[^__].py; do config_dashboard "${ENABLE_WATCHER}" \