From f277a39dfe4ea7ea7d7f211a6a554866ac519f52 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 29 Sep 2021 16:25:42 +0200 Subject: [PATCH] tests: remove all references to ceph_stable_release this is legacy and not needed anymore. Signed-off-by: Guillaume Abrioux --- docs/source/index.rst | 2 -- docs/source/installation/containerized.rst | 2 +- docs/source/installation/non-containerized.rst | 2 -- docs/source/testing/tox.rst | 6 ------ tests/conftest.py | 2 +- tox-filestore_to_bluestore.ini | 5 +---- tox-podman.ini | 1 - tox-shrink_osd.ini | 1 - tox-update.ini | 2 +- tox.ini | 1 - 10 files changed, 4 insertions(+), 20 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 9ea31ea2d..9ba499020 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -215,7 +215,6 @@ An example configuration that deploys the upstream ``octopus`` version of Ceph w ceph_origin: repository ceph_repository: community - ceph_stable_release: octopus public_network: "192.168.3.0/24" cluster_network: "192.168.4.0/24" monitor_interface: eth1 @@ -227,7 +226,6 @@ The following config options are required to be changed on all installations but selection or other aspects of your cluster. - ``ceph_origin`` -- ``ceph_stable_release`` - ``public_network`` - ``monitor_interface`` or ``monitor_address`` diff --git a/docs/source/installation/containerized.rst b/docs/source/installation/containerized.rst index 81f05b14e..b11153572 100644 --- a/docs/source/installation/containerized.rst +++ b/docs/source/installation/containerized.rst @@ -12,7 +12,7 @@ To deploy ceph in containers, you will need to set the ``containerized_deploymen containerized_deployment: true -The ``ceph_origin``, ``ceph_repository`` and ``ceph_stable_release`` variables aren't needed anymore in containerized deployment and are ignored. +The ``ceph_origin`` and ``ceph_repository`` variables aren't needed anymore in containerized deployment and are ignored. .. code-block:: console diff --git a/docs/source/installation/non-containerized.rst b/docs/source/installation/non-containerized.rst index e7b4d5d7f..af93a4896 100644 --- a/docs/source/installation/non-containerized.rst +++ b/docs/source/installation/non-containerized.rst @@ -24,8 +24,6 @@ Community repository ~~~~~~~~~~~~~~~~~~~~ If ``ceph_repository`` is set to ``community``, packages you will be by default installed from http://download.ceph.com, this can be changed by tweaking ``ceph_mirror``. -Final step is to select which Ceph release you want to install, for this you have to set ``ceph_stable_release`` accordingly. -For example, ``ceph_stable_release: luminous``. RHCS repository ~~~~~~~~~~~~~~~ diff --git a/docs/source/testing/tox.rst b/docs/source/testing/tox.rst index f58aa7cd9..ae845d2bb 100644 --- a/docs/source/testing/tox.rst +++ b/docs/source/testing/tox.rst @@ -21,12 +21,6 @@ runs of ``ceph-ansible``. The following environent variables are available for use: -* ``CEPH_STABLE_RELEASE``: (default: ``jewel``) This would configure the ``ceph-ansible`` variable ``ceph_stable_relese``. This is set - automatically when using the ``jewel-*`` or ``kraken-*`` testing scenarios. - -* ``UPDATE_CEPH_STABLE_RELEASE``: (default: ``kraken``) This would configure the ``ceph-ansible`` variable ``ceph_stable_relese`` during an ``update`` - scenario. This is set automatically when using the ``jewel-*`` or ``kraken-*`` testing scenarios. - * ``CEPH_DOCKER_REGISTRY``: (default: ``quay.ceph.io``) This would configure the ``ceph-ansible`` variable ``ceph_docker_registry``. * ``CEPH_DOCKER_IMAGE``: (default: ``ceph-ci/daemon``) This would configure the ``ceph-ansible`` variable ``ceph_docker_image``. diff --git a/tests/conftest.py b/tests/conftest.py index 68f63e9f7..415f1031d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -98,7 +98,7 @@ def node(host, request): # tox will pass in this environment variable. we need to do it this way # because testinfra does not collect and provide ansible config passed in # from using --extra-vars - ceph_stable_release = os.environ.get("CEPH_STABLE_RELEASE", "luminous") + ceph_stable_release = os.environ.get("CEPH_STABLE_RELEASE", "quincy") rolling_update = os.environ.get("ROLLING_UPDATE", "False") group_names = ansible_vars["group_names"] docker = ansible_vars.get("docker") diff --git a/tox-filestore_to_bluestore.ini b/tox-filestore_to_bluestore.ini index 2489f766d..695eff2c1 100644 --- a/tox-filestore_to_bluestore.ini +++ b/tox-filestore_to_bluestore.ini @@ -31,7 +31,6 @@ setenv= non_container: DEV_SETUP = True CEPH_DOCKER_IMAGE_TAG = latest-master - CEPH_STABLE_RELEASE = octopus deps= -r{toxinidir}/tests/requirements.txt changedir={toxinidir}/tests/functional/filestore-to-bluestore{env:CONTAINER_DIR:} @@ -49,7 +48,6 @@ 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_stable_release={env:CEPH_STABLE_RELEASE:octopus} \ ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \ ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ ceph_docker_registry_auth=True \ @@ -58,11 +56,10 @@ 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_stable_release={env:CEPH_STABLE_RELEASE:octopus} \ ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \ ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ " - bash -c "CEPH_STABLE_RELEASE={env:UPDATE_CEPH_STABLE_RELEASE:octopus} 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" + bash -c "CEPH_STABLE_RELEASE=quincy 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 diff --git a/tox-podman.ini b/tox-podman.ini index 9e0787c1c..3f9644aea 100644 --- a/tox-podman.ini +++ b/tox-podman.ini @@ -26,7 +26,6 @@ setenv= # Set the ansible inventory host file to be used according to which distrib we are running on INVENTORY = {env:_INVENTORY:hosts} PLAYBOOK = site-container.yml.sample - CEPH_STABLE_RELEASE = nautilus deps= -r{toxinidir}/tests/requirements.txt changedir= {toxinidir}/tests/functional/podman diff --git a/tox-shrink_osd.ini b/tox-shrink_osd.ini index e7961d126..b8a7c719e 100644 --- a/tox-shrink_osd.ini +++ b/tox-shrink_osd.ini @@ -72,7 +72,6 @@ setenv= CEPH_DOCKER_IMAGE_TAG = latest-master CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-master UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-master - CEPH_STABLE_RELEASE = pacific deps= -r{toxinidir}/tests/requirements.txt changedir= diff --git a/tox-update.ini b/tox-update.ini index ce89f9b7a..a1e25d1e1 100644 --- a/tox-update.ini +++ b/tox-update.ini @@ -62,6 +62,6 @@ commands= ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ " - bash -c "CEPH_STABLE_RELEASE={env:UPDATE_CEPH_STABLE_RELEASE:octopus} 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" + bash -c "CEPH_STABLE_RELEASE=quincy 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 diff --git a/tox.ini b/tox.ini index 0cb8c6415..a0f34ca92 100644 --- a/tox.ini +++ b/tox.ini @@ -318,7 +318,6 @@ setenv= CEPH_DOCKER_IMAGE_TAG = latest-master CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-master UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-master - CEPH_STABLE_RELEASE = pacific switch_to_containers: CEPH_DOCKER_IMAGE_TAG = latest-master-devel