From b0bd3a3665a3ee9884e36106b15e152d8e8711b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Fri, 8 Oct 2021 13:21:04 +0200 Subject: [PATCH] Default CephDashboardNetwork to storage_dashboard The default CephDashboardNetwork in ServiceNetMap was 'ctlplane'. Change this to default to storage_dashboard with a fallback to 'ctlplane'. This will allow us to remove the hard-coded conditionals on 'StorageDashboard' network name in tripleo_hiera_data. Conflicts: overcloud-resource-registry-puppet.j2.yaml Related-Bug: #1946239 Change-Id: I9a62b2cf24b2dd020de74e18af8c7bc0535d12d9 (cherry picked from commit 28161b58682ac6d4e86b49ccf01395e40ffd613b) (cherry picked from commit 5d4785bd61f5ff8b9edde370aa251dbddd7a2d63) --- network/service_net_map.j2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml index a4b15c1450..9bb236f10d 100644 --- a/network/service_net_map.j2.yaml +++ b/network/service_net_map.j2.yaml @@ -77,7 +77,7 @@ parameters: MysqlNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} SnmpdNetwork: ctlplane CephClusterNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }} - CephDashboardNetwork: ctlplane + CephDashboardNetwork: {{ _service_nets.get('storage_dashboard', 'ctlplane') }} CephGrafanaNetwork: {{ _service_nets.get('storage', 'ctlplane') }} CephMonNetwork: {{ _service_nets.get('storage', 'ctlplane') }} CephRgwNetwork: {{ _service_nets.get('storage', 'ctlplane') }}