aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-06-17 07:51:19 +0000
committerGerrit Code Review <review@openstack.org>2021-06-17 07:51:19 +0000
commitfa0bb0bcdb8ae007ab92e98bb705f1fbbe68b5b8 (patch)
tree3ea0bc0a36f225261011ba531d33e03e035df74a
parentebb871338a7c3315677e510f5a3b1ad4c7040c52 (diff)
parentf68dfb88fdbad51322727575457b3d78a70466b1 (diff)
downloadkolla-fa0bb0bcdb8ae007ab92e98bb705f1fbbe68b5b8.tar.gz
kolla-fa0bb0bcdb8ae007ab92e98bb705f1fbbe68b5b8.zip
Merge "horizon: Correct location of monitoring_policy file"
-rw-r--r--docker/horizon/extend_start.sh2
-rw-r--r--releasenotes/notes/bug-1928408-4a22a85570eee8d6.yaml7
2 files changed, 8 insertions, 1 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index 123e389f7..bc0ea19e4 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -152,7 +152,7 @@ function config_monasca_ui {
"${SITE_PACKAGES}/openstack_dashboard/local/enabled/_50_admin_add_monitoring_panel.py"
config_dashboard "${ENABLE_MONASCA:-no}" \
"${SITE_PACKAGES}/monitoring/conf/monitoring_policy.json" \
- "${SITE_PACKAGES}/openstack_dashboard/conf/monitoring_policy.json"
+ "/etc/openstack-dashboard/monitoring_policy.json"
}
function config_murano_dashboard {
diff --git a/releasenotes/notes/bug-1928408-4a22a85570eee8d6.yaml b/releasenotes/notes/bug-1928408-4a22a85570eee8d6.yaml
new file mode 100644
index 000000000..4b24aa668
--- /dev/null
+++ b/releasenotes/notes/bug-1928408-4a22a85570eee8d6.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+ - |
+ Fixes location of monitoring_policy in Horizon, so access
+ policy is correctly enforced. Note that by current default,
+ admin doesn't not have Monitoring access.
+ `LP#1928408 <https://launchpad.net/bugs/1928408>`__