From: Adam King <adking@redhat.com>
Date: Thu, 2 Jun 2022 14:57:29 +0000 (-0400)
Subject: cephadm: master -> main updates
X-Git-Tag: v18.0.0~767^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fd7b0f5b09b8153ff26092cd7a37ccd1fff20b56;p=ceph.git

cephadm: master -> main updates

As part of the work to change the name of the
"master" branch to "main" in Ceph repos a few things
should change in the cephadm binary as well

Signed-off-by: Adam King <adking@redhat.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 3023337fd7e76..474434eafd8ad 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -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
@@ -5601,7 +5601,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