RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-16 07:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

use quay octopus tip until 15.2 tag is available

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2020-03-17 10:05:17 -05:00
parent a9b15c7e1a
commit 1f05f75787
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cephadm/cephadm
View File

@ -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'

3
src/common/options.cc
View File

@ -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)