Merge "Allow virtualisation type to be defined in a test scenario"
This commit is contained in:
commit
fca293037e
@ -346,3 +346,14 @@ tempest_test_includelist_cinder:
|
||||
{% if 'quorum' in bootstrap_host_scenarios_expanded %}
|
||||
oslomsg_rabbit_quorum_queues: True
|
||||
{% endif %}
|
||||
|
||||
# NOTE(jrosser) nested virt is not usable in general in opendev.org CI jobs,
|
||||
# but if the keyword 'kvm' or 'qemu' is present in the expanded scenario then
|
||||
# force the use of that virtualisation type. If neither is specified,
|
||||
# default to qemu in zuul jobs, but allow the os_nova role to autodetect the
|
||||
# virtualisation type local testing by leaving nova_virt_type undefined.
|
||||
{% if 'kvm' in bootstrap_host_scenarios_expanded %}
|
||||
nova_virt_type: kvm
|
||||
{% elif (('qemu' in bootstrap_host_scenarios_expanded) or nodepool_dir.stat.exists) %}
|
||||
nova_virt_type: qemu
|
||||
{% endif %}
|
||||
|
Loading…
Reference in New Issue
Block a user