ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace 'master' references with 'main' 

Because the branch'master' was renamed 'main'

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/7268/head
Guillaume Abrioux 2022-08-03 07:43:35 +02:00
parent c3b4e38101
commit 0ce39416e8
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/all.yml.sample
View File

@ -207,7 +207,7 @@ dummy:
# #
# Enabled when ceph_repository == 'dev' # 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) #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 #nfs_ganesha_dev: false # use development repos for nfs-ganesha

2
group_vars/rhcs.yml.sample
View File

@ -207,7 +207,7 @@ ceph_rhcs_version: 5
# #
# Enabled when ceph_repository == 'dev' # 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) #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 #nfs_ganesha_dev: false # use development repos for nfs-ganesha

2
roles/ceph-defaults/defaults/main.yml
View File

@ -199,7 +199,7 @@ ceph_obs_repo: "https://download.opensuse.org/repositories/filesystems:/ceph:/{{
# #
# Enabled when ceph_repository == 'dev' # 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) 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 nfs_ganesha_dev: false # use development repos for nfs-ganesha

4
tox-subset_update.ini
View File

@ -29,8 +29,6 @@ setenv=
non_container: PLAYBOOK = site.yml.sample non_container: PLAYBOOK = site.yml.sample
UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-pacific UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-pacific
UPDATE_CEPH_DEV_BRANCH = master
UPDATE_CEPH_DEV_SHA1 = latest
ROLLING_UPDATE = True ROLLING_UPDATE = True
changedir={toxinidir}/tests/functional/subset_update{env:CONTAINER_DIR:} changedir={toxinidir}/tests/functional/subset_update{env:CONTAINER_DIR:}
commands= commands=
@ -61,8 +59,6 @@ commands=
# mon1 # mon1
ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --limit mon1 --tags=mons --extra-vars "\ ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --limit mon1 --tags=mons --extra-vars "\
ireallymeanit=yes \ 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_auth=True \
ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \