From: Sage Weil <sage@newdream.net>
Date: Wed, 28 Jul 2021 18:19:43 +0000 (-0400)
Subject: cephadm: default to quay.io, not docker.io
X-Git-Tag: v15.2.15~29^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8599299c35ecc33deec29ef0e88b331300bf6a6d;p=ceph.git

cephadm: default to quay.io, not docker.io

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 9b7348b8bc29c..76e65349b6c5f 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-DEFAULT_IMAGE='docker.io/ceph/ceph:v15'
+DEFAULT_IMAGE='quay.io/ceph/ceph:v15'
 DEFAULT_IMAGE_IS_MASTER=False
 LATEST_STABLE_RELEASE = 'octopus'
 DATA_DIR = '/var/lib/ceph'
diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 989a30fca5678..d74c433aecab4 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -162,7 +162,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         },
         {
             'name': 'container_image_base',
-            'default': 'docker.io/ceph/ceph',
+            'default': 'quay.io/ceph/ceph',
             'desc': 'Container image name, without the tag',
             'runtime': True,
         },