openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "DCN: use FQDN in glance endpoint with internal TLS" into stable/train

This commit is contained in:
Zuul 2020-09-04 00:40:44 +00:00 committed by Gerrit Code Review
parent 6c93aa63ba ca3bd9c3dd
commit 7e371158cc
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
deployment/glance/glance-api-edge-container-puppet.yaml
View File

@ -55,16 +55,18 @@ outputs:
glance_api_edge_uri:
description: URI of the glance-api service runing at the edge site.
value: &glance_api_edge_uri
str_replace:
template:
"PROTOCOL://%{hiera('NETWORK_uri')}:9292"
params:
PROTOCOL:
if:
- internal_tls_enabled
- https
- http
NETWORK: {get_param: [ServiceNetMap, GlanceApiEdgeNetwork]}
if:
- internal_tls_enabled
- str_replace:
template:
"https://%{hiera('fqdn_NETWORK')}:9292"
params:
NETWORK: {get_param: [ServiceNetMap, GlanceApiEdgeNetwork]}
- str_replace:
template:
"http://%{hiera('NETWORK_uri')}:9292"
params:
NETWORK: {get_param: [ServiceNetMap, GlanceApiEdgeNetwork]}
role_data:
description: Role data for the Glance API role for DCN/Edge.

22
deployment/haproxy/haproxy-edge-container-puppet.yaml
View File

@ -61,16 +61,18 @@ outputs:
glance_api_edge_uri:
description: URI of the glance-api service runing at the edge site.
value: &glance_api_edge_uri
str_replace:
template:
"PROTOCOL://%{hiera('NETWORK_uri')}:9292"
params:
PROTOCOL:
if:
- internal_tls_enabled
- https
- http
NETWORK: {get_param: [ServiceNetMap, GlanceApiEdgeNetwork]}
if:
- internal_tls_enabled
- str_replace:
template:
"https://%{hiera('fqdn_NETWORK')}:9292"
params:
NETWORK: {get_param: [ServiceNetMap, GlanceApiEdgeNetwork]}
- str_replace:
template:
"http://%{hiera('NETWORK_uri')}:9292"
params:
NETWORK: {get_param: [ServiceNetMap, GlanceApiEdgeNetwork]}
role_data:
description: Role data for the HAproxy role for DCN/Edge.