From 14b7b3c3af06d3ef30385ccdf4e5538ab224016b Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 6 Aug 2018 10:03:49 -0600 Subject: [PATCH] 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 --- ...drc-versionless-keystone-endpoint-9cdc1a4e1341a933.yaml | 7 +++++++ tripleo_common/tests/utils/test_overcloudrc.py | 4 ++++ tripleo_common/utils/overcloudrc.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/overcloudrc-versionless-keystone-endpoint-9cdc1a4e1341a933.yaml diff --git a/releasenotes/notes/overcloudrc-versionless-keystone-endpoint-9cdc1a4e1341a933.yaml b/releasenotes/notes/overcloudrc-versionless-keystone-endpoint-9cdc1a4e1341a933.yaml new file mode 100644 index 000000000..f7d32947d --- /dev/null +++ b/releasenotes/notes/overcloudrc-versionless-keystone-endpoint-9cdc1a4e1341a933.yaml @@ -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 + diff --git a/tripleo_common/tests/utils/test_overcloudrc.py b/tripleo_common/tests/utils/test_overcloudrc.py index a43745d33..e6e519b75 100644 --- a/tripleo_common/tests/utils/test_overcloudrc.py +++ b/tripleo_common/tests/utils/test_overcloudrc.py @@ -44,3 +44,7 @@ class OvercloudRcTest(base.TestCase): self.assertIn(overcloudrc.CLOUDPROMPT, result['overcloudrc.v3']) self.assertIn("OS_AUTH_TYPE=password", result['overcloudrc']) 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']) diff --git a/tripleo_common/utils/overcloudrc.py b/tripleo_common/utils/overcloudrc.py index ade0a620f..7e5e55ac2 100644 --- a/tripleo_common/utils/overcloudrc.py +++ b/tripleo_common/utils/overcloudrc.py @@ -100,7 +100,7 @@ def create_overcloudrc(stack, no_proxy, admin_password): 'SSLContext object is not available"'), 'OS_AUTH_TYPE': '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_IMAGE_API_VERSION': constants.DEFAULT_IMAGE_API_VERSION, 'OS_VOLUME_API_VERSION': constants.DEFAULT_VOLUME_API_VERSION,