From 718ef0dbc2485421ab82b05744e981bdfd3ef444 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 17 May 2021 15:40:10 -0400 Subject: [PATCH] mgr/cephadm: pin haproxy image to 2.3.z The 2.4 version fails for reasons that aren't immediate clear: May 17 15:28:42 dael conmon[3007013]: [NOTICE] (8) : haproxy version is 2.4.0-6cbbecf May 17 15:28:42 dael conmon[3007013]: [NOTICE] (8) : path to executable is /usr/local/sbin/haproxy May 17 15:28:42 dael conmon[3007013]: [ALERT] (8) : Cannot open configuration file/directory /var/lib/haproxy/haproxy.cfg : Permission denied Even with mode 777 on those files, there is an error about the chroot to /var/lib/haproxy. For now, just stick with a working version. Fixes: https://tracker.ceph.com/issues/50830 Signed-off-by: Sage Weil (cherry picked from commit b94c8dedd8aa77aeb0b4957e88197ac89370ffb4) --- src/pybind/mgr/cephadm/module.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 5e35f5db1eaaa..9cfd6ee0e5a69 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -96,6 +96,7 @@ DEFAULT_PROMETHEUS_IMAGE = 'docker.io/prom/prometheus:v2.18.1' DEFAULT_NODE_EXPORTER_IMAGE = 'docker.io/prom/node-exporter:v0.18.1' DEFAULT_GRAFANA_IMAGE = 'docker.io/ceph/ceph-grafana:6.7.4' DEFAULT_ALERT_MANAGER_IMAGE = 'docker.io/prom/alertmanager:v0.20.0' +DEFAULT_HAPROXY_IMAGE = 'docker.io/library/haproxy:2.3' # ------------------------------------------------------------------------------ @@ -208,7 +209,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule, ), Option( 'container_image_haproxy', - default='haproxy', + default=DEFAULT_HAPROXY_IMAGE, desc='HAproxy container image', ), Option( -- 2.39.5