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

Change-Id: Iff287b9ea46100800e386efb98371be7ab48361f

diff --git a/network/endpoints/endpoint_data.yaml b/network/endpoints/endpoint_data.yaml
index bd4e228..f88a68f 100644 (file)
--- 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 f9a8b83..1bd35a7 100644 (file)
--- 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: