master->main

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8d76b9754b4feb615bd2768e06504fc4ed9f5af6..81f7ee46f3d314446b1189f358ee3c315134d55c 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -41,11 +41,11 @@ This will prevent the engine merging your pull request.
 
 ### Backports (maintainers only)
 
-If you wish to see your work from 'master' being backported to a stable branch you can ping a maintainer
-so he will set the backport label on your PR. Once the PR from master is merged, a backport PR will be created by mergify,
+If you wish to see your work from 'main' being backported to a stable branch you can ping a maintainer
+so he will set the backport label on your PR. Once the PR from main is merged, a backport PR will be created by mergify,
 if there is a cherry-pick conflict you must resolv it by pulling the branch.
 
-**NEVER** push directly into a stable branch, **unless** the code from master has diverged so much that the files don't exist in the stable branch.
+**NEVER** push directly into a stable branch, **unless** the code from main has diverged so much that the files don't exist in the stable branch.
 If that happens, inform the maintainers of the reasons why you pushed directly into a stable branch, if the reason is invalid, maintainers will immediatly close your pull request.
 
 ## Good to know
@@ -77,8 +77,8 @@ You must run `./generate_group_vars_sample.sh` before you commit your changes so
 
 ### Keep your branch up-to-date
 
-Sometimes, a pull request can be subject to long discussion, reviews and comments, meantime, `master`
-moves forward so let's try to keep your branch rebased on master regularly to avoid huge conflict merge.
+Sometimes, a pull request can be subject to long discussion, reviews and comments, meantime, `main`
+moves forward so let's try to keep your branch rebased on main regularly to avoid huge conflict merge.
 A rebased branch is more likely to be merged easily & shorter.
 
 ### Organize your commits
@@ -100,4 +100,4 @@ If you've got commits fixing typos or other problems introduced by previous comm
 If you are new to Git, these links might help:
 
 - [https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History)
-- [http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html)
\ No newline at end of file
+- [http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html)

diff --git a/Makefile b/Makefile
index 68d0585f4f6bc021507885070748f0bb71ab2d1f..93d81cf391dcc81dc3f6fa2dc1a0520ed3478553 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,7 @@ tag:
            echo "$(SHORTCOMMIT) on $(BRANCH) is already tagged as $(TAG)"; \
            exit 1; \
        fi
-       if [[ "$(BRANCH)" != "master" ]] && \
+       if [[ "$(BRANCH)" != "master" || "$(BRANCH)" != "main" ]] && \
           ! [[ "$(BRANCH)" =~ ^stable- ]]; then \
                echo Cannot tag $(BRANCH); \
                exit 1; \

diff --git a/README-MULTISITE.md b/README-MULTISITE.md
index 099ae0f75d8696176f9516dd79193d78bf8b82cd..b79611e0b5c4f0ff79d9e467af9aab3ceca51b25 100644 (file)
--- a/README-MULTISITE.md
+++ b/README-MULTISITE.md
@@ -119,7 +119,7 @@ A secondary zone pulls a realm in order to sync data to it.
 Finally, The variable `rgw_zone` is set to "default" to enable compression for clusters configured without rgw multi-site.
 If multisite is configured `rgw_zone` should not be set to "default".
 
-For more detail information on multisite please visit: <https://docs.ceph.com/docs/master/radosgw/multisite/>.
+For more detail information on multisite please visit: <https://docs.ceph.com/docs/main/radosgw/multisite/>.
 
 ## Deployment Scenario #1: Single Realm & Zonegroup with Multiple Ceph Clusters
 

diff --git a/README.rst b/README.rst
index 60e6b239351e96fb009a4bc81dc41b364a459daa..87c5bab8a1223c2e36ec893c63d3734e1a95792f 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -7,5 +7,5 @@ Ansible playbooks for Ceph, the distributed filesystem.
 
 Please refer to our hosted documentation here: https://docs.ceph.com/projects/ceph-ansible/en/latest/
 
-You can view documentation for our ``stable-*`` branches by substituting ``master`` in the link
+You can view documentation for our ``stable-*`` branches by substituting ``main`` in the link
 above for the name of the branch. For example: https://docs.ceph.com/projects/ceph-ansible/en/stable-6.0/

diff --git a/contrib/backport_to_stable_branch.sh b/contrib/backport_to_stable_branch.sh
index 72d65c11ed98d62447e5055293c8c8232a29c6fa..028c08c636d0dca62a03260490cb15604c526663 100755 (executable)
--- a/contrib/backport_to_stable_branch.sh
+++ b/contrib/backport_to_stable_branch.sh
@@ -22,7 +22,7 @@ verify_commit () {
   for com in ${commit//,/ }; do
     if [[ $(git cat-file -t "$com" 2>/dev/null) != commit ]]; then
       echo "$com does not exist in your tree"
-      echo "Run 'git fetch origin master && git pull origin master'"
+      echo "Run 'git fetch origin main && git pull origin main'"
       exit 1
     fi
   done

diff --git a/contrib/push-roles-to-ansible-galaxy.sh b/contrib/push-roles-to-ansible-galaxy.sh
index 1c6971be8679942a0e30b53e5ab6f1e085515711..9308dab9dd4b8305fe9cf011cdaa9cf2553afab3 100755 (executable)
--- a/contrib/push-roles-to-ansible-galaxy.sh
+++ b/contrib/push-roles-to-ansible-galaxy.sh
@@ -22,7 +22,7 @@ function check_existing_remote {
 }
 
 function pull_origin {
-  git pull origin master
+  git pull origin main
 }
 
 function reset_hard_origin {
@@ -30,7 +30,7 @@ function reset_hard_origin {
   git checkout "$LOCAL_BRANCH"
   git fetch origin --prune
   git fetch --tags
-  git reset --hard origin/master
+  git reset --hard origin/main
 }
 
 function check_git_status {
@@ -79,9 +79,9 @@ for ROLE in $ROLES; do
   REMOTE=$ROLE
   check_existing_remote "$REMOTE"
   reset_hard_origin
-  # First we filter branches by rewriting master with the content of roles/$ROLE
+  # First we filter branches by rewriting main with the content of roles/$ROLE
   # this gives us a new commit history
-  for BRANCH in $(git branch --list --remotes "origin/stable-*" "origin/master" "origin/ansible-1.9" | cut -d '/' -f2); do
+  for BRANCH in $(git branch --list --remotes "origin/stable-*" "origin/main" "origin/ansible-1.9" | cut -d '/' -f2); do
     git checkout -B "$BRANCH" origin/"$BRANCH"
     # use || true to avoid exiting in case of 'Found nothing to rewrite'
     git filter-branch -f --prune-empty --subdirectory-filter roles/"$ROLE" || true

diff --git a/docs/source/dev/index.rst b/docs/source/dev/index.rst
index a3f56368f23da3a5183ed28d1ae296a407419319..1559f7711f5dd51ec2ddbc5eb970a310cfabf7cd 100644 (file)
--- a/docs/source/dev/index.rst
+++ b/docs/source/dev/index.rst
@@ -86,9 +86,9 @@ If a change should be backported to a ``stable-*`` Git branch:
 - Create a new pull request against the ``stable-5.0`` branch.
 - Ensure that your pull request's title has the prefix "backport:", so it's clear
   to reviewers what this is about.
-- Add a comment in your backport pull request linking to the original (master) pull request.
+- Add a comment in your backport pull request linking to the original (main) pull request.
 
-All changes to the stable branches should land in master first, so we avoid
+All changes to the stable branches should land in main first, so we avoid
 regressions.
 
 Once this is done, one of the project maintainers will tag the tip of the

diff --git a/docs/source/index.rst b/docs/source/index.rst
index 083432de4380d3d9613381f2e08be0ad36edf5c7..4d59e92141afc1a465e2bba67874013d1ca03ac9 100644 (file)
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -20,7 +20,7 @@ You can install directly from the source on GitHub by following these steps:
      $ git clone https://github.com/ceph/ceph-ansible.git
 
 - Next, you must decide which branch of ``ceph-ansible`` you wish to use. There
-  are stable branches to choose from or you could use the master branch:
+  are stable branches to choose from or you could use the main branch:
 
   .. code-block:: console
 
@@ -79,7 +79,7 @@ Releases
 
 The following branches should be used depending on your requirements. The ``stable-*``
 branches have been QE tested and sometimes receive backport fixes throughout their lifecycle.
-The ``master`` branch should be considered experimental and used with caution.
+The ``main`` branch should be considered experimental and used with caution.
 
 - ``stable-3.0`` Supports Ceph versions ``jewel`` and ``luminous``. This branch requires Ansible version ``2.4``.
 
@@ -93,7 +93,7 @@ The ``master`` branch should be considered experimental and used with caution.
 
 - ``stable-6.0`` Supports Ceph version ``pacific``. This branch requires Ansible version ``2.9``.
 
-- ``master`` Supports the master branch of Ceph. This branch requires Ansible version ``2.10``.
+- ``main`` Supports the main branch of Ceph. This branch requires Ansible version ``2.10``.
 
 .. NOTE:: ``stable-3.0`` and ``stable-3.1`` branches of ceph-ansible are deprecated and no longer maintained.
 

diff --git a/docs/source/installation/non-containerized.rst b/docs/source/installation/non-containerized.rst
index af93a4896f8bfcb8a52f785e1c86826f7d2788ee..3f137919861626c7c558cea3813008d657fa9dbc 100644 (file)
--- a/docs/source/installation/non-containerized.rst
+++ b/docs/source/installation/non-containerized.rst
@@ -44,7 +44,7 @@ Dev repository
 ~~~~~~~~~~~~~~
 
 If ``ceph_repository`` is set to ``dev``, packages you will be by default installed from https://shaman.ceph.com/, this can not be tweaked.
-You can obviously decide which branch to install with the help of  ``ceph_dev_branch`` (defaults to 'master').
+You can obviously decide which branch to install with the help of  ``ceph_dev_branch`` (defaults to 'main').
 Additionally, you can specify a SHA1 with ``ceph_dev_sha1``, defaults to 'latest' (as in latest built).
 
 Custom repository

diff --git a/docs/source/testing/tox.rst b/docs/source/testing/tox.rst
index ae845d2bbd640f512cf21e12fbb4c63b5922be60..2d5642dad8a4c87662f8c76437c51a2759693797 100644 (file)
--- a/docs/source/testing/tox.rst
+++ b/docs/source/testing/tox.rst
@@ -27,13 +27,13 @@ The following environent variables are available for use:
 
 * ``CEPH_DOCKER_IMAGE_TAG``: (default: ``latest``) This would configure the ``ceph-ansible`` variable ``ceph_docker_image_name``.
 
-* ``CEPH_DEV_BRANCH``: (default: ``master``) This would configure the ``ceph-ansible`` variable ``ceph_dev_branch`` which defines which branch we'd
+* ``CEPH_DEV_BRANCH``: (default: ``main``) This would configure the ``ceph-ansible`` variable ``ceph_dev_branch`` which defines which branch we'd
   like to install from shaman.ceph.com.
 
 * ``CEPH_DEV_SHA1``: (default: ``latest``) This would configure the ``ceph-ansible`` variable ``ceph_dev_sha1`` which defines which sha1 we'd like
   to install from shaman.ceph.com.
 
-* ``UPDATE_CEPH_DEV_BRANCH``: (default: ``master``) This would configure the ``ceph-ansible`` variable ``ceph_dev_branch`` which defines which branch we'd
+* ``UPDATE_CEPH_DEV_BRANCH``: (default: ``main``) This would configure the ``ceph-ansible`` variable ``ceph_dev_branch`` which defines which branch we'd
   like to update to from shaman.ceph.com.
 
 * ``UPDATE_CEPH_DEV_SHA1``: (default: ``latest``) This would configure the ``ceph-ansible`` variable ``ceph_dev_sha1`` which defines which sha1 we'd like

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 6f9d1153b3d8ad52245465627a962982798de176..389916275fec65863d0171e762f179657906ffdf 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -208,14 +208,14 @@ dummy:
 #
 # Enabled when ceph_repository == 'dev'
 #
-#ceph_dev_branch: master # 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
 
 # Set this to choose the version of ceph dev libraries used in the nfs-ganesha packages from shaman
-# flavors so far include: ceph_master, ceph_jewel, ceph_kraken, ceph_luminous
-#nfs_ganesha_flavor: "ceph_master"
+# flavors so far include: ceph_main, ceph_jewel, ceph_kraken, ceph_luminous
+#nfs_ganesha_flavor: "ceph_main"
 
 #ceph_iscsi_config_dev: true # special repo for deploying iSCSI gateways
 
@@ -561,7 +561,7 @@ dummy:
 # DOCKER #
 ##########
 #ceph_docker_image: "ceph/daemon"
-#ceph_docker_image_tag: latest-master
+#ceph_docker_image_tag: latest-main
 #ceph_docker_registry: quay.io
 #ceph_docker_registry_auth: false
 #ceph_docker_registry_username:
@@ -694,7 +694,7 @@ dummy:
 #grafana_uid: 472
 #grafana_datasource: Dashboard
 #grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard"
-#grafana_dashboard_version: master
+#grafana_dashboard_version: main
 #grafana_dashboard_files:
 #  - ceph-cluster.json
 #  - cephfs-overview.json

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index a3e81ceff421f97f51812cce44a6a81bc201f583..7c1a2fc56f216e04f23ef46d9f1cdfb7010eca7c 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -208,14 +208,14 @@ ceph_rhcs_version: 5
 #
 # Enabled when ceph_repository == 'dev'
 #
-#ceph_dev_branch: master # 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
 
 # Set this to choose the version of ceph dev libraries used in the nfs-ganesha packages from shaman
-# flavors so far include: ceph_master, ceph_jewel, ceph_kraken, ceph_luminous
-#nfs_ganesha_flavor: "ceph_master"
+# flavors so far include: ceph_main, ceph_jewel, ceph_kraken, ceph_luminous
+#nfs_ganesha_flavor: "ceph_main"
 
 ceph_iscsi_config_dev: false
 
@@ -694,7 +694,7 @@ grafana_container_image: registry.redhat.io/rhceph/rhceph-5-dashboard-rhel8:5
 #grafana_uid: 472
 #grafana_datasource: Dashboard
 #grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard"
-#grafana_dashboard_version: master
+#grafana_dashboard_version: main
 #grafana_dashboard_files:
 #  - ceph-cluster.json
 #  - cephfs-overview.json

diff --git a/library/cephadm_adopt.py b/library/cephadm_adopt.py
index d9472745c956dd3cc48fdb3f4d76d77b32104bf0..2059245b0aaff411367e513b8d1816bb76bdcba8 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.ceph.io/ceph/daemon-base:latest-master-devel
+    image: quay.ceph.io/ceph/daemon-base:latest-main-devel
     pull: false
     firewalld: false
 
@@ -93,7 +93,7 @@ EXAMPLES = '''
     name: mon.foo
     style: legacy
   environment:
-    CEPHADM_IMAGE: quay.ceph.io/ceph/daemon-base:latest-master-devel
+    CEPHADM_IMAGE: quay.ceph.io/ceph/daemon-base:latest-main-devel
 '''
 
 RETURN = '''#  '''

diff --git a/library/cephadm_bootstrap.py b/library/cephadm_bootstrap.py
index a1b7ebfcf64d60880cd8dcf6591cf1a85da079f6..a3ea0aa4d842cd40f83df4f45caa4f8787d61c17 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.ceph.io/ceph/daemon-base:latest-master-devel
+    image: quay.ceph.io/ceph/daemon-base:latest-main-devel
     dashboard: false
     monitoring: false
     firewalld: false
@@ -133,7 +133,7 @@ EXAMPLES = '''
   cephadm_bootstrap:
     mon_ip: 192.168.42.1
   environment:
-    CEPHADM_IMAGE: quay.ceph.io/ceph/daemon-base:latest-master-devel
+    CEPHADM_IMAGE: quay.ceph.io/ceph/daemon-base:latest-main-devel
 '''
 
 RETURN = '''#  '''

diff --git a/requirements.txt b/requirements.txt
index b8b6274aac01d5f117a8a69634242971e5154a76..3bf76b93a377aa963944002354fec7cac624d548 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-# These are Python requirements needed to run ceph-ansible master
+# These are Python requirements needed to run ceph-ansible main
 ansible>=2.10,<2.11,!=2.9.10
 netaddr
 six

diff --git a/requirements.yml b/requirements.yml
index fa3266315bb8680fb77c0d0cca1f2b2735ec06d8..53a5fbbcb0d7ece64b0d477421c9b7d9bd273184 100644 (file)
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,7 +1,7 @@
 ---
-# These are Ansible requirements needed to run ceph-ansible master
+# These are Ansible requirements needed to run ceph-ansible main
 collections:
   - name: https://opendev.org/openstack/ansible-config_template
     version: 1.2.1
     type: git
-  - name: ansible.utils
\ No newline at end of file
+  - name: ansible.utils

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index d61fc5c2d3a15f02f1966befbeb78da9c34d4130..348d54a6ccebe3d4038a281707c68db42648fbff 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -200,14 +200,14 @@ ceph_obs_repo: "https://download.opensuse.org/repositories/filesystems:/ceph:/{{
 #
 # Enabled when ceph_repository == 'dev'
 #
-ceph_dev_branch: master # 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
 
 # Set this to choose the version of ceph dev libraries used in the nfs-ganesha packages from shaman
-# flavors so far include: ceph_master, ceph_jewel, ceph_kraken, ceph_luminous
-nfs_ganesha_flavor: "ceph_master"
+# flavors so far include: ceph_main, ceph_jewel, ceph_kraken, ceph_luminous
+nfs_ganesha_flavor: "ceph_main"
 
 ceph_iscsi_config_dev: true # special repo for deploying iSCSI gateways
 
@@ -553,7 +553,7 @@ ceph_tcmalloc_max_total_thread_cache: 134217728
 # DOCKER #
 ##########
 ceph_docker_image: "ceph/daemon"
-ceph_docker_image_tag: latest-master
+ceph_docker_image_tag: latest-main
 ceph_docker_registry: quay.io
 ceph_docker_registry_auth: false
 #ceph_docker_registry_username:
@@ -686,7 +686,7 @@ grafana_container_memory: 4
 grafana_uid: 472
 grafana_datasource: Dashboard
 grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard"
-grafana_dashboard_version: master
+grafana_dashboard_version: main
 grafana_dashboard_files:
   - ceph-cluster.json
   - cephfs-overview.json

diff --git a/roles/ceph-iscsi-gw/tasks/non-container/prerequisites.yml b/roles/ceph-iscsi-gw/tasks/non-container/prerequisites.yml
index 7e3e93ebe249935e186e55328ec06db0dca91e32..1a3fe404e7650cc7bf7df6b3c6a9ece715ecc129 100644 (file)
--- a/roles/ceph-iscsi-gw/tasks/non-container/prerequisites.yml
+++ b/roles/ceph-iscsi-gw/tasks/non-container/prerequisites.yml
@@ -29,7 +29,7 @@
       block:
         - name: ceph-iscsi dependency repositories
           get_url:
-            url: "https://shaman.ceph.com/api/repos/tcmu-runner/master/latest/{{ ansible_facts['distribution'] | lower }}/{{ ansible_facts['distribution_major_version'] }}/repo?arch={{ ansible_facts['architecture'] }}"
+            url: "https://shaman.ceph.com/api/repos/tcmu-runner/main/latest/{{ ansible_facts['distribution'] | lower }}/{{ ansible_facts['distribution_major_version'] }}/repo?arch={{ ansible_facts['architecture'] }}"
             dest: '/etc/yum.repos.d/tcmu-runner-dev.repo'
             force: true
           register: result
@@ -37,7 +37,7 @@
 
         - name: ceph-iscsi development repository
           get_url:
-            url: "https://shaman.ceph.com/api/repos/{{ item }}/master/latest/{{ ansible_facts['distribution'] | lower }}/{{ ansible_facts['distribution_major_version'] }}/repo"
+            url: "https://shaman.ceph.com/api/repos/{{ item }}/main/latest/{{ ansible_facts['distribution'] | lower }}/{{ ansible_facts['distribution_major_version'] }}/repo"
             dest: '/etc/yum.repos.d/{{ item }}-dev.repo'
             force: true
           register: result

diff --git a/tests/functional/add-mdss/container/group_vars/all b/tests/functional/add-mdss/container/group_vars/all
index d1a0d265bf8a8ef8beafb1fe03d2014b8fece67b..0b1896cad078b1b21297b4e466c68baa55c35bbb 100644 (file)
--- a/tests/functional/add-mdss/container/group_vars/all
+++ b/tests/functional/add-mdss/container/group_vars/all
@@ -29,4 +29,4 @@ ceph_conf_overrides:
 dashboard_enabled: False
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
\ No newline at end of file
+ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/add-mgrs/container/group_vars/all b/tests/functional/add-mgrs/container/group_vars/all
index 82bf84833eef25e82718df1d1a67694472290d4b..9b11cb6554f72c92e61810f144294e013c2eb91f 100644 (file)
--- a/tests/functional/add-mgrs/container/group_vars/all
+++ b/tests/functional/add-mgrs/container/group_vars/all
@@ -29,4 +29,4 @@ ceph_conf_overrides:
 dashboard_enabled: False
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
\ No newline at end of file
+ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/add-mons/container/group_vars/all b/tests/functional/add-mons/container/group_vars/all
index 6e41d64cffb9e6784447b6acb325827b7196aec3..b524bd3a16779d0aa5d32e4d94ca00b6650e5af5 100644 (file)
--- a/tests/functional/add-mons/container/group_vars/all
+++ b/tests/functional/add-mons/container/group_vars/all
@@ -29,4 +29,4 @@ ceph_conf_overrides:
 dashboard_enabled: False
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
\ No newline at end of file
+ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all
index c88ef61217934e935378e2262873cbdd0492484c..e9e2722c7e9e0196270644a0d6b8a49dee4b0aa6 100644 (file)
--- a/tests/functional/add-osds/container/group_vars/all
+++ b/tests/functional/add-osds/container/group_vars/all
@@ -29,4 +29,4 @@ ceph_conf_overrides:
 dashboard_enabled: False
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
\ No newline at end of file
+ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/add-rbdmirrors/container/group_vars/all b/tests/functional/add-rbdmirrors/container/group_vars/all
index e721a4cfc1a6523727cc7f621a57addbe38eee51..9cc9001a250d339e74c33e3236b37b52a3f1baa8 100644 (file)
--- a/tests/functional/add-rbdmirrors/container/group_vars/all
+++ b/tests/functional/add-rbdmirrors/container/group_vars/all
@@ -29,4 +29,4 @@ ceph_conf_overrides:
 dashboard_enabled: False
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
\ No newline at end of file
+ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/add-rgws/container/group_vars/all b/tests/functional/add-rgws/container/group_vars/all
index fc557473e9aa43163c0a25aa8d5e0267029b96cc..696e13322fd127bb12acd6b4c25a7266eee8c323 100644 (file)
--- a/tests/functional/add-rgws/container/group_vars/all
+++ b/tests/functional/add-rgws/container/group_vars/all
@@ -31,4 +31,4 @@ rgw_bucket_default_quota_max_objects: 1638400
 dashboard_enabled: False
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
\ No newline at end of file
+ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/all-in-one/container/group_vars/all b/tests/functional/all-in-one/container/group_vars/all
index aa354409c4a5fc2e8275a55dcb150be952f4ed7a..db0605fc6c4fd8c5e976085865228a8a6efc66fd 100644 (file)
--- a/tests/functional/all-in-one/container/group_vars/all
+++ b/tests/functional/all-in-one/container/group_vars/all
@@ -45,4 +45,4 @@ lvm_volumes:
     db_vg: journals
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
\ No newline at end of file
+ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index 72406faa019838a431fb2d915f7a3745deecbd77..04746c4b89637bcb9881010c8831a77d0f47ca09 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -38,7 +38,7 @@ dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
+ceph_docker_image_tag: latest-main
 node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
 alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"

diff --git a/tests/functional/all_daemons/group_vars/nfss b/tests/functional/all_daemons/group_vars/nfss
index 8fe88721798e0d461e1a57e6ab603db252458d72..fc280e25136655e1b5203ebbc8d1190dc4703ab4 100644 (file)
--- a/tests/functional/all_daemons/group_vars/nfss
+++ b/tests/functional/all_daemons/group_vars/nfss
@@ -7,4 +7,4 @@ ganesha_conf_overrides: |
     }
 nfs_ganesha_stable: true
 nfs_ganesha_dev: false
-nfs_ganesha_flavor: "ceph_master"
+nfs_ganesha_flavor: "ceph_main"

diff --git a/tests/functional/cephadm/group_vars/all b/tests/functional/cephadm/group_vars/all
index befb220e7f855013e0773f177d9a9edc3da43da8..efe4899aa217548597c75ccf52e395b8a04ec8c9 100644 (file)
--- a/tests/functional/cephadm/group_vars/all
+++ b/tests/functional/cephadm/group_vars/all
@@ -5,5 +5,5 @@ cluster_network: "192.168.31.0/24"
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon-base
-ceph_docker_image_tag: latest-master-devel
+ceph_docker_image_tag: latest-main-devel
 containerized_deployment: true

diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all
index cd35ad9a6cf6543ed007fdefd92db7cea405e37b..543f232fc7e7daa65a759ecc0c69390bde1c1e4d 100644 (file)
--- a/tests/functional/collocation/container/group_vars/all
+++ b/tests/functional/collocation/container/group_vars/all
@@ -27,7 +27,7 @@ dashboard_admin_user_ro: true
 grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
+ceph_docker_image_tag: latest-main
 node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
 alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"

diff --git a/tests/functional/docker2podman/group_vars/all b/tests/functional/docker2podman/group_vars/all
index 7bb94dbe4fb31208695b9b75238df9aac8cc0980..d87879a511f78b292ecbc594fe6ad1e5e1caa4f4 100644 (file)
--- a/tests/functional/docker2podman/group_vars/all
+++ b/tests/functional/docker2podman/group_vars/all
@@ -35,7 +35,7 @@ dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
+ceph_docker_image_tag: latest-main
 node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
 alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"

diff --git a/tests/functional/external_clients/container/inventory/group_vars/all b/tests/functional/external_clients/container/inventory/group_vars/all
index 8eef0472855cfb6390d6cd816ac11267a6fca110..203d8868328c646ec5ce14605d3d4bf660c132f7 100644 (file)
--- a/tests/functional/external_clients/container/inventory/group_vars/all
+++ b/tests/functional/external_clients/container/inventory/group_vars/all
@@ -39,4 +39,4 @@ fsid: 40358a87-ab6e-4bdc-83db-1d909147861c
 generate_fsid: false
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
\ No newline at end of file
+ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/filestore-to-bluestore/container/group_vars/all b/tests/functional/filestore-to-bluestore/container/group_vars/all
index 279909914167d4eb306d8c8af8effefff5c46892..bab6933efdbdb670bf0bf295d820af7bd2aabf66 100644 (file)
--- a/tests/functional/filestore-to-bluestore/container/group_vars/all
+++ b/tests/functional/filestore-to-bluestore/container/group_vars/all
@@ -25,4 +25,4 @@ handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
\ No newline at end of file
+ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/lvm-auto-discovery/container/group_vars/all b/tests/functional/lvm-auto-discovery/container/group_vars/all
index 37f6b06714ef8c58e02a350f5249ed4c17018197..eb1c83456b294828be9aae4c77e8321b34d300c5 100644 (file)
--- a/tests/functional/lvm-auto-discovery/container/group_vars/all
+++ b/tests/functional/lvm-auto-discovery/container/group_vars/all
@@ -29,4 +29,4 @@ handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
\ No newline at end of file
+ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all
index 3786a7a33361ae701f625dbf807e0a340a9e89e6..b29e45c9649fc133acde49797862ae596bd2da9b 100644 (file)
--- a/tests/functional/lvm-batch/container/group_vars/all
+++ b/tests/functional/lvm-batch/container/group_vars/all
@@ -31,4 +31,4 @@ handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
\ No newline at end of file
+ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all
index 9fd809ba4a0cc7bf54abb58756f09c4d31805d35..ff664432d74ac9c1ba7ba54d485ac2db0d45e61a 100644 (file)
--- a/tests/functional/lvm-osds/container/group_vars/all
+++ b/tests/functional/lvm-osds/container/group_vars/all
@@ -39,4 +39,4 @@ openstack_pools:
   - "{{ openstack_cinder_pool }}"
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
\ No newline at end of file
+ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/ooo-collocation/hosts b/tests/functional/ooo-collocation/hosts
index ee919571f537ce7db38825b64ce745c8d436ee37..0445fb718c1f8165163c8c473a8a4e954963b0e8 100644 (file)
--- a/tests/functional/ooo-collocation/hosts
+++ b/tests/functional/ooo-collocation/hosts
@@ -11,7 +11,7 @@ all:
         rgw_keystone_url: 'http://192.168.95.10:5000', rgw_s3_auth_use_keystone: 'true', rgw_keystone_revocation_interval: 0}
     cluster: mycluster
     ceph_docker_image: ceph-ci/daemon
-    ceph_docker_image_tag: latest-master
+    ceph_docker_image_tag: latest-main
     ceph_docker_registry: quay.ceph.io
     cephfs_data_pool:
       name: 'manila_data'

diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all
index 3b5d5ff3929f1223ea7091c52ee22efa033813f3..bf94143653a0f64057ca884b5cb2380f77ecab2e 100644 (file)
--- a/tests/functional/podman/group_vars/all
+++ b/tests/functional/podman/group_vars/all
@@ -34,7 +34,7 @@ dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
+ceph_docker_image_tag: latest-main
 node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
 alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"

diff --git a/tests/functional/rgw-multisite/container/group_vars/all b/tests/functional/rgw-multisite/container/group_vars/all
index 35f25be6f0839182fbdbcb398d28abc8a02b6be5..51838aed94ab481199cfa5eb6a0215fb0dce05ba 100644 (file)
--- a/tests/functional/rgw-multisite/container/group_vars/all
+++ b/tests/functional/rgw-multisite/container/group_vars/all
@@ -30,4 +30,4 @@ ceph_conf_overrides:
 dashboard_enabled: False
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
+ceph_docker_image_tag: latest-main

diff --git a/tests/functional/rgw-multisite/container/secondary/group_vars/all b/tests/functional/rgw-multisite/container/secondary/group_vars/all
index 1a3a58021b476d4f39e7955230d817a2c2ee3099..cdb86c4fc992a21510a75679fb96ce8237a9f9de 100644 (file)
--- a/tests/functional/rgw-multisite/container/secondary/group_vars/all
+++ b/tests/functional/rgw-multisite/container/secondary/group_vars/all
@@ -30,4 +30,4 @@ ceph_conf_overrides:
 dashboard_enabled: False
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
+ceph_docker_image_tag: latest-main

diff --git a/tests/functional/shrink_mds/container/group_vars/all b/tests/functional/shrink_mds/container/group_vars/all
index 7c74f2d68d1766447664c3f8df609c02e3470244..f3c87d789eaa0df32a3febf355fcbe3f407b0ca2 100644 (file)
--- a/tests/functional/shrink_mds/container/group_vars/all
+++ b/tests/functional/shrink_mds/container/group_vars/all
@@ -18,4 +18,4 @@ dashboard_enabled: False
 copy_admin_key: True
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
\ No newline at end of file
+ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/shrink_mgr/container/group_vars/all b/tests/functional/shrink_mgr/container/group_vars/all
index b232a34f745bcc11555ef54f98c138976f856566..ed779d81bd168c3b83a737c665cf2e08f8ef801f 100644 (file)
--- a/tests/functional/shrink_mgr/container/group_vars/all
+++ b/tests/functional/shrink_mgr/container/group_vars/all
@@ -17,4 +17,4 @@ openstack_config: False
 dashboard_enabled: False
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
\ No newline at end of file
+ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/shrink_mon/container/group_vars/all b/tests/functional/shrink_mon/container/group_vars/all
index 98a9c9e86a3718e2b072c2fdb13a9016f57f4496..b35df43135798fce21da60ec410d85cd0d1c8848 100644 (file)
--- a/tests/functional/shrink_mon/container/group_vars/all
+++ b/tests/functional/shrink_mon/container/group_vars/all
@@ -17,4 +17,4 @@ openstack_config: False
 dashboard_enabled: False
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
\ No newline at end of file
+ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/shrink_osd/container/group_vars/all b/tests/functional/shrink_osd/container/group_vars/all
index 7bf97528375ca0f904a66b539d8527391aecb763..6aac0d39fc505aa172ca390e9c6defc764a91754 100644 (file)
--- a/tests/functional/shrink_osd/container/group_vars/all
+++ b/tests/functional/shrink_osd/container/group_vars/all
@@ -18,4 +18,4 @@ dashboard_enabled: False
 copy_admin_key: True
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
\ No newline at end of file
+ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/shrink_rbdmirror/container/group_vars/all b/tests/functional/shrink_rbdmirror/container/group_vars/all
index f62124dca011a7e1e0eaf5a8beaf00a8f5ae5209..bff445eca259f3f94fcff9b455816b0d7434b369 100644 (file)
--- a/tests/functional/shrink_rbdmirror/container/group_vars/all
+++ b/tests/functional/shrink_rbdmirror/container/group_vars/all
@@ -17,4 +17,4 @@ dashboard_enabled: False
 copy_admin_key: True
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
\ No newline at end of file
+ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/shrink_rgw/container/group_vars/all b/tests/functional/shrink_rgw/container/group_vars/all
index 6119863cfddf3c3e861e33ba87cf92b590158581..61e4e9c055e0af5828f40510db4c2deaf65fc339 100644 (file)
--- a/tests/functional/shrink_rgw/container/group_vars/all
+++ b/tests/functional/shrink_rgw/container/group_vars/all
@@ -19,4 +19,4 @@ dashboard_enabled: False
 copy_admin_key: True
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
\ No newline at end of file
+ceph_docker_image_tag: latest-main
\ No newline at end of file

diff --git a/tests/functional/subset_update/container/group_vars/all b/tests/functional/subset_update/container/group_vars/all
index 89a050a876d09c75b5bce06bfdc669e8e33f8d46..a0054b882c7ed3d79a9fbad388b2cbea0ac288a6 100644 (file)
--- a/tests/functional/subset_update/container/group_vars/all
+++ b/tests/functional/subset_update/container/group_vars/all
@@ -29,7 +29,7 @@ dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-master
+ceph_docker_image_tag: latest-main
 node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
 alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"

diff --git a/tests/functional/subset_update/group_vars/nfss b/tests/functional/subset_update/group_vars/nfss
index 8fe88721798e0d461e1a57e6ab603db252458d72..fc280e25136655e1b5203ebbc8d1190dc4703ab4 100644 (file)
--- a/tests/functional/subset_update/group_vars/nfss
+++ b/tests/functional/subset_update/group_vars/nfss
@@ -7,4 +7,4 @@ ganesha_conf_overrides: |
     }
 nfs_ganesha_stable: true
 nfs_ganesha_dev: false
-nfs_ganesha_flavor: "ceph_master"
+nfs_ganesha_flavor: "ceph_main"

diff --git a/tests/library/test_cephadm_bootstrap.py b/tests/library/test_cephadm_bootstrap.py
index b9bbe0453f408d5e6e043d2ff0e23c364a4f8b57..994c577c1df1f8029d621c0b6b31168adb791e10 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.ceph.io/ceph/daemon-base:latest-master-devel'
+fake_image = 'quay.ceph.io/ceph/daemon-base:latest-main-devel'
 fake_ip = '192.168.42.1'
 fake_registry = 'quay.ceph.io'
 fake_registry_user = 'foo'

diff --git a/tox-external_clients.ini b/tox-external_clients.ini
index 14f626ecb8062d94d130d2b5f602b881dbab30ef..02b2d4a1eae7c1aa2c4e072496e2208e35c87a0d 100644 (file)
--- a/tox-external_clients.ini
+++ b/tox-external_clients.ini
@@ -39,10 +39,10 @@ commands=
   # configure lvm
   ansible-playbook -vv -i {changedir}/inventory/hosts {toxinidir}/tests/functional/lvm_setup.yml
 
-  non_container: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup=True change_dir={changedir} ceph_dev_branch=master ceph_dev_sha1=latest" --tags "vagrant_setup"
+  non_container: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup=True change_dir={changedir} ceph_dev_branch=main ceph_dev_sha1=latest" --tags "vagrant_setup"
   ansible-playbook -vv -i {changedir}/inventory/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --limit 'all:!clients' --extra-vars "\
       delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
-      ceph_dev_branch=master \
+      ceph_dev_branch=main \
       ceph_dev_sha1=latest \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
@@ -56,7 +56,7 @@ commands=
       fsid=40358a87-ab6e-4bdc-83db-1d909147861c \
       external_cluster_mon_ips=192.168.31.10,192.168.31.11,192.168.31.12 \
       generate_fsid=false \
-      ceph_dev_branch=master \
+      ceph_dev_branch=main \
       ceph_dev_sha1=latest \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
@@ -70,7 +70,7 @@ commands=
       fsid=40358a87-ab6e-4bdc-83db-1d909147861c \
       external_cluster_mon_ips=192.168.31.10,192.168.31.11,192.168.31.12 \
       generate_fsid=false \
-      ceph_dev_branch=master \
+      ceph_dev_branch=main \
       ceph_dev_sha1=latest \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \

diff --git a/tox-filestore_to_bluestore.ini b/tox-filestore_to_bluestore.ini
index 44a508218fb78c9a8a542bd96748b65c8af4c9d1..e8390778e5b7fd2de665a6532d18fbedee6e8bdd 100644 (file)
--- a/tox-filestore_to_bluestore.ini
+++ b/tox-filestore_to_bluestore.ini
@@ -30,7 +30,7 @@ setenv=
   non_container: PLAYBOOK = site.yml.sample
   non_container: DEV_SETUP = True
 
-  CEPH_DOCKER_IMAGE_TAG = latest-master
+  CEPH_DOCKER_IMAGE_TAG = latest-main
 
 deps= -r{toxinidir}/tests/requirements.txt
 changedir={toxinidir}/tests/functional/filestore-to-bluestore{env:CONTAINER_DIR:}
@@ -40,7 +40,7 @@ commands=
 
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml
 
-  ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup={env:DEV_SETUP:False} change_dir={changedir} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
+  ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup={env:DEV_SETUP:False} change_dir={changedir} ceph_dev_branch={env:CEPH_DEV_BRANCH:main} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
 
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml --limit 'osd0:osd1'
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml --limit 'osd3:osd4' --tags partitions
@@ -48,7 +48,7 @@ commands=
   # deploy the cluster
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      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} \
@@ -56,7 +56,7 @@ commands=
   "
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/filestore-to-bluestore.yml --limit osds --extra-vars "\
       delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \
       ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \
   "
 

diff --git a/tox-shrink_osd.ini b/tox-shrink_osd.ini
index 6f7168d98e5557c274d8c995c7e89dec2470d5b8..c11e4176a668e9e881833974ae53eb8cf42f3295 100644 (file)
--- a/tox-shrink_osd.ini
+++ b/tox-shrink_osd.ini
@@ -69,9 +69,9 @@ setenv=
   container: PURGE_PLAYBOOK = purge-container-cluster.yml
   non_container: PLAYBOOK = site.yml.sample
 
-  CEPH_DOCKER_IMAGE_TAG = latest-master
-  CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-master
-  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-master
+  CEPH_DOCKER_IMAGE_TAG = latest-main
+  CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-main
+  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-main
 
 deps= -r{toxinidir}/tests/requirements.txt
 changedir=
@@ -80,7 +80,7 @@ changedir=
 
 
 commands=
-  ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup={env:DEV_SETUP:False} change_dir={changedir} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
+  ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup={env:DEV_SETUP:False} change_dir={changedir} ceph_dev_branch={env:CEPH_DEV_BRANCH:main} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
 
   bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
@@ -92,7 +92,7 @@ commands=
 
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      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} \
@@ -109,7 +109,7 @@ commands=
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --limit osds --extra-vars "\
       delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      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} \
@@ -118,4 +118,4 @@ commands=
   # retest to ensure OSDs are well redeployed
   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
 
-  vagrant destroy --force
\ No newline at end of file
+  vagrant destroy --force

diff --git a/tox-subset_update.ini b/tox-subset_update.ini
index 63dd5a5d2b81b29c022489dd21fccb4ae8f3234b..abec87bb8f81ea36a3a61908468c23b1c66911c0 100644 (file)
--- a/tox-subset_update.ini
+++ b/tox-subset_update.ini
@@ -28,8 +28,8 @@ setenv=
   container: PLAYBOOK = site-container.yml.sample
   non_container: PLAYBOOK = site.yml.sample
 
-  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-master
-  UPDATE_CEPH_DEV_BRANCH = master
+  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-main
+  UPDATE_CEPH_DEV_BRANCH = main
   UPDATE_CEPH_DEV_SHA1 = latest
   ROLLING_UPDATE = True
 deps= -r{toxinidir}/tests/requirements.txt
@@ -41,10 +41,10 @@ commands=
 
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml
 
-  non_container: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup=True change_dir={changedir} ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
+  non_container: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup=True change_dir={changedir} ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} \
+      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \
       ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
@@ -55,7 +55,7 @@ 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_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \
       ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
@@ -64,7 +64,7 @@ commands=
 # mon0 and mon2
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --limit 'mons:!mon1' --tags=mons --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} \
+      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \
       ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
@@ -73,7 +73,7 @@ commands=
 # upgrade mgrs
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --tags=mgrs --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} \
+      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \
       ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
@@ -82,7 +82,7 @@ commands=
 # upgrade osd1
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --limit=osd1 --tags=osds --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} \
+      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \
       ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
@@ -91,7 +91,7 @@ commands=
 # upgrade remaining osds (serially)
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --limit='osds:!osd1' --tags=osds --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} \
+      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \
       ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
@@ -100,7 +100,7 @@ commands=
 # upgrade rgws
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --tags=rgws --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} \
+      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \
       ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
@@ -109,7 +109,7 @@ commands=
 # post upgrade actions
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --tags=post_upgrade --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} \
+      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \
       ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \

diff --git a/tox-update.ini b/tox-update.ini
index f9dfb35cbd1082b2b2d40b97d04f5324e1d18dce..2261da6d8003358f114361355950a9beb7e99c2b 100644 (file)
--- a/tox-update.ini
+++ b/tox-update.ini
@@ -28,8 +28,8 @@ setenv=
   container: PLAYBOOK = site-container.yml.sample
   non_container: PLAYBOOK = site.yml.sample
 
-  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-master
-  UPDATE_CEPH_DEV_BRANCH = master
+  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-main
+  UPDATE_CEPH_DEV_BRANCH = main
   UPDATE_CEPH_DEV_SHA1 = latest
   ROLLING_UPDATE = True
 deps= -r{toxinidir}/tests/requirements.txt
@@ -43,10 +43,10 @@ commands=
   # configure lvm, we exclude osd2 given this node uses lvm batch scenario (see corresponding inventory host file)
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml --limit 'osds:!osd2'
 
-  non_container: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup=True change_dir={changedir} ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
+  non_container: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup=True change_dir={changedir} ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} \
+      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \
       ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
@@ -55,7 +55,7 @@ commands=
 
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} \
+      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \
       ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \

diff --git a/tox.ini b/tox.ini
index 45370c567bd3f3cc326a686abbda80e7a8106695..540904bab80cf641a238827d2397526f599868f5 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -45,7 +45,7 @@ commands=
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rbd_map_devices.yml --extra-vars "\
       ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} \
       ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph-ci/daemon} \
-      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \
+      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-main} \
   "
 
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\
@@ -53,7 +53,7 @@ commands=
       remove_packages=yes \
       ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} \
       ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph-ci/daemon} \
-      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \
+      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-main} \
   "
 
   # re-setup lvm, we exclude osd2 given this node uses lvm batch scenario (see corresponding inventory host file)
@@ -61,7 +61,7 @@ commands=
 
   # set up the cluster again
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars @ceph-override.json --extra-vars "\
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      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} \
@@ -76,12 +76,12 @@ commands=
       ireallymeanit=yes \
       ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} \
       ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph-ci/daemon} \
-      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \
+      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-main} \
   "
 
   # set up the cluster again
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars @ceph-override.json --extra-vars "\
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      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} \
@@ -104,7 +104,7 @@ commands=
 
   # set up the cluster again
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      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
@@ -155,7 +155,7 @@ commands=
 commands=
   ansible-playbook -vv -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-master-devel \
+      ceph_docker_image_tag=latest-main-devel \
       ceph_docker_registry=quay.ceph.io \
       ceph_docker_image=ceph-ci/daemon \
       ceph_docker_registry_auth=True \
@@ -174,7 +174,7 @@ commands=
   ansible-playbook -vv -i {changedir}/hosts-2 --limit mon1 {toxinidir}/tests/functional/setup.yml
   ansible-playbook -vv -i {changedir}/hosts-2 {toxinidir}/infrastructure-playbooks/add-mon.yml --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      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
@@ -184,7 +184,7 @@ commands=
   ansible-playbook -vv -i {changedir}/hosts-2 --limit mgrs {toxinidir}/tests/functional/setup.yml
   ansible-playbook -vv -i {changedir}/hosts-2 --limit mgrs {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      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} \
@@ -197,7 +197,7 @@ commands=
   ansible-playbook -vv -i {changedir}/hosts-2 --limit mdss {toxinidir}/tests/functional/setup.yml
   ansible-playbook -vv -i {changedir}/hosts-2 --limit mdss {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      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} \
@@ -210,7 +210,7 @@ commands=
   ansible-playbook -vv -i {changedir}/hosts-2 --limit rbdmirrors {toxinidir}/tests/functional/setup.yml
   ansible-playbook -vv -i {changedir}/hosts-2 --limit rbdmirrors {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      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} \
@@ -223,7 +223,7 @@ commands=
   ansible-playbook -vv -i {changedir}/hosts-2 --limit rgws {toxinidir}/tests/functional/setup.yml
   ansible-playbook -vv -i {changedir}/hosts-2 --limit rgws {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      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} \
@@ -236,21 +236,21 @@ commands=
   bash -c "cd {changedir}/secondary && bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}"
   bash -c "cd {changedir}/secondary && bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}/secondary"
   ansible-playbook --ssh-common-args='-F {changedir}/secondary/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey' -vv -i {changedir}/secondary/hosts {toxinidir}/tests/functional/setup.yml
-  ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup={env:DEV_SETUP:False} change_dir={changedir}/secondary ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
+  ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup={env:DEV_SETUP:False} change_dir={changedir}/secondary ceph_dev_branch={env:CEPH_DEV_BRANCH:main} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
   ansible-playbook --ssh-common-args='-F {changedir}/secondary/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey' -vv -i {changedir}/secondary/hosts {toxinidir}/tests/functional/lvm_setup.yml
   # ensure the rule isn't already present
   ansible -i localhost, all -c local -b -m iptables -a 'chain=FORWARD protocol=tcp source=192.168.0.0/16 destination=192.168.0.0/16 jump=ACCEPT action=insert rule_num=1 state=absent'
   ansible -i localhost, all -c local -b -m iptables -a 'chain=FORWARD protocol=tcp source=192.168.0.0/16 destination=192.168.0.0/16 jump=ACCEPT action=insert rule_num=1 state=present'
   ansible-playbook --ssh-common-args='-F {changedir}/secondary/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey' -vv -i {changedir}/secondary/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      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} \
       "
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --limit rgws --extra-vars "\
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      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} \
@@ -267,7 +267,7 @@ commands=
 [storage-inventory]
 commands=
   ansible-playbook -vv -i {changedir}/hosts {toxinidir}/infrastructure-playbooks/storage-inventory.yml --extra-vars "\
-    ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \
+    ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-main} \
   "
 
 [cephadm-adopt]
@@ -317,11 +317,11 @@ setenv=
   shrink_rbdmirror: RBDMIRROR_TO_KILL = rbd-mirror0
   shrink_rgw: RGW_TO_KILL = rgw0.rgw0
 
-  CEPH_DOCKER_IMAGE_TAG = latest-master
-  CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-master
-  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-master
+  CEPH_DOCKER_IMAGE_TAG = latest-main
+  CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-main
+  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-main
 
-  switch_to_containers: CEPH_DOCKER_IMAGE_TAG = latest-master-devel
+  switch_to_containers: CEPH_DOCKER_IMAGE_TAG = latest-main-devel
 
 deps= -r{toxinidir}/tests/requirements.txt
 changedir=
@@ -355,7 +355,7 @@ changedir=
 commands=
   ansible-galaxy install -r {toxinidir}/requirements.yml -v
   rhcs: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "change_dir={changedir}" --tags "vagrant_setup"
-  non_container: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup={env:DEV_SETUP:False} change_dir={changedir} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
+  non_container: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup={env:DEV_SETUP:False} change_dir={changedir} ceph_dev_branch={env:CEPH_DEV_BRANCH:main} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
 
   bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
@@ -370,7 +370,7 @@ commands=
 
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       deploy_secondary_zones=False \
-      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      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} \
@@ -387,7 +387,7 @@ commands=
   all_daemons,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_in_one,collocation: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "delegate_facts_host={env:DELEGATE_FACTS_HOST:True} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-master} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --extra-vars @ceph-override.json
+  all_daemons,all_in_one,collocation: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "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}" --extra-vars @ceph-override.json
 
   purge: {[purge]commands}
   purge_dashboard: {[purge-dashboard]commands}