aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-09-09 10:41:29 +0000
committerGerrit Code Review <review@openstack.org>2020-09-09 10:41:29 +0000
commitaa5d5b294125ed2c9b807b01d660ed6977bb084f (patch)
treec6b1ac77c5175221038e3e8847b990ecf6ec2d5c
parent213e86e4c79dc4018d898717fbcffbb552beb3ea (diff)
parent4f44870376f47c6a65bd02cc83d2ef39fd1f5ae9 (diff)
downloadkolla-aa5d5b294125ed2c9b807b01d660ed6977bb084f.tar.gz
kolla-aa5d5b294125ed2c9b807b01d660ed6977bb084f.zip
Merge "Fix Masakari dashboard policy file location"
-rw-r--r--docker/horizon/extend_start.sh2
-rw-r--r--releasenotes/notes/fix-masakari-dashboard-policy-bb8c6c2364666401.yaml5
2 files changed, 6 insertions, 1 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index e1f607ac6..01549598e 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -148,7 +148,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"
diff --git a/releasenotes/notes/fix-masakari-dashboard-policy-bb8c6c2364666401.yaml b/releasenotes/notes/fix-masakari-dashboard-policy-bb8c6c2364666401.yaml
new file mode 100644
index 000000000..f3a1bcab0
--- /dev/null
+++ b/releasenotes/notes/fix-masakari-dashboard-policy-bb8c6c2364666401.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ Fixes an issue with the Masakari dashboard where policies were not loaded
+ correctly.