mirror of https://github.com/ceph/ceph-ansible.git
replace 'master' references with 'main'
Because the branch'master' was renamed 'main' Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>pull/7285/head
parent
99c07843be
commit
6f1554c88f
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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} \
|
||||
|
|
Loading…
Reference in New Issue