Remove GlanceRegistry from EndpointMap
We don't need an endpoint for the glance-registry service, that is used by glance-api when needed and is not meant to be user-facing. Change-Id: Ia6c9dd6164d3b91adbc937d70fa74d5fbbfb28a3
This commit is contained in:
parent
53e2f2dea7
commit
072dad2c23
|
@ -14,9 +14,6 @@ parameter_defaults:
|
||||||
GlanceAdmin: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
|
GlanceAdmin: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
|
||||||
GlanceInternal: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
|
GlanceInternal: {protocol: 'http', port: '9292', host: 'IP_ADDRESS'}
|
||||||
GlancePublic: {protocol: 'https', port: '13292', host: 'CLOUDNAME'}
|
GlancePublic: {protocol: 'https', port: '13292', host: 'CLOUDNAME'}
|
||||||
GlanceRegistryAdmin: {protocol: 'http', port: '9191', host: 'IP_ADDRESS'}
|
|
||||||
GlanceRegistryInternal: {protocol: 'http', port: '9191', host: 'IP_ADDRESS'}
|
|
||||||
GlanceRegistryPublic: {protocol: 'https', port: '9191', host: 'IP_ADDRESS'} # Not set on the loadbalancer yet.
|
|
||||||
HeatAdmin: {protocol: 'http', port: '8004', host: 'IP_ADDRESS'}
|
HeatAdmin: {protocol: 'http', port: '8004', host: 'IP_ADDRESS'}
|
||||||
HeatInternal: {protocol: 'http', port: '8004', host: 'IP_ADDRESS'}
|
HeatInternal: {protocol: 'http', port: '8004', host: 'IP_ADDRESS'}
|
||||||
HeatPublic: {protocol: 'https', port: '13004', host: 'CLOUDNAME'}
|
HeatPublic: {protocol: 'https', port: '13004', host: 'CLOUDNAME'}
|
||||||
|
|
|
@ -37,15 +37,6 @@ Glance:
|
||||||
vip_param: GlanceApi
|
vip_param: GlanceApi
|
||||||
port: 9292
|
port: 9292
|
||||||
|
|
||||||
GlanceRegistry:
|
|
||||||
Internal:
|
|
||||||
vip_param: GlanceRegistry
|
|
||||||
Public:
|
|
||||||
vip_param: Public
|
|
||||||
Admin:
|
|
||||||
vip_param: GlanceRegistry
|
|
||||||
port: 9191
|
|
||||||
|
|
||||||
Mysql:
|
Mysql:
|
||||||
'':
|
'':
|
||||||
vip_param: Mysql
|
vip_param: Mysql
|
||||||
|
|
|
@ -11,7 +11,6 @@ parameters:
|
||||||
CeilometerApiVirtualIP: {type: string, default: ''}
|
CeilometerApiVirtualIP: {type: string, default: ''}
|
||||||
CinderApiVirtualIP: {type: string, default: ''}
|
CinderApiVirtualIP: {type: string, default: ''}
|
||||||
GlanceApiVirtualIP: {type: string, default: ''}
|
GlanceApiVirtualIP: {type: string, default: ''}
|
||||||
GlanceRegistryVirtualIP: {type: string, default: ''}
|
|
||||||
HeatApiVirtualIP: {type: string, default: ''}
|
HeatApiVirtualIP: {type: string, default: ''}
|
||||||
KeystoneAdminApiVirtualIP: {type: string, default: ''}
|
KeystoneAdminApiVirtualIP: {type: string, default: ''}
|
||||||
KeystonePublicApiVirtualIP: {type: string, default: ''}
|
KeystonePublicApiVirtualIP: {type: string, default: ''}
|
||||||
|
@ -33,9 +32,6 @@ parameters:
|
||||||
GlanceAdmin: {protocol: http, port: '9292', host: IP_ADDRESS}
|
GlanceAdmin: {protocol: http, port: '9292', host: IP_ADDRESS}
|
||||||
GlanceInternal: {protocol: http, port: '9292', host: IP_ADDRESS}
|
GlanceInternal: {protocol: http, port: '9292', host: IP_ADDRESS}
|
||||||
GlancePublic: {protocol: http, port: '9292', host: IP_ADDRESS}
|
GlancePublic: {protocol: http, port: '9292', host: IP_ADDRESS}
|
||||||
GlanceRegistryAdmin: {protocol: http, port: '9191', host: IP_ADDRESS}
|
|
||||||
GlanceRegistryInternal: {protocol: http, port: '9191', host: IP_ADDRESS}
|
|
||||||
GlanceRegistryPublic: {protocol: http, port: '9191', host: IP_ADDRESS}
|
|
||||||
HeatAdmin: {protocol: http, port: '8004', host: IP_ADDRESS}
|
HeatAdmin: {protocol: http, port: '8004', host: IP_ADDRESS}
|
||||||
HeatInternal: {protocol: http, port: '8004', host: IP_ADDRESS}
|
HeatInternal: {protocol: http, port: '8004', host: IP_ADDRESS}
|
||||||
HeatPublic: {protocol: http, port: '8004', host: IP_ADDRESS}
|
HeatPublic: {protocol: http, port: '8004', host: IP_ADDRESS}
|
||||||
|
@ -533,120 +529,6 @@ outputs:
|
||||||
IP_ADDRESS: {get_param: PublicVirtualIP}
|
IP_ADDRESS: {get_param: PublicVirtualIP}
|
||||||
- ':'
|
- ':'
|
||||||
- get_param: [EndpointMap, GlancePublic, port]
|
- get_param: [EndpointMap, GlancePublic, port]
|
||||||
GlanceRegistryAdmin:
|
|
||||||
host:
|
|
||||||
str_replace:
|
|
||||||
template:
|
|
||||||
get_param: [EndpointMap, GlanceRegistryAdmin, host]
|
|
||||||
params:
|
|
||||||
CLOUDNAME: {get_param: CloudName}
|
|
||||||
IP_ADDRESS: {get_param: GlanceRegistryVirtualIP}
|
|
||||||
port:
|
|
||||||
get_param: [EndpointMap, GlanceRegistryAdmin, port]
|
|
||||||
protocol:
|
|
||||||
get_param: [EndpointMap, GlanceRegistryAdmin, protocol]
|
|
||||||
uri:
|
|
||||||
list_join:
|
|
||||||
- ''
|
|
||||||
- - get_param: [EndpointMap, GlanceRegistryAdmin, protocol]
|
|
||||||
- ://
|
|
||||||
- str_replace:
|
|
||||||
template:
|
|
||||||
get_param: [EndpointMap, GlanceRegistryAdmin, host]
|
|
||||||
params:
|
|
||||||
CLOUDNAME: {get_param: CloudName}
|
|
||||||
IP_ADDRESS: {get_param: GlanceRegistryVirtualIP}
|
|
||||||
- ':'
|
|
||||||
- get_param: [EndpointMap, GlanceRegistryAdmin, port]
|
|
||||||
uri_no_suffix:
|
|
||||||
list_join:
|
|
||||||
- ''
|
|
||||||
- - get_param: [EndpointMap, GlanceRegistryAdmin, protocol]
|
|
||||||
- ://
|
|
||||||
- str_replace:
|
|
||||||
template:
|
|
||||||
get_param: [EndpointMap, GlanceRegistryAdmin, host]
|
|
||||||
params:
|
|
||||||
CLOUDNAME: {get_param: CloudName}
|
|
||||||
IP_ADDRESS: {get_param: GlanceRegistryVirtualIP}
|
|
||||||
- ':'
|
|
||||||
- get_param: [EndpointMap, GlanceRegistryAdmin, 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]
|
|
||||||
GlanceRegistryPublic:
|
|
||||||
host:
|
|
||||||
str_replace:
|
|
||||||
template:
|
|
||||||
get_param: [EndpointMap, GlanceRegistryPublic, host]
|
|
||||||
params:
|
|
||||||
CLOUDNAME: {get_param: CloudName}
|
|
||||||
IP_ADDRESS: {get_param: PublicVirtualIP}
|
|
||||||
port:
|
|
||||||
get_param: [EndpointMap, GlanceRegistryPublic, port]
|
|
||||||
protocol:
|
|
||||||
get_param: [EndpointMap, GlanceRegistryPublic, protocol]
|
|
||||||
uri:
|
|
||||||
list_join:
|
|
||||||
- ''
|
|
||||||
- - get_param: [EndpointMap, GlanceRegistryPublic, protocol]
|
|
||||||
- ://
|
|
||||||
- str_replace:
|
|
||||||
template:
|
|
||||||
get_param: [EndpointMap, GlanceRegistryPublic, host]
|
|
||||||
params:
|
|
||||||
CLOUDNAME: {get_param: CloudName}
|
|
||||||
IP_ADDRESS: {get_param: PublicVirtualIP}
|
|
||||||
- ':'
|
|
||||||
- get_param: [EndpointMap, GlanceRegistryPublic, port]
|
|
||||||
uri_no_suffix:
|
|
||||||
list_join:
|
|
||||||
- ''
|
|
||||||
- - get_param: [EndpointMap, GlanceRegistryPublic, protocol]
|
|
||||||
- ://
|
|
||||||
- str_replace:
|
|
||||||
template:
|
|
||||||
get_param: [EndpointMap, GlanceRegistryPublic, host]
|
|
||||||
params:
|
|
||||||
CLOUDNAME: {get_param: CloudName}
|
|
||||||
IP_ADDRESS: {get_param: PublicVirtualIP}
|
|
||||||
- ':'
|
|
||||||
- get_param: [EndpointMap, GlanceRegistryPublic, port]
|
|
||||||
HeatAdmin:
|
HeatAdmin:
|
||||||
host:
|
host:
|
||||||
str_replace:
|
str_replace:
|
||||||
|
|
|
@ -872,7 +872,6 @@ resources:
|
||||||
CeilometerApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]}
|
CeilometerApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]}
|
||||||
CinderApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderApiNetwork]}]}
|
CinderApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderApiNetwork]}]}
|
||||||
GlanceApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
|
GlanceApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
|
||||||
GlanceRegistryVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, GlanceRegistryNetwork]}]}
|
|
||||||
HeatApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, HeatApiNetwork]}]}
|
HeatApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, HeatApiNetwork]}]}
|
||||||
KeystoneAdminApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
|
KeystoneAdminApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
|
||||||
KeystonePublicApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}
|
KeystonePublicApiVirtualIP: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}
|
||||||
|
|
Loading…
Reference in New Issue