From 990a6af2936b60481d9967d6ea074820e7e223ee Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 4 Aug 2021 09:39:44 -0500 Subject: [PATCH] mgr/cephadm: quay.io for non-ceph images too Most of them, at least. Signed-off-by: Sage Weil --- src/cephadm/cephadm | 8 ++++---- src/pybind/mgr/cephadm/module.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 9ffdb3358b5..e545f93e937 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -51,10 +51,10 @@ FuncT = TypeVar('FuncT', bound=Callable) DEFAULT_IMAGE = 'quay.ceph.io/ceph-ci/ceph:master' DEFAULT_IMAGE_IS_MASTER = True DEFAULT_IMAGE_RELEASE = 'quincy' -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_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.18.1' +DEFAULT_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v0.18.1' +DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometehus/alertmanager:v0.20.0' +DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/ceph-grafana:6.7.4' DEFAULT_HAPROXY_IMAGE = 'docker.io/library/haproxy:2.3' DEFAULT_KEEPALIVED_IMAGE = 'docker.io/arcts/keepalived' 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 c798b938b0d..a06f57512de 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -92,10 +92,10 @@ Host * # Default container images ----------------------------------------------------- DEFAULT_IMAGE = 'quay.io/ceph/ceph' -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_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.18.1' +DEFAULT_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v0.18.1' +DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometheus/alertmanager:v0.20.0' +DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/ceph-grafana:6.7.4' DEFAULT_HAPROXY_IMAGE = 'docker.io/library/haproxy:2.3' DEFAULT_KEEPALIVED_IMAGE = 'docker.io/arcts/keepalived' # ------------------------------------------------------------------------------ -- 2.47.3