From a890d6a04357060ab5bd9c827015a83de06e1794 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 (cherry picked from commit f277a39dfe4ea7ea7d7f211a6a554866ac519f52) --- docs/source/index.rst | 2 -- docs/source/installation/containerized.rst | 2 +- .../source/installation/non-containerized.rst | 2 -- docs/source/testing/tox.rst | 6 ---- group_vars/all.yml.sample | 2 +- group_vars/rhcs.yml.sample | 2 +- roles/ceph-defaults/defaults/main.yml | 2 +- tests/conftest.py | 2 +- tox-external_clients.ini | 3 -- tox-filestore_to_bluestore.ini | 10 ++---- tox-podman.ini | 1 - tox-shrink_osd.ini | 7 ---- tox-update.ini | 8 ++--- tox.ini | 34 +++---------------- 14 files changed, 14 insertions(+), 69 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 98c95e14f..5e5b0f6a8 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -211,7 +211,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 @@ -223,7 +222,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 f56bdec2a..a0f4b81dd 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/group_vars/all.yml.sample b/group_vars/all.yml.sample index 6640139c9..a49c50212 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -139,7 +139,7 @@ dummy: # #ceph_mirror: http://download.ceph.com #ceph_stable_key: https://download.ceph.com/keys/release.asc -#ceph_stable_release: quincy +#ceph_stable_release: nautilus #ceph_stable_repo: "{{ ceph_mirror }}/debian-{{ ceph_stable_release }}" #nfs_ganesha_stable: true # use stable repos for nfs-ganesha diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index cfb8eae24..a537da900 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -139,7 +139,7 @@ ceph_repository: rhcs # #ceph_mirror: http://download.ceph.com #ceph_stable_key: https://download.ceph.com/keys/release.asc -#ceph_stable_release: quincy +#ceph_stable_release: nautilus #ceph_stable_repo: "{{ ceph_mirror }}/debian-{{ ceph_stable_release }}" #nfs_ganesha_stable: true # use stable repos for nfs-ganesha diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 56fdce64d..ccb60978b 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -131,7 +131,7 @@ valid_ceph_repository: # ceph_mirror: http://download.ceph.com ceph_stable_key: https://download.ceph.com/keys/release.asc -ceph_stable_release: quincy +ceph_stable_release: nautilus ceph_stable_repo: "{{ ceph_mirror }}/debian-{{ ceph_stable_release }}" nfs_ganesha_stable: true # use stable repos for nfs-ganesha diff --git a/tests/conftest.py b/tests/conftest.py index 906376c11..b22e43802 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -100,7 +100,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", "nautilus") rolling_update = os.environ.get("ROLLING_UPDATE", "False") group_names = ansible_vars["group_names"] docker = ansible_vars.get("docker") diff --git a/tox-external_clients.ini b/tox-external_clients.ini index f4b890d43..bef24b007 100644 --- a/tox-external_clients.ini +++ b/tox-external_clients.ini @@ -40,7 +40,6 @@ commands= 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_stable_release=nautilus \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -53,7 +52,6 @@ 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_stable_release=nautilus \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -66,7 +64,6 @@ 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_stable_release=nautilus \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ diff --git a/tox-filestore_to_bluestore.ini b/tox-filestore_to_bluestore.ini index 79e272032..b604439d8 100644 --- a/tox-filestore_to_bluestore.ini +++ b/tox-filestore_to_bluestore.ini @@ -32,8 +32,6 @@ setenv= non_container: PLAYBOOK = site.yml.sample non_container: DEV_SETUP = True - CEPH_DOCKER_IMAGE_TAG = latest-nautilus - CEPH_STABLE_RELEASE = nautilus deps= -r{toxinidir}/tests/requirements.txt changedir={toxinidir}/tests/functional/filestore-to-bluestore{env:CONTAINER_DIR:} @@ -49,16 +47,12 @@ 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:nautilus} \ 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}/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:nautilus} \ - " + 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} - bash -c "CEPH_STABLE_RELEASE={env:UPDATE_CEPH_STABLE_RELEASE:nautilus} 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=nautilus 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 ae46e367d..f629b0762 100644 --- a/tox-podman.ini +++ b/tox-podman.ini @@ -28,7 +28,6 @@ setenv= INVENTORY = {env:_INVENTORY:hosts} PLAYBOOK = site-docker.yml.sample IS_PODMAN = TRUE - 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 bbbd8cc19..0da150fd2 100644 --- a/tox-shrink_osd.ini +++ b/tox-shrink_osd.ini @@ -70,11 +70,6 @@ setenv= container: PURGE_PLAYBOOK = purge-container-cluster.yml non_container: PLAYBOOK = site.yml.sample - CEPH_DOCKER_IMAGE_TAG = latest-nautilus - CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-nautilus - UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-nautilus - CEPH_STABLE_RELEASE = nautilus - deps= -r{toxinidir}/tests/requirements.txt changedir= shrink_osd_single: {toxinidir}/tests/functional/shrink_osd{env:CONTAINER_DIR:} @@ -92,7 +87,6 @@ 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_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -110,7 +104,6 @@ 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_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ diff --git a/tox-update.ini b/tox-update.ini index 72a8ee7ef..56d674d56 100644 --- a/tox-update.ini +++ b/tox-update.ini @@ -30,9 +30,6 @@ setenv= non_container: PLAYBOOK = site.yml.sample CEPH_DOCKER_IMAGE_TAG = latest-luminous - UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-nautilus - CEPH_STABLE_RELEASE = luminous - UPDATE_CEPH_STABLE_RELEASE = nautilus ROLLING_UPDATE = True changedir={toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:} @@ -52,7 +49,7 @@ commands= # deploy the cluster bash -c 'ANSIBLE_CONFIG={envdir}/tmp/ceph-ansible/ansible.cfg ansible-playbook -vv -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/hosts-upgrade-to-nautilus {envdir}/tmp/ceph-ansible/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ + ceph_stable_release=luminous \ 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-luminous} \ @@ -61,12 +58,11 @@ commands= pip install -r {toxinidir}/tests/requirements.txt ansible-playbook -vv -i {changedir}/hosts {toxinidir}/infrastructure-playbooks/rolling_update.yml --limit 'all:!osd4' --extra-vars "\ ireallymeanit=yes \ - ceph_stable_release={env:UPDATE_CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ " - bash -c "CEPH_STABLE_RELEASE={env:UPDATE_CEPH_STABLE_RELEASE:nautilus} py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts --hosts='ansible://osd[!s4]' --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests" + bash -c "CEPH_STABLE_RELEASE=nautilus py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts --hosts='ansible://osd[!s4]' --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests" vagrant destroy --force diff --git a/tox.ini b/tox.ini index 5a09ba16c..a748c879e 100644 --- a/tox.ini +++ b/tox.ini @@ -23,7 +23,6 @@ setenv= ANSIBLE_CALLBACK_PLUGINS = {toxinidir}/plugins/callback ANSIBLE_CALLBACK_WHITELIST = profile_tasks ANSIBLE_FILTER_PLUGINS = {toxinidir}/plugins/filter - CEPH_STABLE_RELEASE = luminous # only available for ansible >= 2.5 ANSIBLE_STDOUT_CALLBACK = yaml changedir={toxinidir}/tests/functional/migrate_ceph_disk_to_ceph_volume @@ -40,7 +39,7 @@ commands= # deploy the cluster ansible-playbook -vv -i {changedir}/hosts {envdir}/tmp/ceph-ansible/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ + ceph_stable_release=luminous \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ @@ -59,8 +58,7 @@ commands= ireallymeanit=yes \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:UPDATE_CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:UPDATE_CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \ - ceph_stable_release=nautilus \ + ceph_docker_image_tag=latest-nautilus \ osd_scenario=lvm \ " @@ -116,7 +114,6 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\ ireallymeanit=yes \ remove_packages=yes \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ " # re-setup lvm @@ -124,7 +121,6 @@ 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_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -143,7 +139,6 @@ 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_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -156,7 +151,6 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\ ireallymeanit=yes \ remove_packages=yes \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -165,9 +159,7 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml # set up the cluster again - ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ - ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ - " + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} # 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 @@ -216,7 +208,6 @@ 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_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -231,10 +222,7 @@ commands= [add-mons] 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_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ - " + ansible-playbook -vv -i {changedir}/hosts-2 {toxinidir}/infrastructure-playbooks/add-mon.yml --extra-vars ireallymeanit=yes 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 [add-osds] @@ -243,7 +231,6 @@ commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit osd1 {toxinidir}/tests/functional/lvm_setup.yml ansible-playbook -vv -i {changedir}/hosts-2 --limit osd1 {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ ireallymeanit=yes \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -255,7 +242,6 @@ 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_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -267,7 +253,6 @@ 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_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -279,7 +264,6 @@ 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_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -291,7 +275,6 @@ 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_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -309,13 +292,11 @@ commands= 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_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ 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_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -372,12 +353,8 @@ setenv= shrink_rbdmirror: RBDMIRROR_TO_KILL = rbd-mirror0 shrink_rgw: RGW_TO_KILL = rgw0.rgw0 - lvm_osds: CEPH_STABLE_RELEASE = nautilus - CEPH_DOCKER_IMAGE_TAG = latest-nautilus CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-nautilus - UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-nautilus - CEPH_STABLE_RELEASE = nautilus ooo_collocation: CEPH_DOCKER_IMAGE_TAG = latest-nautilus deps= -r{toxinidir}/tests/requirements.txt @@ -421,7 +398,6 @@ 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_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ deploy_secondary_zones=False \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ @@ -442,7 +418,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_stable_release={env:CEPH_STABLE_RELEASE:nautilus} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-nautilus}" --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-nautilus}" --extra-vars @ceph-override.json purge: {[purge]commands} purge_dashboard: {[purge-dashboard]commands}