vagrant-proxmox 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2147dcafed88c358a388e15bff90b58f468b95ad
-  data.tar.gz: 60f3c2c0c6045353dec19188ddaa164fd1dc99d4
+  metadata.gz: 50fcfd510ddb0e1f43e6a95d0247c236ea42fdec
+  data.tar.gz: 9b92370c07abe2d0d97d8fec096e375ec30ef29b
 SHA512:
-  metadata.gz: 09c263224795ea1f5bb85e10f3795c83d5351a339fc5c998879540e817397c19c6bb323e38abda26b96f2b079f0f8d4a924e54f1a45dfeb7b7ffe10d25604dd7
-  data.tar.gz: 563fcab8eba3640b08477576d4a1d7cf7209ebd99d1ea6edc624a509ebd6d8dce149ea575d33fc0b33b24ca494b837cbfacc5cfbda87b7ff6c6fbd0d4dd5809d
+  metadata.gz: d40ea752d5c8bf0e8ef6b9386c9a17805e48d84b8118654fd601dc6c64768fdbeceda58014f9eca43fc87282d87a1b9591e2d4fdaa9794a5ad79d174e01936b5
+  data.tar.gz: 95c7d2f1e2d4c429f75389500962d6a3640f91ea351dc6b47aafac3f9401105f8193abd8bd4ec16a62177ec8f8ff4b83725d73a2f5d0dd7b0e79571797ec9518

data/lib/vagrant-proxmox/action/create_vm.rb

@@ -36,15 +36,15 @@ module VagrantPlugins
 
 				private
 				def create_params_qemu(config, env, vm_id)
-					network = 'e1000,bridge=vmbr0'
-					network = "e1000=#{get_machine_macaddress(env)},bridge=vmbr0" if get_machine_macaddress(env)
+					network = "#{config.qemu_nic_model},bridge=#{config.qemu_bridge}"
+					network = "#{config.qemu_nic_model}=#{get_machine_macaddress(env)},bridge=#{config.qemu_bridge}" if get_machine_macaddress(env)
 					{vmid: vm_id,
 					 name: env[:machine].config.vm.hostname || env[:machine].name.to_s,
 					 ostype: config.qemu_os,
 					 ide2: "#{config.qemu_iso},media=cdrom",
-					 sata0: "raid:#{config.qemu_disk_size},format=qcow2",
-					 sockets: 1,
-					 cores: 1,
+					 sata0: "#{config.qemu_storage}:#{config.qemu_disk_size},format=qcow2",
+					 sockets: config.qemu_sockets,
+					 cores: config.qemu_cores,
 					 memory: config.vm_memory,
 					 net0: network,
 					 description: "#{config.vm_name_prefix}#{env[:machine].name}"}

data/lib/vagrant-proxmox/config.rb

@@ -82,6 +82,16 @@ module VagrantPlugins
 			# @return [Symbol]
 			attr_accessor :qemu_os
 
+			# The number of cores per socket
+			#
+			# @return [Integer]
+			attr_accessor :qemu_cores
+
+			# The number of CPU sockets
+			#
+			# @return [Integer]
+			attr_accessor :qemu_sockets
+
 			# The qemu iso file to use for the virtual machine
 			#
 			# @return [String]
@@ -97,6 +107,24 @@ module VagrantPlugins
 			# @return [String]
 			attr_accessor :qemu_disk_size
 
+			# The qemu storage to use for the virtual machine, e.g. 'local', 'raid', 'cephstore'
+			# defaults to 'raid' for backwards compatability
+			#
+			# @return [String]
+			attr_accessor :qemu_storage
+
+			# The qemu network interface card model, e.g. 'e1000', 'virtio'
+			# defaults to 'e1000' for backwards compatability
+			#
+			# @return [String]
+			attr_accessor :qemu_nic_model
+
+			# The qemu network bridge, e.g. 'vmbr0'
+			# defaults to 'vmbr0' for backwards compatability
+			#
+			# @return [String]
+			attr_accessor :qemu_bridge
+
 			def initialize
 				@endpoint = UNSET_VALUE
 				@selected_node = UNSET_VALUE
@@ -114,9 +142,14 @@ module VagrantPlugins
 				@ssh_status_check_interval = 5
 				@imgcopy_timeout = 120
 				@qemu_os = UNSET_VALUE
+				@qemu_cores = 1
+				@qemu_sockets = 1
 				@qemu_iso = UNSET_VALUE
 				@qemu_iso_file = UNSET_VALUE
 				@qemu_disk_size = UNSET_VALUE
+				@qemu_storage = 'raid'
+				@qemu_nic_model = 'e1000'
+				@qemu_bridge = 'vmbr0'
 			end
 
 			# This is the hook that is called to finalize the object before it is put into use.

data/lib/vagrant-proxmox/version.rb

@@ -1,7 +1,7 @@
 module VagrantPlugins
 	module Proxmox
 
-		VERSION = '0.0.7'
+		VERSION = '0.0.8'
 
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxmox
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Dirk Grappendorf
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client