RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #46502 from adk3798/default-image-master-main

Browse Source 
cephadm: master -> main updates

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Redouane Kachach <rkachach@redhat.com>
This commit is contained in:
Adam King 2022-06-06 12:48:46 -04:00 committed by GitHub
commit 6d3d48293d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cephadm/cephadm
View File

@ -44,8 +44,8 @@ from pathlib import Path
FuncT = TypeVar('FuncT', bound=Callable)
# Default container images -----------------------------------------------------
DEFAULT_IMAGE = 'quay.ceph.io/ceph-ci/ceph:master'
DEFAULT_IMAGE_IS_MASTER = True
DEFAULT_IMAGE = 'quay.ceph.io/ceph-ci/ceph:main'
DEFAULT_IMAGE_IS_MAIN = True
DEFAULT_IMAGE_RELEASE = 'quincy'
DEFAULT_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.33.4'
DEFAULT_LOKI_IMAGE = 'docker.io/grafana/loki:2.4.0'
@ -2038,7 +2038,7 @@ def infer_config(func: FuncT) -> FuncT:
def _get_default_image(ctx: CephadmContext) -> str:
if DEFAULT_IMAGE_IS_MASTER:
if DEFAULT_IMAGE_IS_MAIN:
warn = """This is a development version of cephadm.
For information regarding the latest stable release:
https://docs.ceph.com/docs/{}/cephadm/install
@ -5591,7 +5591,7 @@ def command_bootstrap(ctx):
logger.info('Please consider enabling telemetry to help improve Ceph:\n\n'
'\tceph telemetry on\n\n'
'For more information see:\n\n'
'\thttps://docs.ceph.com/docs/master/mgr/telemetry/\n')
'\thttps://docs.ceph.com/en/latest/mgr/telemetry/\n')
logger.info('Bootstrap complete.')
return 0