Merge "Fix the Sahara public endpoint and make it point to the Public VIP"

This commit is contained in:
Jenkins 2016-04-29 16:36:21 +00:00 committed by Gerrit Code Review
commit d2445af81d
2 changed files with 4 additions and 4 deletions

@ -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:

@ -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: