From: Guillaume Abrioux Date: Thu, 3 Feb 2022 15:39:18 +0000 (+0100) Subject: cephadm: change default keepalived/haproxy container img X-Git-Tag: v17.2.6~130^2~75^2~1 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3d88e4159fc2bbfc4f2295c8656d69611b9466c9;p=ceph.git cephadm: change default keepalived/haproxy container img given that we now host haproxy and keepalived container images at `quay.io/ceph` (keepalived and haproxy) let's use them as defaults in cephadm. Fixes: https://tracker.ceph.com/issues/54287 Signed-off-by: Guillaume Abrioux (cherry picked from commit ae22c330ae4b701b4742a73a49db217823f50250) --- diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 2353e7b1e74b2..bba1de0a0e895 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -53,8 +53,8 @@ DEFAULT_PROMTAIL_IMAGE = 'docker.io/grafana/promtail:2.4.0' DEFAULT_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v1.3.1' DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometheus/alertmanager:v0.23.0' DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/ceph-grafana:8.3.5' -DEFAULT_HAPROXY_IMAGE = 'docker.io/library/haproxy:2.3' -DEFAULT_KEEPALIVED_IMAGE = 'docker.io/arcts/keepalived' +DEFAULT_HAPROXY_IMAGE = 'quay.io/ceph/haproxy:2.3' +DEFAULT_KEEPALIVED_IMAGE = 'quay.io/ceph/keepalived:2.1.5' DEFAULT_SNMP_GATEWAY_IMAGE = 'docker.io/maxwo/snmp-notifier:v1.2.1' DEFAULT_REGISTRY = 'docker.io' # normalize unqualified digests to this # ------------------------------------------------------------------------------ diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 766ea77266dc2..218a2b59c2116 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -100,8 +100,8 @@ DEFAULT_LOKI_IMAGE = 'docker.io/grafana/loki:2.4.0' DEFAULT_PROMTAIL_IMAGE = 'docker.io/grafana/promtail:2.4.0' DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometheus/alertmanager:v0.23.0' DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/ceph-grafana:8.3.5' -DEFAULT_HAPROXY_IMAGE = 'docker.io/library/haproxy:2.3' -DEFAULT_KEEPALIVED_IMAGE = 'docker.io/arcts/keepalived' +DEFAULT_HAPROXY_IMAGE = 'quay.io/ceph/haproxy:2.3' +DEFAULT_KEEPALIVED_IMAGE = 'quay.io/ceph/keepalived:2.1.5' DEFAULT_SNMP_GATEWAY_IMAGE = 'docker.io/maxwo/snmp-notifier:v1.2.1' # ------------------------------------------------------------------------------