From 7821a38e25b5b0a7b8b7dbb29088dad4169bec70 Mon Sep 17 00:00:00 2001 From: Luciano Lo Giudice Date: Wed, 13 Sep 2023 14:11:36 -0300 Subject: [PATCH] Sync libraries again (Reef mapping was missing) Change-Id: I41b5abba9c29a99c16c67ee0d4a8c10e760c76fa --- lib/charms_ceph/broker.py | 2 +- lib/charms_ceph/utils.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/charms_ceph/broker.py b/lib/charms_ceph/broker.py index 90b536fb..71f85f45 100644 --- a/lib/charms_ceph/broker.py +++ b/lib/charms_ceph/broker.py @@ -907,7 +907,7 @@ def process_requests_v1(reqs): log(msg, level=ERROR) return {'exit-code': 1, 'stderr': msg} - if type(ret) == dict and 'exit-code' in ret: + if isinstance(ret, dict) and 'exit-code' in ret: return ret return {'exit-code': 0} diff --git a/lib/charms_ceph/utils.py b/lib/charms_ceph/utils.py index 41eff9b4..94bfb9e4 100644 --- a/lib/charms_ceph/utils.py +++ b/lib/charms_ceph/utils.py @@ -3231,6 +3231,7 @@ UPGRADE_PATHS = collections.OrderedDict([ ('nautilus', 'octopus'), ('octopus', 'pacific'), ('pacific', 'quincy'), + ('quincy', 'reef'), ]) # Map UCA codenames to Ceph codenames @@ -3254,7 +3255,7 @@ UCA_CODENAME_MAP = { 'yoga': 'quincy', 'zed': 'quincy', 'antelope': 'quincy', - 'bobcat': 'quincy', + 'bobcat': 'reef', }