diff options
| author | Alexandre Arents <alexandre.arents@corp.ovh.com> | 2021-02-19 09:52:00 +0000 |
|---|---|---|
| committer | Alexandre Arents <alexandre.arents@corp.ovh.com> | 2021-03-01 16:10:37 +0000 |
| commit | 16924dbe51c8e3d26c9dda49d6007b73a9869337 (patch) | |
| tree | c79bae5b0981a74977ab0a29aac6ccd0901d4ba2 /glance_store/_drivers | |
| parent | bfbea18d8774cb99a9d0a8949b962190c74aa9ad (diff) | |
| download | glance_store-16924dbe51c8e3d26c9dda49d6007b73a9869337.tar.gz | |
swift: Take into account swift_store_endpoint
In SingleTenant authv3 context, connection manager does not evaluate
swift_store_endpoint and always takes endpoint from catalog.
The change ensures CONF.glance_store.swift_store_endpoint
will take over catalog value also in that case.
Closes-Bug: #1885651
Change-Id: Ib18ff19cd539e0117909f849672036b8c9e5f049
Diffstat (limited to 'glance_store/_drivers')
| -rw-r--r-- | glance_store/_drivers/swift/connection_manager.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/glance_store/_drivers/swift/connection_manager.py b/glance_store/_drivers/swift/connection_manager.py index 56fa295..0d9ab24 100644 --- a/glance_store/_drivers/swift/connection_manager.py +++ b/glance_store/_drivers/swift/connection_manager.py @@ -143,11 +143,16 @@ class SingleTenantConnectionManager(SwiftConnectionManager): def _get_storage_url(self): """Get swift endpoint from keystone - Return endpoint for swift from service catalog. The method works only - Keystone v3. If you are using different version (1 or 2) + Return endpoint for swift from service catalog if not overridden in + store configuration. The method works only Keystone v3. + If you are using different version (1 or 2) it returns None. :return: swift endpoint """ + + if self.store.conf_endpoint: + return self.store.conf_endpoint + if self.store.auth_version == '3': try: return self.client.session.get_endpoint( |