From bf9c153d08842719e10730c8ef612e37984f5b26 Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Thu, 19 Mar 2020 19:56:39 +0100 Subject: [PATCH] Fix dashboard_frontend_vip parameter This patch fixes the dashboard_frontend_vip network used to properly configure grafana in HA, reflecting the change we have in haproxy.pp This change also exposes a new variable to give the operators the chance to configure a read-only admin user (e.g., no pools can be created through the dashboard). Depends-On: https://review.opendev.org/#/c/714141 Change-Id: I263133c046c8c48f838da6d506b5dd046fbf7048 Closes-Bug: #1868118 (cherry picked from commit a6ff7e2eacf27536b98ee10d511281b3d19a2b0a) --- deployment/ceph-ansible/ceph-mgr.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/deployment/ceph-ansible/ceph-mgr.yaml b/deployment/ceph-ansible/ceph-mgr.yaml index 13eea63414..f4e492d4be 100644 --- a/deployment/ceph-ansible/ceph-mgr.yaml +++ b/deployment/ceph-ansible/ceph-mgr.yaml @@ -38,6 +38,10 @@ parameters: type: boolean default: false description: Parameter used to trigger the dashboard deployment. + CephDashboardAdminRO: + type: boolean + default: true + description: Parameter used to set a read-only admin user. EnableInternalTLS: type: boolean default: false @@ -75,7 +79,8 @@ resources: dashboard_rgw_api_scheme: {get_param: [EndpointMap, CephRgwInternal, protocol]} dashboard_rgw_api_no_ssl_verify: false dashboard_port: 8444 - dashboard_frontend_vip: {get_param: [EndpointMap, CephGrafanaInternal, host]} + dashboard_frontend_vip: {get_param: [EndpointMap, CephDashboardInternal, host]} + dashboard_admin_user_ro: {get_param: CephDashboardAdminRO} outputs: role_data: