From 062e60eebe0225d6ef8cac6b0fd6bbfc805679c7 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Wed, 23 Sep 2020 16:15:10 +0200 Subject: [PATCH] Assume Grafana and Ceph Dashboard to be on the storage or ctlplane nets Both Grafana and the Ceph Dashboard when deployed by ceph-ansible will be always listening on the storage frontend network. Change-Id: I3481ddfeeb5603e0e31e4afd26e4218df5defd11 (cherry picked from commit 5746d9d9a03b52cca5b266d2578b0cb414867626) --- network/service_net_map.j2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml index 5ad659d1dd..5782a55554 100644 --- a/network/service_net_map.j2.yaml +++ b/network/service_net_map.j2.yaml @@ -76,8 +76,8 @@ parameters: MysqlNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} SnmpdNetwork: ctlplane CephClusterNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }} - CephDashboardNetwork: {{ _service_nets.get('storage_dashboard', 'ctlplane') }} - CephGrafanaNetwork: {{ _service_nets.get('storage_dashboard', 'ctlplane') }} + CephDashboardNetwork: {{ _service_nets.get('storage', 'ctlplane') }} + CephGrafanaNetwork: {{ _service_nets.get('storage', 'ctlplane') }} CephMonNetwork: {{ _service_nets.get('storage', 'ctlplane') }} CephRgwNetwork: {{ _service_nets.get('storage', 'ctlplane') }} PublicNetwork: {{ _service_nets.get('external', 'ctlplane') }}