diff options
| author | Sage Weil <sage@redhat.com> | 2020-03-23 12:38:12 -0500 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2020-03-23 12:38:12 -0500 |
| commit | 5dabfc0b734f0a83c9d997f1c268d25da74639cc (patch) | |
| tree | 70eca998522efcbdfcf248b7450317de31296cd3 | |
| parent | 243cbd6224921f7f5c2463705c75cb9eafd0db5c (diff) | |
| parent | 24acf825d2dca525d89602ca4d6755e67a589fd9 (diff) | |
| download | ceph-5dabfc0b734f0a83c9d997f1c268d25da74639cc.tar.gz | |
Merge PR #34122 into octopus
* refs/pull/34122/head:
cephadm: default to v15 tag for octopus
Reviewed-by: Michael Fritch <mfritch@suse.com>
| -rwxr-xr-x | src/cephadm/cephadm | 3 | ||||
| -rw-r--r-- | src/common/options.cc | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 68f0babf994..64515caa1d8 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -1,7 +1,6 @@ #!/usr/bin/python3 -#DEFAULT_IMAGE='docker.io/ceph/ceph:v15.2' -DEFAULT_IMAGE='quay.io/ceph-ci/ceph:octopus' +DEFAULT_IMAGE='docker.io/ceph/ceph:v15' 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 6b4251ba127..1354b133fae 100644 --- a/src/common/options.cc +++ b/src/common/options.cc @@ -439,8 +439,7 @@ 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("quay.io/ceph-ci/ceph:octopus"), - //.set_default("docker.io/ceph/ceph:v15.2"), + .set_default("docker.io/ceph/ceph:v15"), Option("no_config_file", Option::TYPE_BOOL, Option::LEVEL_ADVANCED) .set_default(false) |