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

Allow the situation where DHCP is not requested but where it is enabled on the virtual network

Browse Source
This commit is contained in:
Erik van Pienbroek
2015-04-01 14:49:35 +02:00
parent 3f52dac06d
commit ce75b9a02e
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -249,6 +249,12 @@ starts with 'libvirt__' string. Here is a list of those options:
* `:mac` - MAC address for the interface. * `:mac` - MAC address for the interface.
* `model_type` - parameter specifies the model of the network adapter when you create a domain value by default virtio KVM believe possible values, see the documentation for libvirt * `model_type` - parameter specifies the model of the network adapter when you create a domain value by default virtio KVM believe possible values, see the documentation for libvirt
When the option `:libvirt__dhcp_enabled` is to to 'false' it shouldn't matter
whether the virtual network contains a DHCP server or not and vagrant-libvirt
should not fail on it. The only situation where vagrant-libvirt should fail
is when DHCP is requested but isn't configured on a matching already existing
virtual network.
### Public Network Options ### Public Network Options
* `:dev` - Physical device that the public interface should use. Default is 'eth0'. * `:dev` - Physical device that the public interface should use. Default is 'eth0'.
* `:mode` - The mode in which the public interface should operate in. Supported * `:mode` - The mode in which the public interface should operate in. Supported

4
lib/vagrant-libvirt/action/create_networks.rb
View File

@@ -100,8 +100,10 @@ module VagrantPlugins
# match what was configured in the vagrantfile # match what was configured in the vagrantfile
# since we always enable dhcp for the management network # since we always enable dhcp for the management network
# this ensures we wont start a vm vagrant cant reach # this ensures we wont start a vm vagrant cant reach
# Allow the situation where DHCP is not requested (:libvirt__dhcp_enabled == false)
# but where it is enabled on the virtual network
def verify_dhcp def verify_dhcp
unless @options[:dhcp_enabled] == @interface_network[:dhcp_enabled] if @interface_network[:dhcp_enabled] == true && @options[:dhcp_enabled] == false
raise Errors::DHCPMismatch, raise Errors::DHCPMismatch,
network_name: @interface_network[:name], network_name: @interface_network[:name],
requested: @options[:dhcp_enabled] ? 'enabled' : 'disabled' requested: @options[:dhcp_enabled] ? 'enabled' : 'disabled'