Use vagrant-libvirt and 192.168.121.1/24 as default network settings.

Closes #125.
This commit is contained in:
Brian Pitts 2014-01-17 18:35:18 -06:00
parent da01c0e611
commit 2377b6b235
2 changed files with 4 additions and 4 deletions

View File

@ -99,8 +99,8 @@ This provider exposes quite a few provider-specific configuration options:
* `password` - Password to access Libvirt.
* `id_ssh_key_file` - The id ssh key file name to access Libvirt (eg: id_dsa or id_rsa or ... in the user .ssh directory)
* `storage_pool_name` - Libvirt storage pool name, where box image and instance snapshots will be stored.
* `default_network_name` - Libvirt default network name. If not specified the default network name is 'default'.
* `default_network_address` - Libvirt default network address. Must include the address and subnet mask. If not specified the default is '192.168.122.0/24'.
* `default_network_name` - Libvirt default network name. If not specified the default network name is 'vagrant-libvirt'.
* `default_network_address` - Libvirt default network address. Must include the address and subnet mask. If not specified the default is '192.168.121.0/24'.
### Domain Specific Options

View File

@ -65,8 +65,8 @@ module VagrantPlugins
@password = nil if @password == UNSET_VALUE
@id_ssh_key_file = 'id_rsa' if @id_ssh_key_file == UNSET_VALUE
@storage_pool_name = 'default' if @storage_pool_name == UNSET_VALUE
@default_network_name = 'default' if @default_network_name == UNSET_VALUE
@default_network_address = '192.168.122.0/24' if @default_network_address == UNSET_VALUE
@default_network_name = 'vagrant-libvirt' if @default_network_name == UNSET_VALUE
@default_network_address = '192.168.121.0/24' if @default_network_address == UNSET_VALUE
# Domain specific settings.
@memory = 512 if @memory == UNSET_VALUE