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 commit28161b5868
) (cherry picked from commit5d4785bd61
)
This commit is contained in:
parent
498b6bec49
commit
f3930cc5b1
|
@ -74,7 +74,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') }}
|
||||
|
|
Loading…
Reference in New Issue