From 5a31aa02bf428d6ef006e26dc834ebf27c276eda Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Fri, 4 Sep 2020 16:43:47 +0100 Subject: [PATCH] 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) --- docker/horizon/extend_start.sh | 2 +- .../fix-masakari-dashboard-policy-bb8c6c2364666401.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix-masakari-dashboard-policy-bb8c6c2364666401.yaml diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 3033fcd4f0..0dadfca015 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" 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 0000000000..f3a1bcab0e --- /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.