commit afb166d26e389683b722e1781503dccd8067f14d Author: Dmitriy Rabotyagov Date: Mon Oct 19 11:46:02 2020 +0300 Extend list of libvirt types While we don't test all these virt types, see no reason in explicitly limiting list of them, considering that they are supported by nova and libvirt itself [1] [1] https://docs.openstack.org/nova/latest/configuration/config.html#libvirt.virt_type Change-Id: Iebea20e8344c21137f1e1e5f23174d3b9b688495 diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2 index b058399..986d7d1 100644 --- a/templates/nova.conf.j2 +++ b/templates/nova.conf.j2 @@ -218,7 +218,7 @@ insecure = {{ keystone_service_adminuri_insecure | bool }} {% endif %} -{% if nova_virt_type in ['kvm', 'qemu', 'xen'] %} +{% if nova_virt_type in ['kvm', 'qemu', 'xen', 'lxc', 'uml', 'parallels'] %} [libvirt] inject_partition = {{ nova_libvirt_inject_partition }} inject_password = {{ nova_libvirt_inject_password }} @@ -238,9 +238,11 @@ images_type = rbd images_rbd_pool = {{ nova_libvirt_images_rbd_pool }} images_rbd_ceph_conf = /etc/ceph/ceph.conf {% endif %} +{% if nova_virt_type in ['kvm', 'qemu'] %} live_migration_uri = "qemu+ssh://nova@%s/system?no_verify=1&keyfile={{ nova_system_home_folder }}/.ssh/id_rsa" live_migration_tunnelled = True live_migration_inbound_addr = {{ nova_libvirt_live_migration_inbound_addr }} +{% endif %} hw_disk_discard = {{ nova_libvirt_hw_disk_discard }} disk_cachemodes = {{ nova_libvirt_disk_cachemodes }} {% endif %}