From: Sage Weil <sage@redhat.com>
Date: Tue, 24 Mar 2020 16:46:30 +0000 (-0500)
Subject: mgr/cephadm: use docker.io in default container image name
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1734^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d4f367a7ea96c97c7aa437f79a1c2dabb2c7caf8;p=ceph-ci.git

mgr/cephadm: use docker.io in default container image name

Not all hosts have docker.io configured as a default registry.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 4b361abb548..fac6b3c05bc 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -590,7 +590,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         },
         {
             'name': 'container_image_base',
-            'default': 'ceph/ceph',
+            'default': 'docker.io/ceph/ceph',
             'desc': 'Container image name, without the tag',
             'runtime': True,
         },