replace 'master' references with 'main'

All references to 'master' have been replaced with 'main' from many repositories in the Ceph organization. cephadm-ansible must follow the same. Signed-off-by: Guillaume Abrioux <[email protected]> (cherry picked from commit 58edb13)
ceph · Aug 16, 2022 · ce5aff3 · ce5aff3
1 parent 336c722
commit ce5aff3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -131,7 +131,7 @@ Options:
 **default**: quincy
 
 `ceph_dev_branch`: The development branch to be used in shaman when `ceph_origin` is 'shaman'.\
-**default**: master
+**default**: main
 
 `ceph_dev_sha1`: The sha1 corresponding to the build to be used when `ceph_origin` is 'shaman'.\
 **default**: latest

diff --git a/ceph_defaults/defaults/main.yml b/ceph_defaults/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 ceph_origin: community
-ceph_dev_branch: master
+ceph_dev_branch: main
 ceph_dev_sha1: latest
 ceph_rhcs_version: 5
 ceph_mirror: https://download.ceph.com

diff --git a/doc/source/index.rst b/doc/source/index.rst
@@ -190,7 +190,7 @@ ceph_dev_branch
   The development branch to be used in shaman when `ceph_origin` is 'shaman'.
 
 **default**
-  "master"
+  "main"
 
 ceph_dev_sha1
 ~~~~~~~~~~~~~

diff --git a/library/cephadm_bootstrap.py b/library/cephadm_bootstrap.py
@@ -134,7 +134,7 @@
   cephadm_bootstrap:
     mon_ip: 192.168.42.1
     fsid: 3c9ba63a-c7df-4476-a1e7-317dfc711f82
-    image: quay.ceph.io/ceph/daemon-base:latest-master-devel
+    image: quay.ceph.io/ceph/daemon-base:latest-main-devel
     dashboard: false
     monitoring: false
     firewalld: false
@@ -143,7 +143,7 @@
   cephadm_bootstrap:
     mon_ip: 192.168.42.1
   environment:
-    CEPHADM_IMAGE: quay.ceph.io/ceph/daemon-base:latest-master-devel
+    CEPHADM_IMAGE: quay.ceph.io/ceph/daemon-base:latest-main-devel
 '''
 
 RETURN = '''#  '''

diff --git a/tests/library/test_cephadm_bootstrap.py b/tests/library/test_cephadm_bootstrap.py
@@ -4,7 +4,7 @@
 import cephadm_bootstrap
 
 fake_fsid = '0f1e0605-db0b-485c-b366-bd8abaa83f3b'
-fake_image = 'quay.ceph.io/ceph/daemon-base:latest-master-devel'
+fake_image = 'quay.ceph.io/ceph/daemon-base:latest-main-devel'
 fake_ip = '192.168.42.1'
 fake_registry = 'quay.ceph.io'
 fake_registry_user = 'foo'