Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop use of SWIFT_CODENAMES when determining currently installed Swift version #915

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −10
Open

Drop use of SWIFT_CODENAMES when determining currently installed Swift version #915

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions charmhelpers/contrib/openstack/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,16 +545,10 @@ def get_os_version_package(pkg, fatal=True):
if not codename:
return None

if 'swift' in pkg:
vers_map = SWIFT_CODENAMES
for cname, version in vers_map.items():
if cname == codename:
return version[-1]
else:
vers_map = OPENSTACK_CODENAMES
for version, cname in vers_map.items():
if cname == codename:
return version
vers_map = OPENSTACK_CODENAMES
for version, cname in vers_map.items():
if cname == codename:
return version


def get_installed_os_version():
Expand Down