diff --git a/lib/swift_utils.py b/lib/swift_utils.py index 31a8486..3c789be 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') )