diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-22 15:00:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-22 15:00:56 +0000 |
| commit | 7ac441f019214e465a8e26fe03074b9ebd479034 (patch) | |
| tree | e9e3427fc77ff02aa2f4eadc86c823f6d2ae1bf9 /network/endpoints | |
| parent | ca7d0de4abbfd6b4145eba1c91c46d7ccc9c4a4b (diff) | |
| parent | 072dad2c23a57ad5b01d2b4c6904bbaa8c9a4637 (diff) | |
Merge "Remove GlanceRegistry from EndpointMap"
Diffstat (limited to 'network/endpoints')
| -rw-r--r-- | network/endpoints/endpoint_data.yaml | 9 | ||||
| -rw-r--r-- | network/endpoints/endpoint_map.yaml | 118 |
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: |