summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2020-09-04 16:43:47 +0100
committerMark Goddard <mark@stackhpc.com>2020-09-14 10:50:16 +0000
commit08a3d4fd1ac98fb50a59246ce90dea55007fea1b (patch)
treea837f3923e79f6f767e17a6b3ec65b34383fef35 /docker
parent5826e44d7b0f00eeda9dc3ccb68f2558a61a49f6 (diff)
downloadkolla-08a3d4fd1ac98fb50a59246ce90dea55007fea1b.tar.gz
kolla-08a3d4fd1ac98fb50a59246ce90dea55007fea1b.zip
Fix Masakari dashboard policy file location
The horizon image copies the masakari dashboard's policy file to Python site packages, but it should go to /etc/openstack-dashboard. This allows the dashboard to be seen by non-admins, although it fails to load. We get an error like the following in horizon.log: No policy rules for service 'instance-ha' in /etc/openstack-dashboard/masakari_policy.json This change fixes the issue. Change-Id: I8ede183c76a830de06ce6524dc3f6f6944b182c1 Closes-Bug: #1894240 (cherry picked from commit 4f44870376f47c6a65bd02cc83d2ef39fd1f5ae9)
Diffstat (limited to 'docker')
-rw-r--r--docker/horizon/extend_start.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index a03ad5872..d255910ed 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -164,7 +164,7 @@ function config_masakari_dashboard {
done
config_dashboard "${ENABLE_MASAKARI}"\
"${SITE_PACKAGES}/masakaridashboard/conf/masakari_policy.json" \
- "${SITE_PACKAGES}/openstack_dashboard/conf/masakari_policy.json"
+ "/etc/openstack-dashboard/masakari_policy.json"
config_dashboard "${ENABLE_MASAKARI}"\
"${SITE_PACKAGES}/masakaridashboard/local/local_settings.d/_50_masakari.py" \
"${SITE_PACKAGES}/openstack_dashboard/local/local_settings.d/_50_masakari.py"