Browse Source

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

changes/26/749626/2
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
7e371158cc
2 changed files with 24 additions and 20 deletions
  1. +12
    -10
      deployment/glance/glance-api-edge-container-puppet.yaml
  2. +12
    -10
      deployment/haproxy/haproxy-edge-container-puppet.yaml

+ 12
- 10
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.


+ 12
- 10
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.


Loading…
Cancel
Save