Reviewed: https://review.opendev.org/c/openstack/tripleo-heat-templates/+/817834 Committed: https://opendev.org/openstack/tripleo-heat-templates/commit/5f3bec95404780dc64d44a0a346fdab3bf7c3481 Submitter: "Zuul (22348)" Branch: stable/ussuri
commit 5f3bec95404780dc64d44a0a346fdab3bf7c3481 Author: Harald Jensås <email address hidden> Date: Fri Oct 8 13:21:04 2021 +0200
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)
Reviewed: https:/ /review. opendev. org/c/openstack /tripleo- heat-templates/ +/817834 /opendev. org/openstack/ tripleo- heat-templates/ commit/ 5f3bec95404780d c64d44a0a346fda b3bf7c3481
Committed: https:/
Submitter: "Zuul (22348)"
Branch: stable/ussuri
commit 5f3bec95404780d c64d44a0a346fda b3bf7c3481
Author: Harald Jensås <email address hidden>
Date: Fri Oct 8 13:21:04 2021 +0200
Default CephDashboardNe twork to storage_dashboard
The default CephDashboardNe twork 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: -resource- registry- puppet. j2.yaml
overcloud
Related-Bug: #1946239 020de74e18af8c7 bc0535d12d9 4e86b49ccf01395 e40ffd613b) b9edde370aa251d bddd7a2d63)
Change-Id: I9a62b2cf24b2dd
(cherry picked from commit 28161b58682ac6d
(cherry picked from commit 5d4785bd61f5ff8