Browse Source

Merge "DCN/Edge: Handle ipv6 address for local glance endpoint" into stable/train

changes/30/715130/8
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
6c5658ad25
2 changed files with 25 additions and 1 deletions
  1. +1
    -1
      deployment/glance/glance-api-edge-container-puppet.yaml
  2. +24
    -0
      deployment/haproxy/haproxy-edge-container-puppet.yaml

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

@@ -57,7 +57,7 @@ outputs:
value: &glance_api_edge_uri
str_replace:
template:
"PROTOCOL://%{hiera('NETWORK')}:9292"
"PROTOCOL://%{hiera('NETWORK_uri')}:9292"
params:
PROTOCOL:
if:


+ 24
- 0
deployment/haproxy/haproxy-edge-container-puppet.yaml View File

@@ -58,6 +58,20 @@ resources:

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]}

role_data:
description: Role data for the HAproxy role for DCN/Edge.
value:
@@ -121,3 +135,13 @@ outputs:
tripleo::haproxy::ui: false
tripleo::haproxy::zaqar_api: false
tripleo::haproxy::zaqar_ws: false
service_config_settings:
map_merge:
- get_attr: [HAProxyBase, role_data, service_config_settings]
- if:
- glance_api_proxy_enabled
- cinder_volume:
cinder::glance::glance_api_servers: *glance_api_edge_uri
nova_compute:
nova::glance_api_servers: *glance_api_edge_uri
- {}

Loading…
Cancel
Save