From: Sage Weil <sage@redhat.com>
Date: Tue, 17 Mar 2020 15:05:17 +0000 (-0500)
Subject: use quay octopus tip until 15.2 tag is available
X-Git-Tag: v15.2.0~31^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33974%2Fhead;p=ceph.git

use quay octopus tip until 15.2 tag is available

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index cd4e0f8cef42..35f565fd5013 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1,6 +1,7 @@
 #!/usr/bin/python3
 
-DEFAULT_IMAGE='docker.io/ceph/ceph:v15.2'
+#DEFAULT_IMAGE='docker.io/ceph/ceph:v15.2'
+DEFAULT_IMAGE='quay.io/ceph-ci/ceph:octopus'
 DATA_DIR='/var/lib/ceph'
 LOG_DIR='/var/log/ceph'
 LOCK_DIR='/run/cephadm'
diff --git a/src/common/options.cc b/src/common/options.cc
index af6098925a76..6b4251ba127e 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -439,7 +439,8 @@ std::vector<Option> get_global_options() {
     Option("container_image", Option::TYPE_STR, Option::LEVEL_BASIC)
     .set_description("container image (used by cephadm orchestrator)")
     .set_flag(Option::FLAG_STARTUP)
-    .set_default("docker.io/ceph/ceph:v15.2"),
+    .set_default("quay.io/ceph-ci/ceph:octopus"),
+    //.set_default("docker.io/ceph/ceph:v15.2"),
 
     Option("no_config_file", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(false)