From a1195bd782d5e07e3bb751e9adf5a3c205662e7e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 11 Aug 2021 12:21:32 -0400 Subject: [PATCH] cephadm: quay.io for non-ceph images too Signed-off-by: Sage Weil (cherry picked from commit dbc1d6303f4c2a22f5fa59218aa032fc92073906) --- 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 dda12a62462e1..2dee915f8eb41 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -3,10 +3,10 @@ # Default container images ----------------------------------------------------- DEFAULT_IMAGE = 'quay.io/ceph/ceph:v15' DEFAULT_IMAGE_IS_MASTER = False -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' # ------------------------------------------------------------------------------ LATEST_STABLE_RELEASE = 'octopus' diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 54431ace266c0..76a4d9b765e3b 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -92,10 +92,10 @@ CEPH_TYPES = set(CEPH_UPGRADE_ORDER) # 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' # ------------------------------------------------------------------------------ -- 2.39.5