Reviewed: https://review.opendev.org/696821 Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=2dfb57618991959e951a5c6e92149676ec62b96f Submitter: Zuul Branch: stable/queens
commit 2dfb57618991959e951a5c6e92149676ec62b96f Author: Harald Jensås <email address hidden> Date: Wed Jan 2 13:11:46 2019 +0100
Fall back service_net_map to ctlplane
Render the service_net_map to fall back to the ctlplane network when networks are disabled (or not defined) in network_data.yaml.
Also use startswith for Ceph roles which should all have 'storage' as the HostnameResolveNetwork.
Conflicts: network/service_net_map.j2.yaml
Closes-Bug: #1809313 Change-Id: I737d5656b113f7e2238fe7bb555cc2d4cb13877c (cherry picked from commit 3df5f8db1ecb2e276d8744ad796a029a0f0a5a6e)
Reviewed: https:/ /review. opendev. org/696821 /git.openstack. org/cgit/ openstack/ tripleo- heat-templates/ commit/ ?id=2dfb5761899 1959e951a5c6e92 149676ec62b96f
Committed: https:/
Submitter: Zuul
Branch: stable/queens
commit 2dfb57618991959 e951a5c6e921496 76ec62b96f
Author: Harald Jensås <email address hidden>
Date: Wed Jan 2 13:11:46 2019 +0100
Fall back service_net_map to ctlplane
Render the service_net_map to fall back to the ctlplane network when
networks are disabled (or not defined) in network_data.yaml.
Also use startswith for Ceph roles which should all have 'storage' Network.
as the HostnameResolve
Conflicts: service_ net_map. j2.yaml
network/
Closes-Bug: #1809313 e2238fe7bb555cc 2d4cb13877c 76d8744ad796a02 9a0f0a5a6e)
Change-Id: I737d5656b113f7
(cherry picked from commit 3df5f8db1ecb2e2