From 09aaff41fa3c5b60b456cb9aff9e529f8e4d6bdf Mon Sep 17 00:00:00 2001 From: kaz_shinohara Date: Wed, 6 Dec 2017 17:06:55 +0900 Subject: [PATCH] Update plugin.sh to resolve a couple of issues In devstack, logging handler is not "console", other are taking "test". When we run tox in devstack env along with horizon which don't have heat support, we entercouter an logging handler error. Also current plugin.sh is making not expected directory local_setting.d under openstack_dashboard/local/local_setting.d, looks being duplicated. Change-Id: I8208a7ec64d4814a785b50951693aa3097094a50 --- devstack/plugin.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 6ec786e6..75b70356 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -16,7 +16,8 @@ function install_heat_dashboard { function configure_heat_dashboard { cp -a ${HEAT_DASHBOARD_DIR}/heat_dashboard/enabled/* ${DEST}/horizon/openstack_dashboard/local/enabled/ - cp -a ${HEAT_DASHBOARD_DIR}/heat_dashboard/local_settings.d ${DEST}/horizon/openstack_dashboard/local/local_settings.d/ + sed -i -e "25s/console/test/" ${HEAT_DASHBOARD_DIR}/heat_dashboard/local_settings.d/_1699_orchestration_settings.py + cp -a ${HEAT_DASHBOARD_DIR}/heat_dashboard/local_settings.d/_1699_orchestration_settings.py ${DEST}/horizon/openstack_dashboard/local/local_settings.d/ cp -a ${HEAT_DASHBOARD_DIR}/etc/heat_policy.json ${DEST}/horizon/openstack_dashboard/conf/ # NOTE: If locale directory does not exist, compilemessages will fail, # so check for an existence of locale directory is required.