From 16cf0de8a4c362181b7ea5709db2bb7eae4d0931 Mon Sep 17 00:00:00 2001 From: Logan V Date: Mon, 6 Aug 2018 11:15:59 -0500 Subject: [PATCH] Revert "Work around nested virt issues on OVH test nodes" The nested virt issues we saw on OVH should be resolved now. More information here: I980cdbc67d6e7b3a8a2520b2279ff3a1cdf68c4b This reverts commit cc98ed84f166cc7dd09ff0157764b3f4d06391b6. Change-Id: Ia3d5ca1c3490ee9dbc50a4a7a9207157cbb9f5fd (cherry picked from commit aa5375548d5d76220646003437b74c055df5b99b) --- tests/roles/bootstrap-host/tasks/prepare_aio_config.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml index 5d48bca162..32d28bfafb 100644 --- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml +++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml @@ -66,19 +66,12 @@ when: - nodepool_dir.stat.exists block: - # OVH nodepool nodes have an issue which causes nested virt - # instances to crash with a hardware error, then a dump. - # We therefore detect whether we're running on OVH and - # force it to use qemu instead. - name: Discover the OpenStack-Infra mirrors shell: | source /etc/ci/mirror_info.sh NODEPOOL_OVERRIDES="/etc/openstack_deploy/user_openstackci.yml" echo "uca_apt_repo_url: '${NODEPOOL_UCA_MIRROR}'" >> ${NODEPOOL_OVERRIDES} echo "openstack_hosts_centos_mirror_url: '${NODEPOOL_CENTOS_MIRROR}'" >> ${NODEPOOL_OVERRIDES} - if [[ ${NODEPOOL_PYPI_MIRROR} == *.ovh.* ]]; then - echo "nova_virt_type: 'qemu'" >> ${NODEPOOL_OVERRIDES} - fi echo "repo_build_pip_default_index: '${NODEPOOL_PYPI_MIRROR}'" >> ${NODEPOOL_OVERRIDES} args: executable: /bin/bash