openstack/charm-ceilometer-agent
Code Issues Proposed changes

Handle openstack comparison after the z-wrap

Browse Source 
CompareOpenStackReleases is used to handle openstack comparison
after the z-wrap, now that we are at antelope.

Change-Id: I31254f50d9befdfc3a54c2ee305cb06e7d19cce3
This commit is contained in:
Corey Bryant
2023-03-20 18:46:39 +00:00
parent 9af7effd2b
commit 9bf04a8517
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hooks/ceilometer_utils.py
View File

@@ -139,7 +139,7 @@ def get_packages():
packages = deepcopy(CEILOMETER_AGENT_PACKAGES) packages = deepcopy(CEILOMETER_AGENT_PACKAGES)
packages.extend(token_cache_pkgs(release=release)) packages.extend(token_cache_pkgs(release=release))
if release >= 'rocky': if CompareOpenStackReleases(release) >= 'rocky':
packages = [p for p in packages if not p.startswith('python-')] packages = [p for p in packages if not p.startswith('python-')]
packages.extend(PY3_PACKAGES) packages.extend(PY3_PACKAGES)
@@ -154,7 +154,7 @@ def determine_purge_packages():
:returns: list of package names :returns: list of package names
''' '''
release = _get_current_release() release = _get_current_release()
if release >= 'rocky': if CompareOpenStackReleases(release) >= 'rocky':
pkgs = [p for p in CEILOMETER_AGENT_PACKAGES pkgs = [p for p in CEILOMETER_AGENT_PACKAGES
if p.startswith('python-')] if p.startswith('python-')]
return pkgs return pkgs
@@ -213,7 +213,7 @@ def determine_held_packages():
'''Return a list of packages to mark as candidates for removal '''Return a list of packages to mark as candidates for removal
for the current OS release''' for the current OS release'''
release = _get_current_release() release = _get_current_release()
if release >= 'rocky': if CompareOpenStackReleases(release) >= 'queens':
return HELD_PACKAGES return HELD_PACKAGES
return [] return []