openstack/kayobe
Code Issues Proposed changes

Prevent use of KVM for Tenks VMs in CI

Browse Source 
Currently nested virtualisation under KVM does not seem to be working in
CI. This breaks the 'bare metal' deployment testing using Tenks, which
lead us to disable it in 749ef8243e9ae855cf8ceb54dc3f88c6c1b2fea0.

This commit forces Tenks to use QEMU for its VMs, allowing us to revert
commit 749ef8243e9ae855cf8ceb54dc3f88c6c1b2fea0..

Change-Id: Id382c218f3b37979341f0d96718a6011a1d9da37
Story: 2005316
Task: 30223
This commit is contained in:
Mark Goddard 2019-03-29 15:19:35 +00:00
parent c4a5c464a9
commit 08bb1441eb
4 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/tenks-deploy-config-compute.yml
View File

@ -34,3 +34,7 @@ deploy_ramdisk: ipa.initramfs
# Use a custom socket path to avoid a conflict with the nova_libvirt kolla # Use a custom socket path to avoid a conflict with the nova_libvirt kolla
# container which bind mounts /var/run/libvirt. # container which bind mounts /var/run/libvirt.
libvirt_custom_socket_path: /var/run/libvirt-tenks libvirt_custom_socket_path: /var/run/libvirt-tenks
# Nested virtualisation is not working well in CI currently. Force the use of
# QEMU.
libvirt_vm_engine: "qemu"

4
dev/tenks-deploy-config-overcloud.yml
View File

@ -31,3 +31,7 @@ physnet_mappings:
# No placement service. # No placement service.
wait_for_placement: false wait_for_placement: false
# Nested virtualisation is not working well in CI currently. Force the use of
# QEMU.
libvirt_vm_engine: "qemu"

11
playbooks/kayobe-overcloud-base/run.yml
View File

@ -26,10 +26,7 @@
cmd: dev/overcloud-test-vm.sh > {{ logs_dir }}/ansible/overcloud-test-vm cmd: dev/overcloud-test-vm.sh > {{ logs_dir }}/ansible/overcloud-test-vm
chdir: "{{ kayobe_src_dir }}" chdir: "{{ kayobe_src_dir }}"
# NOTE(mgoddard): Bare metal testing in CI is currently very unreliable, - name: Perform testing of the baremetal machines
# making it difficult to merge patches. Skip this part of the testing until shell:
# this can be improved. cmd: dev/overcloud-test-baremetal.sh > {{ logs_dir }}/ansible/overcloud-test-baremetal
# - name: Perform testing of the baremetal machines chdir: "{{ kayobe_src_dir }}"
# shell:
# cmd: dev/overcloud-test-baremetal.sh > {{ logs_dir }}/ansible/overcloud-test-baremetal
# chdir: "{{ kayobe_src_dir }}"

22
playbooks/kayobe-overcloud-upgrade-base/run.yml
View File

@ -74,13 +74,10 @@
cmd: dev/overcloud-test.sh > {{ logs_dir }}/ansible/overcloud-test-vm-pre-upgrade cmd: dev/overcloud-test.sh > {{ logs_dir }}/ansible/overcloud-test-vm-pre-upgrade
chdir: "{{ previous_kayobe_src_dir }}" chdir: "{{ previous_kayobe_src_dir }}"
# NOTE(mgoddard): Bare metal testing in CI is currently very - name: Perform testing of the baremetal machines in the overcloud prior to upgrade
# unreliable, making it difficult to merge patches. Skip this part of shell:
# the testing until # this can be improved. cmd: dev/overcloud-test-baremetal.sh > {{ logs_dir }}/ansible/overcloud-test-bm-pre-upgrade
# - name: Perform testing of the baremetal machines in the overcloud prior to upgrade chdir: "{{ kayobe_src_dir }}"
# shell:
# cmd: dev/overcloud-test-baremetal.sh > {{ logs_dir }}/ansible/overcloud-test-bm-pre-upgrade
# chdir: "{{ kayobe_src_dir }}"
# Upgrade Kayobe, and use it to perform an upgrade of the control plane. # Upgrade Kayobe, and use it to perform an upgrade of the control plane.
@ -103,13 +100,10 @@
cmd: dev/overcloud-test-vm.sh > {{ logs_dir }}/ansible/overcloud-test-vm-post-upgrade cmd: dev/overcloud-test-vm.sh > {{ logs_dir }}/ansible/overcloud-test-vm-post-upgrade
chdir: "{{ kayobe_src_dir }}" chdir: "{{ kayobe_src_dir }}"
# NOTE(mgoddard): Bare metal testing in CI is currently very - name: Perform testing of the baremetal machines in the upgraded overcloud
# unreliable, making it difficult to merge patches. Skip this part of shell:
# the testing until # this can be improved. cmd: dev/overcloud-test-baremetal.sh > {{ logs_dir }}/ansible/overcloud-test-bm-post-upgrade
# - name: Perform testing of the baremetal machines in the upgraded overcloud chdir: "{{ kayobe_src_dir }}"
# shell:
# cmd: dev/overcloud-test-baremetal.sh > {{ logs_dir }}/ansible/overcloud-test-bm-post-upgrade
# chdir: "{{ kayobe_src_dir }}"
environment: environment:
KAYOBE_CONFIG_SOURCE_PATH: "{{ kayobe_config_src_dir }}" KAYOBE_CONFIG_SOURCE_PATH: "{{ kayobe_config_src_dir }}"