openstack
/
kolla
Code Issues Proposed changes

Trivial fix of horizon image 

Fix some incorrect indents
Fix the alphabet order of config functions

Change-Id: Ib11a014141972d4cb06a66ee1289467f344045b9
This commit is contained in:
Chao Guo 2016-12-15 15:03:10 +08:00
parent f665c5e774
commit 96cc4638da
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
docker/horizon/extend_start.sh
View File

@ -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}" \