From 354030638dcbcfca0ab1eb404ceb273a4e102a10 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Thu, 17 Jan 2019 15:28:13 +0000
Subject: [PATCH] Drop python-keystone and add python-keystonemiddleware

Python 2 support has been removed from the keystone package in
Disco (Stein), therefore there is no longer a python-keystone
binary package. python-keystone doesn't appear to be used by the
charm. python-keystonemiddleware, however, is used by the charm.

This change can safely be applied from Mitaka onwards.

Change-Id: I9aa6d66761ffa4f64a8573f3b0ab1e20b9c4f774
---
 lib/swift_utils.py             | 6 +++++-
 unit_tests/test_swift_utils.py | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/swift_utils.py b/lib/swift_utils.py
index 81a3ca3..1681023 100644
--- a/lib/swift_utils.py
+++ b/lib/swift_utils.py
@@ -127,7 +127,10 @@ BASE_PACKAGES = [
 # > Folsom specific packages
 FOLSOM_PACKAGES = ['swift-plugin-s3', 'swauth']
 # > Mitaka specific packages
-MITAKA_PACKAGES = ['python-ceilometermiddleware']
+MITAKA_PACKAGES = [
+    'python-ceilometermiddleware',
+    'python-keystonemiddleware',
+]
 
 SWIFT_HA_RES = 'grp_swift_vips'
 TEMPLATES = 'templates/'
@@ -459,6 +462,7 @@ def determine_packages(release):
         pkgs += FOLSOM_PACKAGES
     if cmp_openstack >= 'mitaka':
         pkgs += MITAKA_PACKAGES
+        pkgs.remove('python-keystone')
     if cmp_openstack >= 'rocky':
         pkgs.remove('swift-plugin-s3')
     return pkgs
diff --git a/unit_tests/test_swift_utils.py b/unit_tests/test_swift_utils.py
index 40687d4..811ce63 100644
--- a/unit_tests/test_swift_utils.py
+++ b/unit_tests/test_swift_utils.py
@@ -579,10 +579,10 @@ class SwiftUtilsTestCase(unittest.TestCase):
              'swift-proxy',
              'memcached',
              'apache2',
-             'python-keystone',
              'swift-plugin-s3',
              'swauth',
-             'python-ceilometermiddleware'],
+             'python-ceilometermiddleware',
+             'python-keystonemiddleware'],
             swift_utils.determine_packages('mitaka')
         )
 
@@ -591,8 +591,8 @@ class SwiftUtilsTestCase(unittest.TestCase):
              'swift-proxy',
              'memcached',
              'apache2',
-             'python-keystone',
              'swauth',
-             'python-ceilometermiddleware'],
+             'python-ceilometermiddleware',
+             'python-keystonemiddleware'],
             swift_utils.determine_packages('rocky')
         )