Merge "Add Barbican to the overcloud"

diff --cc environments/tls-endpoints-public-dns.yaml
Simple merge

diff --cc environments/tls-endpoints-public-ip.yaml
Simple merge

diff --cc network/endpoints/endpoint_data.yaml
Simple merge

diff --cc network/endpoints/endpoint_map.yaml
Simple merge

diff --cc network/service_net_map.j2.yaml
Simple merge

diff --cc overcloud-resource-registry-puppet.j2.yaml
Simple merge

diff --cc overcloud.j2.yaml
Simple merge