aboutsummaryrefslogtreecommitdiffstats
path: root/network/endpoints
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-03-08 10:29:17 +0100
committerGiulio Fidente <gfidente@redhat.com>2016-03-18 11:29:00 +0100
commit072dad2c23a57ad5b01d2b4c6904bbaa8c9a4637 (patch)
tree63933eb28d76a45b2f27cce1919e321d6002e314 /network/endpoints
parent53e2f2dea7d6c7d3e623082141b6fedbc301c276 (diff)
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
Diffstat (limited to 'network/endpoints')
-rw-r--r--network/endpoints/endpoint_data.yaml9
-rw-r--r--network/endpoints/endpoint_map.yaml118
2 files changed, 0 insertions, 127 deletions
diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml
index 7a0bbf4a..46148dfb 100644
--- a/network/endpoints/endpoint_data.yaml
+++ b/network/endpoints/endpoint_data.yaml
@@ -37,15 +37,6 @@ Glance:
vip_param: GlanceApi
port: 9292
-GlanceRegistry:
- Internal:
- vip_param: GlanceRegistry
- Public:
- vip_param: Public
- Admin:
- vip_param: GlanceRegistry
- port: 9191
-
Mysql:
'':
vip_param: Mysql
diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml
index a31094a1..8f0f587a 100644
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -11,7 +11,6 @@ parameters:
CeilometerApiVirtualIP: {type: string, default: ''}
CinderApiVirtualIP: {type: string, default: ''}
GlanceApiVirtualIP: {type: string, default: ''}
- GlanceRegistryVirtualIP: {type: string, default: ''}
HeatApiVirtualIP: {type: string, default: ''}
KeystoneAdminApiVirtualIP: {type: string, default: ''}
KeystonePublicApiVirtualIP: {type: string, default: ''}
@@ -33,9 +32,6 @@ 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}
- 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}
HeatInternal: {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}
- ':'
- 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:
host:
str_replace: