summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaz_shinohara <ksnhr.tech@gmail.com>2017-12-06 17:06:55 +0900
committerkaz_shinohara <ksnhr.tech@gmail.com>2017-12-06 17:12:13 +0900
commit09aaff41fa3c5b60b456cb9aff9e529f8e4d6bdf (patch)
tree8523bb4da826a733b671f54fee774316026b2a0d
parentde02f3b331af08f59b99e51a38525424ba52edb5 (diff)
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
Notes
Notes (review): Code-Review+2: Keiichi Hikita <keiichi.hikita@gmail.com> Workflow+1: Keiichi Hikita <keiichi.hikita@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 06 Dec 2017 09:30:56 +0000 Reviewed-on: https://review.openstack.org/525935 Project: openstack/heat-dashboard Branch: refs/heads/master
-rw-r--r--devstack/plugin.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 6ec786e..75b7035 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -16,7 +16,8 @@ function install_heat_dashboard {
16 16
17function configure_heat_dashboard { 17function configure_heat_dashboard {
18 cp -a ${HEAT_DASHBOARD_DIR}/heat_dashboard/enabled/* ${DEST}/horizon/openstack_dashboard/local/enabled/ 18 cp -a ${HEAT_DASHBOARD_DIR}/heat_dashboard/enabled/* ${DEST}/horizon/openstack_dashboard/local/enabled/
19 cp -a ${HEAT_DASHBOARD_DIR}/heat_dashboard/local_settings.d ${DEST}/horizon/openstack_dashboard/local/local_settings.d/ 19 sed -i -e "25s/console/test/" ${HEAT_DASHBOARD_DIR}/heat_dashboard/local_settings.d/_1699_orchestration_settings.py
20 cp -a ${HEAT_DASHBOARD_DIR}/heat_dashboard/local_settings.d/_1699_orchestration_settings.py ${DEST}/horizon/openstack_dashboard/local/local_settings.d/
20 cp -a ${HEAT_DASHBOARD_DIR}/etc/heat_policy.json ${DEST}/horizon/openstack_dashboard/conf/ 21 cp -a ${HEAT_DASHBOARD_DIR}/etc/heat_policy.json ${DEST}/horizon/openstack_dashboard/conf/
21 # NOTE: If locale directory does not exist, compilemessages will fail, 22 # NOTE: If locale directory does not exist, compilemessages will fail,
22 # so check for an existence of locale directory is required. 23 # so check for an existence of locale directory is required.