openstack/charm-swift-proxy
Code Issues Proposed changes

Merge "Drop python-keystone and add python-keystonemiddleware"

Browse Source
This commit is contained in:
Zuul
2019-02-27 07:34:21 +00:00
committed by Gerrit Code Review
parent 4ef5ba8177 354030638d
commit 48ff2af248
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/swift_utils.py
View File

@@ -127,7 +127,10 @@ BASE_PACKAGES = [
# > Folsom specific packages # > Folsom specific packages
FOLSOM_PACKAGES = ['swift-plugin-s3', 'swauth'] FOLSOM_PACKAGES = ['swift-plugin-s3', 'swauth']
# > Mitaka specific packages # > Mitaka specific packages
MITAKA_PACKAGES = ['python-ceilometermiddleware'] MITAKA_PACKAGES = [
'python-ceilometermiddleware',
'python-keystonemiddleware',
]
SWIFT_HA_RES = 'grp_swift_vips' SWIFT_HA_RES = 'grp_swift_vips'
TEMPLATES = 'templates/' TEMPLATES = 'templates/'
@@ -459,6 +462,7 @@ def determine_packages(release):
pkgs += FOLSOM_PACKAGES pkgs += FOLSOM_PACKAGES
if cmp_openstack >= 'mitaka': if cmp_openstack >= 'mitaka':
pkgs += MITAKA_PACKAGES pkgs += MITAKA_PACKAGES
pkgs.remove('python-keystone')
if cmp_openstack >= 'rocky': if cmp_openstack >= 'rocky':
pkgs.remove('swift-plugin-s3') pkgs.remove('swift-plugin-s3')
return pkgs return pkgs

8
unit_tests/test_swift_utils.py
View File

@@ -579,10 +579,10 @@ class SwiftUtilsTestCase(unittest.TestCase):
'swift-proxy', 'swift-proxy',
'memcached', 'memcached',
'apache2', 'apache2',
'python-keystone',
'swift-plugin-s3', 'swift-plugin-s3',
'swauth', 'swauth',
'python-ceilometermiddleware'], 'python-ceilometermiddleware',
'python-keystonemiddleware'],
swift_utils.determine_packages('mitaka') swift_utils.determine_packages('mitaka')
) )
@@ -591,8 +591,8 @@ class SwiftUtilsTestCase(unittest.TestCase):
'swift-proxy', 'swift-proxy',
'memcached', 'memcached',
'apache2', 'apache2',
'python-keystone',
'swauth', 'swauth',
'python-ceilometermiddleware'], 'python-ceilometermiddleware',
'python-keystonemiddleware'],
swift_utils.determine_packages('rocky') swift_utils.determine_packages('rocky')
) )