diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-04-29 16:36:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-04-29 16:36:21 +0000 |
| commit | d2445af81d91659fb8faa394a5562546d4525410 (patch) | |
| tree | dbcd056f8087702e25e5db3f693bd14eabeb8068 /network | |
| parent | 65953f6833b24b14d398ab525d8f4013fd64c0c1 (diff) | |
| parent | b0b56a193685a4fa33c39ca7246976db23d21916 (diff) | |
Merge "Fix the Sahara public endpoint and make it point to the Public VIP"
Diffstat (limited to 'network')
| -rw-r--r-- | network/endpoints/endpoint_data.yaml | 2 | ||||
| -rw-r--r-- | network/endpoints/endpoint_map.yaml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml index bd4e2281..f88a68f4 100644 --- a/network/endpoints/endpoint_data.yaml +++ b/network/endpoints/endpoint_data.yaml @@ -182,7 +182,7 @@ Sahara: uri_suffixes: '': /v1.1/%(tenant_id)s Public: - vip_param: SaharaApi + vip_param: Public uri_suffixes: '': /v1.1/%(tenant_id)s Admin: diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml index f9a8b83c..1bd35a7c 100644 --- a/network/endpoints/endpoint_map.yaml +++ b/network/endpoints/endpoint_map.yaml @@ -1778,7 +1778,7 @@ outputs: get_param: [EndpointMap, SaharaPublic, host] params: CLOUDNAME: {get_param: CloudName} - IP_ADDRESS: {get_param: SaharaApiVirtualIP} + IP_ADDRESS: {get_param: PublicVirtualIP} port: get_param: [EndpointMap, SaharaPublic, port] protocol: @@ -1793,7 +1793,7 @@ outputs: get_param: [EndpointMap, SaharaPublic, host] params: CLOUDNAME: {get_param: CloudName} - IP_ADDRESS: {get_param: SaharaApiVirtualIP} + IP_ADDRESS: {get_param: PublicVirtualIP} - ':' - get_param: [EndpointMap, SaharaPublic, port] - /v1.1/%(tenant_id)s @@ -1807,7 +1807,7 @@ outputs: get_param: [EndpointMap, SaharaPublic, host] params: CLOUDNAME: {get_param: CloudName} - IP_ADDRESS: {get_param: SaharaApiVirtualIP} + IP_ADDRESS: {get_param: PublicVirtualIP} - ':' - get_param: [EndpointMap, SaharaPublic, port] SwiftAdmin: |