replace 'master' references with 'main'

Because the branch'master' was renamed 'main'

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 8138ad731e49e165da37ec85936bc04b9fe76507..f20fb85b9b02f47610975a562b11ef722c707b72 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -207,7 +207,7 @@ dummy:
 #
 # Enabled when ceph_repository == 'dev'
 #
-#ceph_dev_branch: main # 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 89a6a42d84c1f0d1f907b88aab5fc4500ace5ad1..39cbe5a517226b22a69ea63924cbfe98b33c92bd 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -207,7 +207,7 @@ ceph_rhcs_version: 5
 #
 # Enabled when ceph_repository == 'dev'
 #
-#ceph_dev_branch: main # 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 182fdfb134293dbf4eb24d0365a5072f740e5dd5..1fe0d4019948c084ee89c4adf098e2effe6e937e 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -199,7 +199,7 @@ ceph_obs_repo: "https://download.opensuse.org/repositories/filesystems:/ceph:/{{
 #
 # Enabled when ceph_repository == 'dev'
 #
-ceph_dev_branch: main # 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 cafbb844409f6d3bed2a30e41930a9d7b10b8a76..975bc08d37f4c89e90413c7c53556dfa99666952 100644 (file)
--- a/tox-subset_update.ini
+++ b/tox-subset_update.ini
@@ -29,8 +29,6 @@ setenv=
   non_container: PLAYBOOK = site.yml.sample
 
   UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-pacific
-  UPDATE_CEPH_DEV_BRANCH = master
-  UPDATE_CEPH_DEV_SHA1 = latest
   ROLLING_UPDATE = True
 changedir={toxinidir}/tests/functional/subset_update{env:CONTAINER_DIR:}
 commands=
@@ -61,8 +59,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} \