From bf40a102b143df18b0f49893a44d453dab76585f Mon Sep 17 00:00:00 2001 From: Adam King Date: Tue, 30 Apr 2024 14:08:09 -0400 Subject: [PATCH] mgr/cephadm: update default NVMEoF container image version Otherwise the nvmeof daemon fails to start up i148-njpgei[69585]: Traceback (most recent call last): i148-njpgei[69585]: File "/usr/lib64/python3.9/runpy.py", line 197, in _run_module_as_main i148-njpgei[69585]: return _run_code(code, main_globals, None, i148-njpgei[69585]: File "/usr/lib64/python3.9/runpy.py", line 87, in _run_code i148-njpgei[69585]: exec(code, run_globals) i148-njpgei[69585]: File "/src/control/__main__.py", line 43, in i148-njpgei[69585]: gateway.serve() i148-njpgei[69585]: File "/src/control/server.py", line 177, in serve i148-njpgei[69585]: omap_lock = OmapLock(omap_state, gateway_state) i148-njpgei[69585]: File "/src/control/state.py", line 201, in __init__ i148-njpgei[69585]: self.omap_file_lock_retry_sleep_interval = self.omap_state.config.getint_with_default("gateway", i148-njpgei[69585]: File "/src/control/config.py", line 47, in getint_with_default i148-njpgei[69585]: return self.config.getint(section, param, fallback=value) i148-njpgei[69585]: File "/usr/lib64/python3.9/configparser.py", line 818, in getint i148-njpgei[69585]: return self._get_conv(section, option, int, raw=raw, vars=vars, i148-njpgei[69585]: File "/usr/lib64/python3.9/configparser.py", line 808, in _get_conv i148-njpgei[69585]: return self._get(section, conv, option, raw=raw, vars=vars, i148-njpgei[69585]: File "/usr/lib64/python3.9/configparser.py", line 803, in _get i148-njpgei[69585]: return conv(self.get(section, option, **kwargs)) i148-njpgei[69585]: ValueError: invalid literal for int() with base 10: '1.0' I've been told 1.2.5 has a patch that allows this value to be a float Fixes: https://tracker.ceph.com/issues/65718 Signed-off-by: Adam King (cherry picked from commit 0cebec2888d309e3c727ec2547692f680f3896af) --- src/pybind/mgr/cephadm/module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 283ebb786fcec..fd6a4472fc59a 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -120,7 +120,7 @@ os._exit = os_exit_noop # type: ignore DEFAULT_IMAGE = 'quay.io/ceph/ceph' DEFAULT_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.43.0' DEFAULT_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v1.5.0' -DEFAULT_NVMEOF_IMAGE = 'quay.io/ceph/nvmeof:1.2.1' +DEFAULT_NVMEOF_IMAGE = 'quay.io/ceph/nvmeof:1.2.5' DEFAULT_LOKI_IMAGE = 'docker.io/grafana/loki:3.0.0' DEFAULT_PROMTAIL_IMAGE = 'docker.io/grafana/promtail:3.0.0' DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometheus/alertmanager:v0.25.0' -- 2.39.5