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
This commit is contained in:
parent
5fa5f9c51d
commit
8ad13c28b3
|
@ -520,32 +520,32 @@ class ClientManager(object):
|
||||||
if "v2.0" in conf.get("identity", "uri"):
|
if "v2.0" in conf.get("identity", "uri"):
|
||||||
self.identity = identity_client.IdentityClient(
|
self.identity = identity_client.IdentityClient(
|
||||||
_auth, conf.get_defaulted('identity', 'catalog_type'),
|
_auth, conf.get_defaulted('identity', 'catalog_type'),
|
||||||
self.identity_region, endpoint_type='adminURL',
|
self.identity_region, endpoint_type='publicURL',
|
||||||
**default_params)
|
**default_params)
|
||||||
else:
|
else:
|
||||||
self.identity = identity_v3_client.IdentityClient(
|
self.identity = identity_v3_client.IdentityClient(
|
||||||
_auth, conf.get_defaulted('identity', 'catalog_type'),
|
_auth, conf.get_defaulted('identity', 'catalog_type'),
|
||||||
self.identity_region, endpoint_type='adminURL',
|
self.identity_region, endpoint_type='publicURL',
|
||||||
**default_params)
|
**default_params)
|
||||||
|
|
||||||
self.tenants = ProjectsClient(
|
self.tenants = ProjectsClient(
|
||||||
_auth,
|
_auth,
|
||||||
conf.get_defaulted('identity', 'catalog_type'),
|
conf.get_defaulted('identity', 'catalog_type'),
|
||||||
self.identity_region,
|
self.identity_region,
|
||||||
'adminURL',
|
'publicURL',
|
||||||
self.identity_version,
|
self.identity_version,
|
||||||
**default_params)
|
**default_params)
|
||||||
|
|
||||||
self.set_roles_client(
|
self.set_roles_client(
|
||||||
auth=_auth,
|
auth=_auth,
|
||||||
conf=conf,
|
conf=conf,
|
||||||
endpoint_type='adminURL',
|
endpoint_type='publicURL',
|
||||||
default_params=default_params)
|
default_params=default_params)
|
||||||
|
|
||||||
self.set_users_client(
|
self.set_users_client(
|
||||||
auth=_auth,
|
auth=_auth,
|
||||||
conf=conf,
|
conf=conf,
|
||||||
endpoint_type='adminURL',
|
endpoint_type='publicURL',
|
||||||
default_params=default_params)
|
default_params=default_params)
|
||||||
|
|
||||||
self.images = images_client.ImagesClient(
|
self.images = images_client.ImagesClient(
|
||||||
|
|
|
@ -29,7 +29,7 @@ class TestApiDiscoveryMethods(BaseServiceTest):
|
||||||
{
|
{
|
||||||
'endpoints_links': [],
|
'endpoints_links': [],
|
||||||
'endpoints': [{
|
'endpoints': [{
|
||||||
'adminURL': 'http://172.16.52.151:8080/v1/AUTH_402',
|
'publicURL': 'http://172.16.52.151:8080/v1/AUTH_402',
|
||||||
'region': 'RegionOne',
|
'region': 'RegionOne',
|
||||||
'publicURL': 'http://172.16.52.151:8080/v1/AUTH_402',
|
'publicURL': 'http://172.16.52.151:8080/v1/AUTH_402',
|
||||||
'internalURL': 'http://172.16.52.151:8080/v1/AUTH_402',
|
'internalURL': 'http://172.16.52.151:8080/v1/AUTH_402',
|
||||||
|
@ -59,7 +59,7 @@ class TestApiDiscoveryMethods(BaseServiceTest):
|
||||||
{
|
{
|
||||||
'endpoints_links': [],
|
'endpoints_links': [],
|
||||||
'endpoints': [{
|
'endpoints': [{
|
||||||
'adminURL': 'http://172.16.52.151:8774/v3/402',
|
'publicURL': 'http://172.16.52.151:8774/v3/402',
|
||||||
'region': 'RegionOne',
|
'region': 'RegionOne',
|
||||||
'publicURL': 'http://172.16.52.151:8774/v3/402',
|
'publicURL': 'http://172.16.52.151:8774/v3/402',
|
||||||
'internalURL': 'http://172.16.52.151:8774/v3/402',
|
'internalURL': 'http://172.16.52.151:8774/v3/402',
|
||||||
|
|
|
@ -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.
|
Loading…
Reference in New Issue