Skip to content

Commit 6f1554c

Browse files
committed
replace 'master' references with 'main'
Because the branch'master' was renamed 'main' Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
1 parent 99c0784 commit 6f1554c

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

group_vars/all.yml.sample

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ dummy:
207207
#
208208
# Enabled when ceph_repository == 'dev'
209209
#
210-
#ceph_dev_branch: main # development branch you would like to use e.g: master, wip-hack
210+
#ceph_dev_branch: main # development branch you would like to use e.g: main, wip-hack
211211
#ceph_dev_sha1: latest # distinct sha1 to use, defaults to 'latest' (as in latest built)
212212

213213
#nfs_ganesha_dev: false # use development repos for nfs-ganesha

group_vars/rhcs.yml.sample

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ ceph_rhcs_version: 5
207207
#
208208
# Enabled when ceph_repository == 'dev'
209209
#
210-
#ceph_dev_branch: main # development branch you would like to use e.g: master, wip-hack
210+
#ceph_dev_branch: main # development branch you would like to use e.g: main, wip-hack
211211
#ceph_dev_sha1: latest # distinct sha1 to use, defaults to 'latest' (as in latest built)
212212

213213
#nfs_ganesha_dev: false # use development repos for nfs-ganesha

roles/ceph-defaults/defaults/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ ceph_obs_repo: "https://download.opensuse.org/repositories/filesystems:/ceph:/{{
199199
#
200200
# Enabled when ceph_repository == 'dev'
201201
#
202-
ceph_dev_branch: main # development branch you would like to use e.g: master, wip-hack
202+
ceph_dev_branch: main # development branch you would like to use e.g: main, wip-hack
203203
ceph_dev_sha1: latest # distinct sha1 to use, defaults to 'latest' (as in latest built)
204204

205205
nfs_ganesha_dev: false # use development repos for nfs-ganesha

tox-subset_update.ini

-4
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ setenv=
2929
non_container: PLAYBOOK = site.yml.sample
3030

3131
UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-pacific
32-
UPDATE_CEPH_DEV_BRANCH = master
33-
UPDATE_CEPH_DEV_SHA1 = latest
3432
ROLLING_UPDATE = True
3533
changedir={toxinidir}/tests/functional/subset_update{env:CONTAINER_DIR:}
3634
commands=
@@ -61,8 +59,6 @@ commands=
6159
# mon1
6260
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --limit mon1 --tags=mons --extra-vars "\
6361
ireallymeanit=yes \
64-
ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} \
65-
ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
6662
ceph_docker_registry_auth=True \
6763
ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
6864
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \

0 commit comments

Comments
 (0)