NuKVM/vagrant-libvirt
3
0
Fork 0
mirror of https://github.com/vagrant-libvirt/vagrant-libvirt.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make NIC model type for management interface configurable (#1711)

Browse Source 
This change adds a configuration option for setting the NIC model type for
the management interface, which defaults to `virtio` (the current value)

The context for this change is that I was having severe speed issues
with `virtio` (which have now disappeared, probably after a QEMU update)
and the `e1000e` NIC was doing much better.
This commit is contained in:
Arjen Verstoep 2023-01-22 15:23:47 +00:00 committed by GitHub
parent 0d2b2fcd02
commit 81ea287835
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/configuration.markdown
View File

@ -592,6 +592,7 @@ used by this network are configurable at the provider level.
the Libvirt default (1500) will be used. the Libvirt default (1500) will be used.
* `management_network_keep` - Starting from version *0.7.0*, *always_destroy* is set to *true* by default for any network. * `management_network_keep` - Starting from version *0.7.0*, *always_destroy* is set to *true* by default for any network.
This option allows to change this behaviour for the management network. This option allows to change this behaviour for the management network.
* `management_network_model_type` - Model of the network adapter to use for the management interface. Default is 'virtio'.
You may wonder how vagrant-libvirt knows the IP address a VM received. Libvirt You may wonder how vagrant-libvirt knows the IP address a VM received. Libvirt
doesn't provide a standard way to find out the IP address of a running domain. doesn't provide a standard way to find out the IP address of a running domain.

3
lib/vagrant-libvirt/config.rb
View File

@ -70,6 +70,7 @@ module VagrantPlugins
attr_accessor :management_network_mtu attr_accessor :management_network_mtu
attr_accessor :management_network_keep attr_accessor :management_network_keep
attr_accessor :management_network_driver_iommu attr_accessor :management_network_driver_iommu
attr_accessor :management_network_model_type
# System connection information # System connection information
attr_accessor :system_uri attr_accessor :system_uri
@ -253,6 +254,7 @@ module VagrantPlugins
@management_network_mtu = UNSET_VALUE @management_network_mtu = UNSET_VALUE
@management_network_keep = UNSET_VALUE @management_network_keep = UNSET_VALUE
@management_network_driver_iommu = UNSET_VALUE @management_network_driver_iommu = UNSET_VALUE
@management_network_model_type = UNSET_VALUE
# System connection information # System connection information
@system_uri = UNSET_VALUE @system_uri = UNSET_VALUE
@ -963,6 +965,7 @@ module VagrantPlugins
@management_network_mtu = nil if @management_network_mtu == UNSET_VALUE @management_network_mtu = nil if @management_network_mtu == UNSET_VALUE
@management_network_keep = false if @management_network_keep == UNSET_VALUE @management_network_keep = false if @management_network_keep == UNSET_VALUE
@management_network_driver_iommu = false if @management_network_driver_iommu == UNSET_VALUE @management_network_driver_iommu = false if @management_network_driver_iommu == UNSET_VALUE
@management_network_model_type = 'virtio' if @management_network_model_type == UNSET_VALUE
# Domain specific settings. # Domain specific settings.
@title = '' if @title == UNSET_VALUE @title = '' if @title == UNSET_VALUE

3
lib/vagrant-libvirt/util/network_util.rb
View File

@ -34,6 +34,7 @@ module VagrantPlugins
management_network_mtu = machine.provider_config.management_network_mtu management_network_mtu = machine.provider_config.management_network_mtu
management_network_keep = machine.provider_config.management_network_keep management_network_keep = machine.provider_config.management_network_keep
management_network_driver_iommu = machine.provider_config.management_network_driver_iommu management_network_driver_iommu = machine.provider_config.management_network_driver_iommu
management_network_model_type = machine.provider_config.management_network_model_type
logger.info "Using #{management_network_name} at #{management_network_address} as the management network #{management_network_mode} is the mode" logger.info "Using #{management_network_name} at #{management_network_address} as the management network #{management_network_mode} is the mode"
begin begin
@ -54,6 +55,7 @@ module VagrantPlugins
if qemu_use_session if qemu_use_session
management_network_options = { management_network_options = {
iface_type: :public_network, iface_type: :public_network,
model_type: management_network_model_type,
dev: management_network_device, dev: management_network_device,
mode: 'bridge', mode: 'bridge',
type: 'bridge', type: 'bridge',
@ -63,6 +65,7 @@ module VagrantPlugins
else else
management_network_options = { management_network_options = {
iface_type: :private_network, iface_type: :private_network,
model_type: management_network_model_type,
network_name: management_network_name, network_name: management_network_name,
ip: Regexp.last_match(1), ip: Regexp.last_match(1),
netmask: Regexp.last_match(2), netmask: Regexp.last_match(2),