diff --git a/docs/source/index.rst b/docs/source/index.rst index c26b6b619..11cd00c6b 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/group_vars/all.yml.sample b/group_vars/all.yml.sample index 65dc40300..5c7fe21ed 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -139,7 +139,7 @@ dummy: # #ceph_mirror: https://download.ceph.com #ceph_stable_key: https://download.ceph.com/keys/release.asc -#ceph_stable_release: quincy +#ceph_stable_release: pacific #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 2d2c7da77..edef99f08 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -139,7 +139,7 @@ ceph_repository: rhcs # #ceph_mirror: https://download.ceph.com #ceph_stable_key: https://download.ceph.com/keys/release.asc -#ceph_stable_release: quincy +#ceph_stable_release: pacific #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 bd1a619ab..d65cdd533 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -131,7 +131,7 @@ valid_ceph_repository: # ceph_mirror: https://download.ceph.com ceph_stable_key: https://download.ceph.com/keys/release.asc -ceph_stable_release: quincy +ceph_stable_release: pacific ceph_stable_repo: "{{ ceph_mirror }}/debian-{{ ceph_stable_release }}" nfs_ganesha_stable: true # use stable repos for nfs-ganesha diff --git a/roles/ceph-validate/tasks/main.yml b/roles/ceph-validate/tasks/main.yml index ef8dccd43..9723a6029 100644 --- a/roles/ceph-validate/tasks/main.yml +++ b/roles/ceph-validate/tasks/main.yml @@ -23,7 +23,7 @@ when: - ceph_origin == 'repository' - ceph_repository == 'community' - - ceph_stable_release not in ['pacific'] + - ceph_stable_release != 'pacific' - name: validate osd_objectstore fail: diff --git a/tests/conftest.py b/tests/conftest.py index dfd167552..de95979f2 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", "pacific") 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 687f2cf94..1bebcdecc 100644 --- a/tox-external_clients.ini +++ b/tox-external_clients.ini @@ -26,7 +26,6 @@ setenv= container: CONTAINER_DIR = /container container: PLAYBOOK = site-container.yml.sample non_container: PLAYBOOK = site.yml.sample - non_container: CEPH_STABLE_RELEASE = pacific deps= -r{toxinidir}/tests/requirements.txt changedir={toxinidir}/tests/functional/external_clients{env:CONTAINER_DIR:} @@ -41,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={env:CEPH_STABLE_RELEASE:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -54,25 +52,23 @@ 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={env:CEPH_STABLE_RELEASE:pacific} \ 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:CEPH_STABLE_RELEASE:pacific} py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/inventory/external_clients-hosts --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests/test_install.py::TestCephConf" + bash -c "CEPH_STABLE_RELEASE=pacific py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/inventory/external_clients-hosts --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests/test_install.py::TestCephConf" ansible-playbook -vv -i {changedir}/inventory/external_clients-hosts {toxinidir}/infrastructure-playbooks/rolling_update.yml --extra-vars "\ ireallymeanit=yes \ 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={env:CEPH_STABLE_RELEASE:pacific} \ 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:CEPH_STABLE_RELEASE:pacific} py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/inventory/external_clients-hosts --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests/test_install.py::TestCephConf" + bash -c "CEPH_STABLE_RELEASE=pacific py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/inventory/external_clients-hosts --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests/test_install.py::TestCephConf" vagrant destroy --force diff --git a/tox-filestore_to_bluestore.ini b/tox-filestore_to_bluestore.ini index a785bcddd..deccdf93d 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-pacific - CEPH_STABLE_RELEASE = pacific deps= -r{toxinidir}/tests/requirements.txt changedir={toxinidir}/tests/functional/filestore-to-bluestore{env:CONTAINER_DIR:} @@ -47,16 +46,14 @@ 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:pacific} \ 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:pacific} \ " - bash -c "CEPH_STABLE_RELEASE={env:CEPH_STABLE_RELEASE:pacific} 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=pacific 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-shrink_osd.ini b/tox-shrink_osd.ini index a8fa7300c..0502604e1 100644 --- a/tox-shrink_osd.ini +++ b/tox-shrink_osd.ini @@ -72,7 +72,6 @@ setenv= CEPH_DOCKER_IMAGE_TAG = latest-pacific CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-pacific UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-pacific - CEPH_STABLE_RELEASE = pacific deps= -r{toxinidir}/tests/requirements.txt changedir= @@ -91,7 +90,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:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -107,7 +105,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:pacific} \ 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 ef9541fe2..d610178a1 100644 --- a/tox-update.ini +++ b/tox-update.ini @@ -30,8 +30,6 @@ setenv= CEPH_DOCKER_IMAGE_TAG = latest-octopus UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-pacific - CEPH_STABLE_RELEASE = octopus - UPDATE_CEPH_STABLE_RELEASE = pacific ROLLING_UPDATE = True deps= -r{toxinidir}/tests/requirements.txt changedir={toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:} @@ -53,7 +51,6 @@ commands= # When rendering the ganesha.conf.j2 template, it complains because of undefined variables in the block "{% if nfs_obj_gw | bool %}" although we explicitly set this variable to false (see below). 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 {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:octopus} \ 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-octopus} \ @@ -68,7 +65,6 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --extra-vars "\ ireallymeanit=yes \ - ceph_stable_release={env:UPDATE_CEPH_STABLE_RELEASE:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -76,6 +72,6 @@ commands= nfs_obj_gw=False \ " - bash -c "CEPH_STABLE_RELEASE={env:UPDATE_CEPH_STABLE_RELEASE:pacific} 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=pacific 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 3fe44e185..9124558c0 100644 --- a/tox.ini +++ b/tox.ini @@ -61,7 +61,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:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -80,7 +79,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:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -101,9 +99,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:pacific} \ - " + 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 @@ -152,7 +148,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:pacific} \ ceph_docker_image_tag=latest-pacific-devel \ ceph_docker_registry=quay.ceph.io \ ceph_docker_image=ceph-ci/daemon \ @@ -170,10 +165,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:pacific} \ - " + 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-mgrs] @@ -181,7 +173,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:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -193,7 +184,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:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -205,7 +195,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:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -217,7 +206,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:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -235,13 +223,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:pacific} \ 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:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -307,7 +293,6 @@ setenv= CEPH_DOCKER_IMAGE_TAG = latest-pacific CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-pacific - CEPH_STABLE_RELEASE = pacific switch_to_containers: CEPH_DOCKER_IMAGE_TAG = latest-pacific-devel @@ -356,7 +341,6 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ deploy_secondary_zones=False \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific} \ ceph_docker_registry_auth=True \ ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \ ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ @@ -372,7 +356,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-pacific} ceph_stable_release={env:CEPH_STABLE_RELEASE:pacific}" --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-pacific}" --extra-vars @ceph-override.json purge: {[purge]commands} purge_dashboard: {[purge-dashboard]commands}