From 4907bf8fbc4fc30b86ca3c5d99adc03432c53005 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Tue, 25 Aug 2020 10:14:08 +0200 Subject: [PATCH] Default to storage_dashboard, when set, for the CephDashboard service The Ceph dashboard net was statically mapped to ctlplane which is a sane default except when storage_dashboard is set precisely to customize the listening network. This change ensures we consume storage_dashboard when set instead of using always ctlplane. Change-Id: If293b20c29b74158ecdee4e47e97535baefde72c (cherry picked from commit b81035d0076b711896a32b78a4fccc57cac2e063) --- 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 2ed5c5c574..3cf34de9b3 100644 --- a/network/service_net_map.j2.yaml +++ b/network/service_net_map.j2.yaml @@ -73,8 +73,8 @@ parameters: MysqlNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} SnmpdNetwork: ctlplane CephClusterNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }} - CephDashboardNetwork: ctlplane - CephGrafanaNetwork: {{ _service_nets.get('storage', 'ctlplane') }} + CephDashboardNetwork: {{ _service_nets.get('storage_dashboard', 'ctlplane') }} + CephGrafanaNetwork: {{ _service_nets.get('storage_dashboard', 'ctlplane') }} CephMonNetwork: {{ _service_nets.get('storage', 'ctlplane') }} CephRgwNetwork: {{ _service_nets.get('storage', 'ctlplane') }} PublicNetwork: {{ _service_nets.get('external', 'ctlplane') }}