Merge ~cjwatson/launchpad:librarian-keystone-v3 into launchpad:master

[Colin Watson]

librarian: Allow selecting a different OS_AUTH_VERSION

[Cristian Gonzalez (cristiangsp)]

Looks good!

review: Approve

diff --git a/lib/lp/services/config/schema-lazr.conf b/lib/lp/services/config/schema-lazr.conf
index 752093f..7ead01c 100644
--- a/lib/lp/services/config/schema-lazr.conf
+++ b/lib/lp/services/config/schema-lazr.conf
@@ -1257,6 +1257,9 @@ os_password: none
 # datatype: string
 os_tenant_name: none
 
+# datatype: string
+os_auth_version: 2.0
+
 
 # Mailman configuration.  Most of this is configured in
 # https://git.launchpad.net/lp-mailman instead; the entries here are only
diff --git a/lib/lp/services/librarianserver/swift.py b/lib/lp/services/librarianserver/swift.py
index 23344c0..c05a702 100644
--- a/lib/lp/services/librarianserver/swift.py
+++ b/lib/lp/services/librarianserver/swift.py
@@ -1,4 +1,4 @@
-# Copyright 2013-2019 Canonical Ltd.  This software is licensed under the
+# Copyright 2013-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Move files from Librarian disk storage into Swift."""
@@ -412,7 +412,7 @@ class ConnectionPool:
             user=config.librarian_server.os_username,
             key=config.librarian_server.os_password,
             tenant_name=config.librarian_server.os_tenant_name,
-            auth_version='2.0',
+            auth_version=config.librarian_server.os_auth_version,
             )
 
 
diff --git a/lib/lp/testing/swift/fixture.py b/lib/lp/testing/swift/fixture.py
index 55cf8f3..3359380 100644
--- a/lib/lp/testing/swift/fixture.py
+++ b/lib/lp/testing/swift/fixture.py
@@ -1,4 +1,4 @@
-# Copyright 2013-2017 Canonical Ltd.  This software is licensed under the
+# Copyright 2013-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Mock Swift test fixture."""
@@ -86,7 +86,7 @@ class SwiftFixture(TacTestFixture):
         """Return a valid connection to our mock Swift"""
         connection_kwargs = {
             "authurl": config.librarian_server.os_auth_url,
-            "auth_version": "2.0",
+            "auth_version": config.librarian_server.os_auth_version,
             "tenant_name": config.librarian_server.os_tenant_name,
             "user": config.librarian_server.os_username,
             "key": config.librarian_server.os_password,