replace main references with reef

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

diff --git a/library/cephadm_adopt.py b/library/cephadm_adopt.py
index 723e0a46ce03b4b9b170b250bb70038ba67f53cb..786045130b9cd7c8589df24ac1fd0c583caa5758 100644 (file)
--- a/library/cephadm_adopt.py
+++ b/library/cephadm_adopt.py
@@ -84,7 +84,7 @@ EXAMPLES = '''
   cephadm_adopt:
     name: mon.foo
     style: legacy
-    image: quay.io/ceph/daemon-base:latest-main-devel
+    image: quay.io/ceph/daemon-base:latest-reef-devel
     pull: false
     firewalld: false
 
@@ -93,7 +93,7 @@ EXAMPLES = '''
     name: mon.foo
     style: legacy
   environment:
-    CEPHADM_IMAGE: quay.io/ceph/daemon-base:latest-main-devel
+    CEPHADM_IMAGE: quay.io/ceph/daemon-base:latest-reef-devel
 '''
 
 RETURN = '''#  '''

diff --git a/library/cephadm_bootstrap.py b/library/cephadm_bootstrap.py
index f7d2cbdca5e87513a29f31835b4359884d9a78d4..7faefc7a7d5b9fdda776029671d50ed114249d4d 100644 (file)
--- a/library/cephadm_bootstrap.py
+++ b/library/cephadm_bootstrap.py
@@ -124,7 +124,7 @@ EXAMPLES = '''
   cephadm_bootstrap:
     mon_ip: 192.168.42.1
     fsid: 3c9ba63a-c7df-4476-a1e7-317dfc711f82
-    image: quay.io/ceph/daemon-base:latest-main-devel
+    image: quay.io/ceph/daemon-base:latest-reef-devel
     dashboard: false
     monitoring: false
     firewalld: false
@@ -133,7 +133,7 @@ EXAMPLES = '''
   cephadm_bootstrap:
     mon_ip: 192.168.42.1
   environment:
-    CEPHADM_IMAGE: quay.io/ceph/daemon-base:latest-main-devel
+    CEPHADM_IMAGE: quay.io/ceph/daemon-base:latest-reef-devel
 '''
 
 RETURN = '''#  '''

diff --git a/tests/library/test_cephadm_bootstrap.py b/tests/library/test_cephadm_bootstrap.py
index 9a905d780118506ede86defe502c9189f9dd57e0..55d0fda42b9c8957a7bc7073df89aec4e6b2af20 100644 (file)
--- a/tests/library/test_cephadm_bootstrap.py
+++ b/tests/library/test_cephadm_bootstrap.py
@@ -4,7 +4,7 @@ import ca_test_common
 import cephadm_bootstrap
 
 fake_fsid = '0f1e0605-db0b-485c-b366-bd8abaa83f3b'
-fake_image = 'quay.io/ceph/daemon-base:latest-main-devel'
+fake_image = 'quay.io/ceph/daemon-base:latest-reef-devel'
 fake_ip = '192.168.42.1'
 fake_registry = 'quay.io'
 fake_registry_user = 'foo'

diff --git a/tox-rbdmirror.ini b/tox-rbdmirror.ini
index 38bc4dffee7f5f77afbaa0f74b976e23d243a110..fc8701330714ec866b5f9fe52c53f11175c571ad 100644 (file)
--- a/tox-rbdmirror.ini
+++ b/tox-rbdmirror.ini
@@ -32,7 +32,7 @@ setenv=
   container: CEPH_RBD_MIRROR_REMOTE_MON_HOSTS = 192.168.144.10
   non_container: CEPH_RBD_MIRROR_REMOTE_MON_HOSTS = 192.168.140.10
 
-  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-main
+  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-reef
   UPDATE_CEPH_DEV_BRANCH = main
   UPDATE_CEPH_DEV_SHA1 = latest
   ROLLING_UPDATE = True

diff --git a/tox-shrink_osd.ini b/tox-shrink_osd.ini
index 077eb3e53cbc903fa06b639071d3d75ed9efd5a1..ddb60220a0149aa5a0b833aaeea3f24e733a4a15 100644 (file)
--- a/tox-shrink_osd.ini
+++ b/tox-shrink_osd.ini
@@ -70,9 +70,9 @@ setenv=
   container: PURGE_PLAYBOOK = purge-container-cluster.yml
   non_container: PLAYBOOK = site.yml.sample
 
-  CEPH_DOCKER_IMAGE_TAG = latest-main
+  CEPH_DOCKER_IMAGE_TAG = latest-reef
   CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-main
-  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-main
+  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-reef
 
 deps= -r{toxinidir}/tests/requirements.txt
 changedir=

diff --git a/tox-subset_update.ini b/tox-subset_update.ini
index fe814898cb046ae2336fd98785e28b9cf79bbc07..6a2180c50010d785a4151c184c32d081ec2369ce 100644 (file)
--- a/tox-subset_update.ini
+++ b/tox-subset_update.ini
@@ -29,7 +29,7 @@ setenv=
   container: PLAYBOOK = site-container.yml.sample
   non_container: PLAYBOOK = site.yml.sample
 
-  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-main
+  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-reef
   UPDATE_CEPH_DEV_BRANCH = main
   UPDATE_CEPH_DEV_SHA1 = latest
   ROLLING_UPDATE = True

diff --git a/tox-update.ini b/tox-update.ini
index 33b67502aeb3e55e50bf293c0f32aec46a52b3b4..502b136726828c83f02486e512c35a840e564f91 100644 (file)
--- a/tox-update.ini
+++ b/tox-update.ini
@@ -29,7 +29,7 @@ setenv=
   container: PLAYBOOK = site-container.yml.sample
   non_container: PLAYBOOK = site.yml.sample
 
-  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-main
+  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-reef
   UPDATE_CEPH_DEV_BRANCH = main
   UPDATE_CEPH_DEV_SHA1 = latest
   ROLLING_UPDATE = True

diff --git a/tox.ini b/tox.ini
index 264223d4554a907f125d6b26e9bb85568453791c..4302539db3e5995c3385bb41dd6bd6c68876d83c 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -46,7 +46,7 @@ commands=
   ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rbd_map_devices.yml --extra-vars "\
       ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \
       ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon-base} \
-      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-main} \
+      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-reef} \
   "
 
   ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\
@@ -54,7 +54,7 @@ commands=
       remove_packages=yes \
       ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \
       ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon-base} \
-      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-main} \
+      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-reef} \
   "
 
   # re-setup lvm, we exclude osd2 given this node uses lvm batch scenario (see corresponding inventory host file)
@@ -63,8 +63,6 @@ commands=
   # set up the cluster again
   ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars @ceph-override.json --extra-vars "\
       yes_i_know=true \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \
-      ceph_dev_sha1={env: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} \
@@ -78,14 +76,12 @@ commands=
       ireallymeanit=yes \
       ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \
       ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon-base} \
-      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-main} \
+      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-reef} \
   "
 
   # set up the cluster again
   ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars @ceph-override.json --extra-vars "\
       yes_i_know=true \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \
-      ceph_dev_sha1={env: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} \
@@ -108,8 +104,6 @@ commands=
   # set up the cluster again
   ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       yes_i_know=true \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \
-      ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \
   "
   # test that the cluster can be redeployed in a healthy state
   py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests
@@ -159,7 +153,7 @@ commands=
 commands=
   ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml --extra-vars "\
       ireallymeanit=yes \
-      ceph_docker_image_tag=latest-main-devel \
+      ceph_docker_image_tag=latest-reef-devel \
       ceph_docker_registry=quay.io \
       ceph_docker_image=ceph/daemon-base \
       ceph_docker_registry_auth=True \
@@ -178,8 +172,6 @@ commands=
   ansible-playbook -vv --diff -i {changedir}/hosts-2 --limit mon1 {toxinidir}/tests/functional/setup.yml
   ansible-playbook -vv --diff -i {changedir}/hosts-2 {toxinidir}/infrastructure-playbooks/add-mon.yml --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \
-      ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \
       "
   py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts-2 --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests
 
@@ -189,8 +181,6 @@ commands=
   ansible-playbook -vv --diff -i {changedir}/hosts-2 --limit mgrs {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       yes_i_know=true \
       ireallymeanit=yes \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \
-      ceph_dev_sha1={env: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} \
@@ -203,8 +193,6 @@ commands=
   ansible-playbook -vv --diff -i {changedir}/hosts-2 --limit mdss {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       yes_i_know=true \
       ireallymeanit=yes \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \
-      ceph_dev_sha1={env: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} \
@@ -217,8 +205,6 @@ commands=
   ansible-playbook -vv --diff -i {changedir}/hosts-2 --limit rbdmirrors {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       yes_i_know=true \
       ireallymeanit=yes \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \
-      ceph_dev_sha1={env: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} \
@@ -231,8 +217,6 @@ commands=
   ansible-playbook -vv --diff -i {changedir}/hosts-2 --limit rgws {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       yes_i_know=true \
       ireallymeanit=yes \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \
-      ceph_dev_sha1={env: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} \
@@ -242,7 +226,7 @@ commands=
 [storage-inventory]
 commands=
   ansible-playbook -vv --diff -i {changedir}/hosts {toxinidir}/infrastructure-playbooks/storage-inventory.yml --extra-vars "\
-    ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-main} \
+    ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-reef} \
   "
 
 [cephadm-adopt]
@@ -292,11 +276,11 @@ setenv=
   shrink_rbdmirror: RBDMIRROR_TO_KILL = rbd-mirror0
   shrink_rgw: RGW_TO_KILL = rgw0.rgw0
 
-  CEPH_DOCKER_IMAGE_TAG = latest-main
-  CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-main
-  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-main
+  CEPH_DOCKER_IMAGE_TAG = latest-reef
+  CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-reef
+  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-reef
 
-  switch_to_containers: CEPH_DOCKER_IMAGE_TAG = latest-main-devel
+  switch_to_containers: CEPH_DOCKER_IMAGE_TAG = latest-reef-devel
 
 deps= -r{toxinidir}/tests/requirements.txt
 changedir=
@@ -342,8 +326,6 @@ commands=
   ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       no_log_on_ceph_key_tasks=false \
       yes_i_know=true \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \
-      ceph_dev_sha1={env: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} \
@@ -359,7 +341,7 @@ commands=
   all_daemons,all_daemons_ipv6,collocation: py.test --reruns 20 --reruns-delay 3 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests
 
   # handlers/idempotency test
-  all_daemons,all_daemon_ipv6,all_in_one,collocation: ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "no_log_on_ceph_key_tasks=false delegate_facts_host={env:DELEGATE_FACTS_HOST:True} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-main} ceph_dev_branch={env:CEPH_DEV_BRANCH:main} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} yes_i_know=true" --extra-vars @ceph-override.json
+  all_daemons,all_daemon_ipv6,all_in_one,collocation: ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "no_log_on_ceph_key_tasks=false delegate_facts_host={env:DELEGATE_FACTS_HOST:True} yes_i_know=true" --extra-vars @ceph-override.json
 
   purge: {[purge]commands}
   purge_dashboard: {[purge-dashboard]commands}