openstack/openstack-ansible
Code Issues Proposed changes

Merge "Work around nested virt issues on OVH test nodes"

Browse Source
This commit is contained in:
Zuul
2018-04-05 20:37:29 +00:00
committed by Gerrit Code Review
parent 20387b4d43 cc98ed84f1
commit 3dc59da68a
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
View File

@@ -62,6 +62,10 @@
path: /etc/nodepool path: /etc/nodepool
register: nodepool_dir register: nodepool_dir
# 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 - name: Discover the OpenStack-Infra mirrors
shell: | shell: |
source /etc/ci/mirror_info.sh source /etc/ci/mirror_info.sh
@@ -70,6 +74,9 @@
echo "openstack_hosts_centos_mirror_url: '${NODEPOOL_CENTOS_MIRROR}'" >> ${NODEPOOL_OVERRIDES} echo "openstack_hosts_centos_mirror_url: '${NODEPOOL_CENTOS_MIRROR}'" >> ${NODEPOOL_OVERRIDES}
echo "opensuse_mirror: '${NODEPOOL_OPENSUSE_MIRROR}'" >> ${NODEPOOL_OVERRIDES} echo "opensuse_mirror: '${NODEPOOL_OPENSUSE_MIRROR}'" >> ${NODEPOOL_OVERRIDES}
echo "opensuse_mirror_obs: 'http://download.opensuse.org'" >> ${NODEPOOL_OVERRIDES} echo "opensuse_mirror_obs: 'http://download.opensuse.org'" >> ${NODEPOOL_OVERRIDES}
if [[ ${NODEPOOL_PYPI_MIRROR} == *.ovh.* ]]; then
echo "nova_virt_type: 'qemu'" >> ${NODEPOOL_OVERRIDES}
fi
args: args:
executable: /bin/bash executable: /bin/bash
when: when: