From 6d2c9941b4e3ceda4ccab936eb589416a9975b3e Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 23 Nov 2017 14:43:13 -0800
Subject: [PATCH] Switch endpoint_type to publicURL

We were using adminURL to talk to Keystone API but in most cases, we run Tempest
from outside of admin network for security reasons. We now use public URL, so the
public network, which is what we expect our cloud users to do.

Change-Id: Iefcca23dc7593148cfa836d588d484cac0707851
---
 config_tempest/config_tempest.py                       | 10 +++++-----
 .../notes/default_endpoint_type-792092b7027768ae.yaml  |  6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 releasenotes/notes/default_endpoint_type-792092b7027768ae.yaml

diff --git a/config_tempest/config_tempest.py b/config_tempest/config_tempest.py
index 51a86e24..2e0bb6b4 100755
--- a/config_tempest/config_tempest.py
+++ b/config_tempest/config_tempest.py
@@ -520,32 +520,32 @@ class ClientManager(object):
         if "v2.0" in conf.get("identity", "uri"):
             self.identity = identity_client.IdentityClient(
                 _auth, conf.get_defaulted('identity', 'catalog_type'),
-                self.identity_region, endpoint_type='adminURL',
+                self.identity_region, endpoint_type='publicURL',
                 **default_params)
         else:
             self.identity = identity_v3_client.IdentityClient(
                 _auth, conf.get_defaulted('identity', 'catalog_type'),
-                self.identity_region, endpoint_type='adminURL',
+                self.identity_region, endpoint_type='publicURL',
                 **default_params)
 
         self.tenants = ProjectsClient(
             _auth,
             conf.get_defaulted('identity', 'catalog_type'),
             self.identity_region,
-            'adminURL',
+            'publicURL',
             self.identity_version,
             **default_params)
 
         self.set_roles_client(
             auth=_auth,
             conf=conf,
-            endpoint_type='adminURL',
+            endpoint_type='publicURL',
             default_params=default_params)
 
         self.set_users_client(
             auth=_auth,
             conf=conf,
-            endpoint_type='adminURL',
+            endpoint_type='publicURL',
             default_params=default_params)
 
         self.images = images_client.ImagesClient(
diff --git a/releasenotes/notes/default_endpoint_type-792092b7027768ae.yaml b/releasenotes/notes/default_endpoint_type-792092b7027768ae.yaml
new file mode 100644
index 00000000..37f828c5
--- /dev/null
+++ b/releasenotes/notes/default_endpoint_type-792092b7027768ae.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    We were using adminURL to talk to Keystone API but in most cases, we run Tempest
+    from outside of admin network for security reasons. We now use public URL, so the
+    public network, which is what we expect our cloud users to do.