DCN/Edge: Handle ipv6 address for local glance endpoint
In a DCN/Edge deployment, the glance endpoint is overridden so that
nova and cinder use the local glance-api service. When the deployment
is using ipv6, ensure the endpoint URI has brackets around the ipv6
address.
Closes-Bug: #1868579
Change-Id: I8e71a1f6df732c352b018472c30c662f1e726aaa
(cherry picked from commit 95b0171804
)
Conflicts:
deployment/haproxy/haproxy-edge-container-puppet.yaml
This commit is contained in:
parent
5f00163a07
commit
c40fa70558
|
@ -57,7 +57,7 @@ outputs:
|
||||||
value: &glance_api_edge_uri
|
value: &glance_api_edge_uri
|
||||||
str_replace:
|
str_replace:
|
||||||
template:
|
template:
|
||||||
"PROTOCOL://%{hiera('NETWORK')}:9292"
|
"PROTOCOL://%{hiera('NETWORK_uri')}:9292"
|
||||||
params:
|
params:
|
||||||
PROTOCOL:
|
PROTOCOL:
|
||||||
if:
|
if:
|
||||||
|
|
|
@ -58,6 +58,20 @@ resources:
|
||||||
|
|
||||||
outputs:
|
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:
|
role_data:
|
||||||
description: Role data for the HAproxy role for DCN/Edge.
|
description: Role data for the HAproxy role for DCN/Edge.
|
||||||
value:
|
value:
|
||||||
|
@ -121,3 +135,13 @@ outputs:
|
||||||
tripleo::haproxy::ui: false
|
tripleo::haproxy::ui: false
|
||||||
tripleo::haproxy::zaqar_api: false
|
tripleo::haproxy::zaqar_api: false
|
||||||
tripleo::haproxy::zaqar_ws: 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…
Reference in New Issue