Drop version from OS_AUTH_URL
We're configuring OS_IDENTITY_API_VERSION so the /v3 is not really necessary. Additionally, the string replace being used is resulting in a // in the url. Depends-On: Ia41d21ebad9329ae9fa506868957a72e6f9a5ca5 Change-Id: Id8f2ec0d78eec7276b7d4f82782d64e4edde6302 Closes-Bug: #1785660
This commit is contained in:
parent
213968bb3f
commit
14b7b3c3af
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
other:
|
||||||
|
- |
|
||||||
|
Switched to a versionless Keystone url in the overcloudrc. Previously,
|
||||||
|
/v3 was being appended to the OS_AUTH_URL url but is not required when
|
||||||
|
configuring OS_IDENTITY_API_VERSION
|
||||||
|
|
@ -44,3 +44,7 @@ class OvercloudRcTest(base.TestCase):
|
|||||||
self.assertIn(overcloudrc.CLOUDPROMPT, result['overcloudrc.v3'])
|
self.assertIn(overcloudrc.CLOUDPROMPT, result['overcloudrc.v3'])
|
||||||
self.assertIn("OS_AUTH_TYPE=password", result['overcloudrc'])
|
self.assertIn("OS_AUTH_TYPE=password", result['overcloudrc'])
|
||||||
self.assertIn("OS_AUTH_TYPE=password", result['overcloudrc.v3'])
|
self.assertIn("OS_AUTH_TYPE=password", result['overcloudrc.v3'])
|
||||||
|
self.assertIn("OS_AUTH_URL=http://foo.com:8000/",
|
||||||
|
result['overcloudrc'])
|
||||||
|
self.assertIn("OS_AUTH_URL=http://foo.com:8000/",
|
||||||
|
result['overcloudrc.v3'])
|
||||||
|
@ -100,7 +100,7 @@ def create_overcloudrc(stack, no_proxy, admin_password):
|
|||||||
'SSLContext object is not available"'),
|
'SSLContext object is not available"'),
|
||||||
'OS_AUTH_TYPE': 'password',
|
'OS_AUTH_TYPE': 'password',
|
||||||
'OS_PASSWORD': admin_password,
|
'OS_PASSWORD': admin_password,
|
||||||
'OS_AUTH_URL': overcloud_endpoint.replace('/v2.0', '') + '/v3',
|
'OS_AUTH_URL': overcloud_endpoint.replace('/v2.0', ''),
|
||||||
'OS_IDENTITY_API_VERSION': '3',
|
'OS_IDENTITY_API_VERSION': '3',
|
||||||
'OS_IMAGE_API_VERSION': constants.DEFAULT_IMAGE_API_VERSION,
|
'OS_IMAGE_API_VERSION': constants.DEFAULT_IMAGE_API_VERSION,
|
||||||
'OS_VOLUME_API_VERSION': constants.DEFAULT_VOLUME_API_VERSION,
|
'OS_VOLUME_API_VERSION': constants.DEFAULT_VOLUME_API_VERSION,
|
||||||
|
Loading…
Reference in New Issue
Block a user