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

Merge pull request #122 from purpleidea/customname

Browse Source 
Add provider specific default_prefix option.
This commit is contained in:
Dmitry Vasilets 2014-01-12 00:53:34 -08:00
commit 8f19b332b6
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -100,6 +100,7 @@ This provider exposes quite a few provider-specific configuration options:
* `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) * `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. * `storage_pool_name` - Libvirt storage pool name, where box image and instance snapshots will be stored.
* `default_network` - Libvirt default network name. If not specified default network name is 'default'. * `default_network` - Libvirt default network name. If not specified default network name is 'default'.
* `default_prefix` - Set a prefix for the machines that's different than the project dir name.
### Domain Specific Options ### Domain Specific Options

3
example_box/Vagrantfile vendored
View File

@ -52,6 +52,9 @@ Vagrant.configure("2") do |config|
# Libvirt storage pool name, where box image and instance snapshots will # Libvirt storage pool name, where box image and instance snapshots will
# be stored. # be stored.
libvirt.storage_pool_name = "default" libvirt.storage_pool_name = "default"
# Set a prefix for the machines that's different than the project dir name.
#libvirt.default_prefix = ''
end end
end end

5
lib/vagrant-libvirt/action/set_name_of_domain.rb
View File

@ -11,7 +11,12 @@ module VagrantPlugins
def call(env) def call(env)
require 'securerandom' require 'securerandom'
config = env[:machine].provider_config
if config.default_prefix.nil?
env[:domain_name] = env[:root_path].basename.to_s.dup env[:domain_name] = env[:root_path].basename.to_s.dup
else
env[:domain_name] = config.default_prefix.to_s
end
env[:domain_name].gsub!(/[^-a-z0-9_]/i, '') env[:domain_name].gsub!(/[^-a-z0-9_]/i, '')
env[:domain_name] << '_' env[:domain_name] << '_'
env[:domain_name] << env[:machine].name.to_s env[:domain_name] << env[:machine].name.to_s

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

@ -28,6 +28,9 @@ module VagrantPlugins
# Libvirt default network # Libvirt default network
attr_accessor :default_network attr_accessor :default_network
# Default host prefix (alternative to use project folder name)
attr_accessor :default_prefix
# Domain specific settings used while creating new domain. # Domain specific settings used while creating new domain.
attr_accessor :memory attr_accessor :memory
attr_accessor :cpus attr_accessor :cpus
@ -45,6 +48,7 @@ module VagrantPlugins
@id_ssh_key_file = UNSET_VALUE @id_ssh_key_file = UNSET_VALUE
@storage_pool_name = UNSET_VALUE @storage_pool_name = UNSET_VALUE
@default_network = UNSET_VALUE @default_network = UNSET_VALUE
@default_prefix = UNSET_VALUE
# Domain specific settings. # Domain specific settings.
@memory = UNSET_VALUE @memory = UNSET_VALUE
@ -64,6 +68,7 @@ module VagrantPlugins
@id_ssh_key_file = 'id_rsa' if @id_ssh_key_file == 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 @storage_pool_name = 'default' if @storage_pool_name == UNSET_VALUE
@default_network = 'default' if @default_network == UNSET_VALUE @default_network = 'default' if @default_network == UNSET_VALUE
@default_prefix = nil if @default_prefix == UNSET_VALUE
# Domain specific settings. # Domain specific settings.
@memory = 512 if @memory == UNSET_VALUE @memory = 512 if @memory == UNSET_VALUE