replace 'master' references with 'main'

Because the branch'master' was renamed 'main'

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 0ce39416e8dcd8d5b1093492df4b7e275fc3abc1)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 4278fae141ec5d1c37cac0846e2bda5ffd33245f..923028ed9b5e7872c3fc4c84b5227ea10ac10ff8 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -194,7 +194,7 @@ dummy:
 #
 # Enabled when ceph_repository == 'dev'
 #
-#ceph_dev_branch: master # development branch you would like to use e.g: master, wip-hack
+#ceph_dev_branch: main # development branch you would like to use e.g: main, wip-hack
 #ceph_dev_sha1: latest # distinct sha1 to use, defaults to 'latest' (as in latest built)
 
 #nfs_ganesha_dev: false # use development repos for nfs-ganesha

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 74330da310a9d7f86ef5938d2897c6a98bb2ce7b..8c7c76c008f586edab6437e36e864b076c1dfbfe 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -194,7 +194,7 @@ ceph_rhcs_version: 4
 #
 # Enabled when ceph_repository == 'dev'
 #
-#ceph_dev_branch: master # development branch you would like to use e.g: master, wip-hack
+#ceph_dev_branch: main # development branch you would like to use e.g: main, wip-hack
 #ceph_dev_sha1: latest # distinct sha1 to use, defaults to 'latest' (as in latest built)
 
 #nfs_ganesha_dev: false # use development repos for nfs-ganesha

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 5c25cf3450ec234f29c0d50f008d69c1ed969a02..46490f12d2c4b5341e8dbd01ac057b83135c4bd4 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -186,7 +186,7 @@ ceph_obs_repo: "https://download.opensuse.org/repositories/filesystems:/ceph:/{{
 #
 # Enabled when ceph_repository == 'dev'
 #
-ceph_dev_branch: master # development branch you would like to use e.g: master, wip-hack
+ceph_dev_branch: main # development branch you would like to use e.g: main, wip-hack
 ceph_dev_sha1: latest # distinct sha1 to use, defaults to 'latest' (as in latest built)
 
 nfs_ganesha_dev: false # use development repos for nfs-ganesha

diff --git a/tox-subset_update.ini b/tox-subset_update.ini
index cecd393b63e3d7dee33419a87a380dd5058bf17c..9894bae015d1dfd75fb60c1bd8f221e85a1c8c2d 100644 (file)
--- a/tox-subset_update.ini
+++ b/tox-subset_update.ini
@@ -49,8 +49,6 @@ commands=
 # mon1
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --limit mon1 --tags=mons --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} \
-      ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \