openstack/charm-swift-proxy
Code Issues Proposed changes

Enable swift payload upgrades for wallaby+

Browse Source 
Sync charm-helpers to pick up fix for openstack_upgrade_available
that enables successful payload upgrades. This will need backporting
to stable/wallaby.

https://github.com/openstack-charmers/zaza/pull/619
Closes-Bug: #2040606
Change-Id: Ib5f446d617c11c9c9046c33335c1099b21b5166e
This commit is contained in:
Corey Bryant 2023-10-25 15:22:44 -04:00
parent 89d7e78998
commit 4ebb43d731
1 changed files with 4 additions and 20 deletions

16
charmhelpers/contrib/openstack/utils.py

@ -416,17 +416,6 @@ def get_os_version_codename(codename, version_map=OPENSTACK_CODENAMES,
error_out(e) error_out(e)
def get_os_version_codename_swift(codename):
'''Determine OpenStack version number of swift from codename.'''
# for k, v in six.iteritems(SWIFT_CODENAMES):
for k, v in SWIFT_CODENAMES.items():
if k == codename:
return v[-1]
e = 'Could not derive swift version for '\
'codename: %s' % codename
error_out(e)
def get_swift_codename(version): def get_swift_codename(version):
'''Determine OpenStack codename that corresponds to swift version.''' '''Determine OpenStack codename that corresponds to swift version.'''
codenames = [k for k, v in SWIFT_CODENAMES.items() if version in v] codenames = [k for k, v in SWIFT_CODENAMES.items() if version in v]
@ -585,7 +574,6 @@ def get_installed_os_version():
return openstack_release().get('OPENSTACK_CODENAME') return openstack_release().get('OPENSTACK_CODENAME')
@cached
def openstack_release(): def openstack_release():
"""Return /etc/os-release in a dict.""" """Return /etc/os-release in a dict."""
d = {} d = {}
@ -847,10 +835,6 @@ def openstack_upgrade_available(package):
if not cur_vers: if not cur_vers:
# The package has not been installed yet do not attempt upgrade # The package has not been installed yet do not attempt upgrade
return False return False
if "swift" in package:
codename = get_os_codename_install_source(src)
avail_vers = get_os_version_codename_swift(codename)
else:
try: try:
avail_vers = get_os_version_install_source(src) avail_vers = get_os_version_install_source(src)
except Exception: except Exception: