Add GlanceRegistry to the endpoint map

This patch adds GlanceRegistry to the endpoint map. This
will make accessing Glance registry setings via the endpoint
map possible.

Change-Id: I9186e56cd4746a60e65dc5ac12e6595ac56505f0
changes/28/303728/9
Dan Prince 7 years ago committed by Juan Antonio Osorio Robles
parent a12087715f
commit c717a4d1b8
  1. 1
      environments/enable-tls.yaml
  2. 5
      network/endpoints/endpoint_data.yaml
  3. 40
      network/endpoints/endpoint_map.yaml
  4. 1
      overcloud.yaml

@ -17,6 +17,7 @@ parameter_defaults:
GlanceAdmin: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
GlanceInternal: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
GlancePublic: {protocol: 'https', port: '13292', host: 'CLOUDNAME'}
GlanceRegistryInternal: {protocol: 'http', port: '9191', host: 'IP_ADDRESS'}
GnocchiAdmin: {protocol: 'http', port: '8041', host: 'IP_ADDRESS'}
GnocchiInternal: {protocol: 'http', port: '8041', host: 'IP_ADDRESS'}
GnocchiPublic: {protocol: 'https', port: '13041', host: 'CLOUDNAME'}

@ -55,6 +55,11 @@ Glance:
vip_param: GlanceApi
port: 9292
GlanceRegistry:
Internal:
vip_param: GlanceRegistry
port: 9191
Mysql:
'':
vip_param: Mysql

@ -12,6 +12,7 @@ parameters:
CeilometerApiVirtualIP: {type: string, default: ''}
CinderApiVirtualIP: {type: string, default: ''}
GlanceApiVirtualIP: {type: string, default: ''}
GlanceRegistryVirtualIP: {type: string, default: ''}
GnocchiApiVirtualIP: {type: string, default: ''}
HeatApiVirtualIP: {type: string, default: ''}
KeystoneAdminApiVirtualIP: {type: string, default: ''}
@ -37,6 +38,7 @@ parameters:
GlanceAdmin: {protocol: http, port: '9292', host: IP_ADDRESS}
GlanceInternal: {protocol: http, port: '9292', host: IP_ADDRESS}
GlancePublic: {protocol: http, port: '9292', host: IP_ADDRESS}
GlanceRegistryInternal: {protocol: http, port: '9191', host: IP_ADDRESS}
GnocchiAdmin: {protocol: http, port: '8041', host: IP_ADDRESS}
GnocchiInternal: {protocol: http, port: '8041', host: IP_ADDRESS}
GnocchiPublic: {protocol: http, port: '8041', host: IP_ADDRESS}
@ -648,6 +650,44 @@ outputs:
IP_ADDRESS: {get_param: PublicVirtualIP}
- ':'
- get_param: [EndpointMap, GlancePublic, port]
GlanceRegistryInternal:
host:
str_replace:
template:
get_param: [EndpointMap, GlanceRegistryInternal, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: GlanceRegistryVirtualIP}
port:
get_param: [EndpointMap, GlanceRegistryInternal, port]
protocol:
get_param: [EndpointMap, GlanceRegistryInternal, protocol]
uri:
list_join:
- ''
- - get_param: [EndpointMap, GlanceRegistryInternal, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, GlanceRegistryInternal, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: GlanceRegistryVirtualIP}
- ':'
- get_param: [EndpointMap, GlanceRegistryInternal, port]
uri_no_suffix:
list_join:
- ''
- - get_param: [EndpointMap, GlanceRegistryInternal, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, GlanceRegistryInternal, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: GlanceRegistryVirtualIP}
- ':'
- get_param: [EndpointMap, GlanceRegistryInternal, port]
GnocchiAdmin:
host:
str_replace:

@ -876,6 +876,7 @@ resources:
AodhApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, AodhApiNetwork]}]}
CinderApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderApiNetwork]}]}
GlanceApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
GlanceRegistryVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, GlanceRegistryNetwork]}]}
GnocchiApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, GnocchiApiNetwork]}]}
HeatApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, HeatApiNetwork]}]}
KeystoneAdminApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}

Loading…
Cancel
Save