vagrant-proxmox 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4565859e642abb0c27f2447e318af6947fa1c1a1
-  data.tar.gz: 2d1c4fbf9d77a08728d95a83d2acf818e422b82d
+  metadata.gz: 839f7c29c05343449fbed0cdc2979032c626b320
+  data.tar.gz: c6054dbe620fc0899fb5397e4c41fecfacdce356
 SHA512:
-  metadata.gz: b8e544f6029a57e4c13d2a6b9cf56269879defcce1d8fa34b2f45bbf64bb13d7baad5777f8be94c4b0d5a40fd69cfba29c8d55b2f62ca8cee28db1fd1dfbd2a1
-  data.tar.gz: a9f4ef692d5f8eeaa0d11292e1804bda3f3dbad3bc62c3d1c97af5365f0cb4c07761f23e65f1417c36119580e3a2e1d8f31cde880098c625a1a500e08a1c1f75
+  metadata.gz: aa1d00cbc158511c2a1e7c1aa8ce0dc432a161eae627ac4e0cf624c0214a2974f00bc4f756f9cde48b5405794cbbf5d73cc2778b41fc6ee04c047ac02851270d
+  data.tar.gz: b731ec46291d842e627c3c606af0f143705945d759b0aca7851255c56cb09f848f04a96691cc31ea15f65748231a51f172af16eccb47984390d4ff2c604947b9

data/lib/sanity_checks.rb

@@ -7,7 +7,7 @@ end
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
 if Vagrant::VERSION < '1.4.0'
-	fail 'The Vagrant Proxmox plugin is only compatible with Vagrant 1.2+'
+	fail 'The Vagrant Proxmox plugin is only compatible with Vagrant 1.4+'
 end
 
 if RUBY_VERSION.to_i < 2

data/lib/vagrant-proxmox/action.rb

@@ -46,8 +46,8 @@ module VagrantPlugins
 										b2.use MessageUploadServerError
 									end
 								end
-							elsif env1[:machine].provider_config.vm_type == :qemu
-								b1.use Call, UploadIsoFile do |env2, b2|
+							elsif env1[:machine].provider_config.vm_type == :lxc
+								b1.use Call, UploadTemplateFile do |env2, b2|
 									if env2[:result] == :ok
 										b2.use CreateVm
 										b2.use StartVm
@@ -58,6 +58,34 @@ module VagrantPlugins
 										b2.use MessageUploadServerError
 									end
 								end
+							elsif env1[:machine].provider_config.vm_type == :qemu
+								if env1[:machine].provider_config.qemu_iso
+									b1.use Call, UploadIsoFile do |env2, b2|
+										if env2[:result] == :ok
+											b2.use CreateVm
+											b2.use StartVm
+											b2.use SyncFolders
+										elsif env2[:result] == :file_not_found
+											b2.use MessageFileNotFound
+										elsif env2[:result] == :server_upload_error
+											b2.use MessageUploadServerError
+										end
+									end
+								else
+									b1.use CloneVm
+									b1.use Call, IsCreated do |env2, b2|
+										if env2[:result]
+											b2.use AdjustForwardedPortParams
+											b2.use ConfigClone
+											b2.use StartVm
+											b2.use SyncFolders
+										elsif env2[:result] == :file_not_found
+											b2.use MessageFileNotFound
+										elsif env2[:result] == :server_upload_error
+											b2.use MessageUploadServerError
+										end
+									end
+								end
 							end
 						end
 					end
@@ -134,6 +162,9 @@ module VagrantPlugins
 			Vagrant::Action::Builder.new.tap do |b|
 				b.use ConfigValidate
 				b.use ConnectProxmox
+				b.use GetNodeList
+				b.use SelectNode
+				b.use AdjustForwardedPortParams
 				b.use ReadSSHInfo
 			end
 		end
@@ -163,9 +194,9 @@ module VagrantPlugins
 				b.use Call, IsCreated do |env1, b1|
 					if env1[:result]
 						b1.use Call, IsStopped do |env2, b2|
-							if env2[:result]
+              if env2[:result]
 								b2.use MessageNotRunning
-							else
+              else
 								b2.use SSHRun
 							end
 						end
@@ -191,6 +222,9 @@ module VagrantPlugins
 		autoload :MessageFileNotFound, action_root.join('message_file_not_found')
 		autoload :MessageUploadServerError, action_root.join('message_upload_server_error')
 		autoload :CreateVm, action_root.join('create_vm')
+		autoload :CloneVm, action_root.join('clone_vm')
+		autoload :AdjustForwardedPortParams, action_root.join('adjust_forwarded_port_params')
+		autoload :ConfigClone, action_root.join('config_clone')
 		autoload :StartVm, action_root.join('start_vm')
 		autoload :StopVm, action_root.join('stop_vm')
 		autoload :ShutdownVm, action_root.join('shutdown_vm')

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

@@ -0,0 +1,42 @@
+module VagrantPlugins
+	module Proxmox
+		module Action
+
+			# This action creates a new virtual machine on the Proxmox server and
+			# stores its node and vm_id env[:machine].id
+			class AdjustForwardedPortParams < ProxmoxAction
+
+				def initialize app, env
+					@app = app
+					@logger = Log4r::Logger.new 'vagrant_proxmox::action::adjust_forwarded_port_params'
+				end
+
+				def call env
+					env[:ui].info I18n.t('vagrant_proxmox.adjust_forwarded_port_params')
+					config = env[:machine].provider_config
+					node = env[:proxmox_selected_node]
+					vm_id = nil
+
+					begin
+						vm_id = env[:machine].id.split("/").last
+						node_ip = env[:proxmox_connection].get_node_ip(node, 'vmbr0')
+						env[:machine].config.vm.networks.each do |type, options|
+							next if type != :forwarded_port
+							if options[:id] == "ssh"
+								# Provisioning and vagrant ssh will use this
+								# high port of the selected proxmox node
+								options[:auto_correct] = false
+								options[:host_ip] = node_ip
+								options[:host] = sprintf("22%03d", vm_id.to_i).to_i
+								env[:machine].config.ssh.host = node_ip
+								env[:machine].config.ssh.port = sprintf("22%03d", vm_id.to_i).to_s
+								break
+							end
+						end
+					end
+					next_action env
+				end
+			end
+		end
+	end
+end

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

@@ -0,0 +1,55 @@
+module VagrantPlugins
+	module Proxmox
+		module Action
+
+			# This action clones from a qemu template on the Proxmox server and
+			# stores its node and vm_id env[:machine].id
+			class CloneVm < ProxmoxAction
+
+				def initialize app, env
+					@app = app
+					@logger = Log4r::Logger.new 'vagrant_proxmox::action::clone_vm'
+				end
+
+				def call env
+					env[:ui].info I18n.t('vagrant_proxmox.cloning_vm')
+					config = env[:machine].provider_config
+
+					node = env[:proxmox_selected_node]
+					vm_id = nil
+					template_vm_id = nil
+
+					begin
+						template_vm_id = connection(env).get_qemu_template_id(config.qemu_template)
+					rescue StandardError => e
+						raise VagrantPlugins::Proxmox::Errors::VMCloneError, proxmox_exit_status: e.message
+					end
+	
+					begin
+						vm_id = connection(env).get_free_vm_id
+						params = create_params_qemu(config, env, vm_id, template_vm_id)
+						exit_status = connection(env).clone_vm node: node, vm_type: config.vm_type, params: params
+						exit_status == 'OK' ? exit_status : raise(VagrantPlugins::Proxmox::Errors::ProxmoxTaskFailed, proxmox_exit_status: exit_status)
+					rescue StandardError => e
+						raise VagrantPlugins::Proxmox::Errors::VMCloneError, proxmox_exit_status: e.message
+					end
+
+					env[:machine].id = "#{node}/#{vm_id}"
+
+					env[:ui].info I18n.t('vagrant_proxmox.done')
+					next_action env
+				end
+
+				private
+				def create_params_qemu(config, env, vm_id, template_vm_id)
+					# without network, which will added in ConfigClonedVm
+					{vmid: template_vm_id,
+					 newid: vm_id,
+					 name: env[:machine].config.vm.hostname || env[:machine].name.to_s,
+					 description: "#{config.vm_name_prefix}#{env[:machine].name}"}
+				end
+
+			end
+		end
+	end
+end

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

@@ -0,0 +1,98 @@
+module VagrantPlugins
+	module Proxmox
+		module Action
+
+			# This action modifies the configuration of a cloned vm
+			# Basically it creates a user network interface with hostfwd for the provisioning
+			# and an interface for every public or private interface defined in the Vagrantfile
+			class ConfigClone < ProxmoxAction
+
+				def initialize app, env
+					@app = app
+					@logger = Log4r::Logger.new 'vagrant_proxmox::action::config_clone'
+					@node_ip = nil
+					@guest_port = nil
+				end
+
+				def call env
+					env[:ui].info I18n.t('vagrant_proxmox.configuring_vm')
+					config = env[:machine].provider_config
+					node = env[:proxmox_selected_node]
+					vm_id = nil
+
+					begin
+						vm_id = env[:machine].id.split("/").last
+						@node_ip = connection(env).get_node_ip(node, 'vmbr0') if config.vm_type == :qemu
+						@guest_port = sprintf("22%03d", vm_id.to_i).to_s
+					rescue StandardError => e
+						raise VagrantPlugins::Proxmox::Errors::VMConfigError, proxmox_exit_status: e.message
+					end
+
+					begin
+						template_config = connection(env).get_vm_config node: node, vm_id: vm_id, vm_type: config.vm_type
+						params = create_params_qemu(config, env, vm_id, template_config)
+						exit_status = connection(env).config_clone node: node, vm_type: config.vm_type, params: params
+						exit_status == 'OK' ? exit_status : raise(VagrantPlugins::Proxmox::Errors::ProxmoxTaskFailed, proxmox_exit_status: exit_status)
+					rescue StandardError => e
+						raise VagrantPlugins::Proxmox::Errors::VMConfigError, proxmox_exit_status: e.message
+					end
+
+					env[:ui].info I18n.t('vagrant_proxmox.done')
+					next_action env
+				end
+
+				private
+				def create_params_qemu(provider_config, env, vm_id, template_config)
+					vm_config = env[:machine].config.vm
+					params = {
+						vmid: vm_id,
+						description: "#{provider_config.vm_name_prefix}#{env[:machine].name}",
+					}
+					# delete existing network interfaces from template
+					to_delete = template_config.keys.select{|key| key.to_s.match(/^net/) }
+					params[:delete] = to_delete.join(",") if not to_delete.empty?
+					# net0 is the provisioning network, derived from forwarded_port
+					net_num = 0
+					hostname = vm_config.hostname || env[:machine].name
+					netdev0 = [
+						"type=user",
+						"id=net0",
+						"hostname=#{hostname}",
+						"hostfwd=tcp:#{@node_ip}:#{@guest_port}-:22",	# selected_node's primary ip and port (22000 + vm_id)
+					]
+					device0 = [
+						"#{provider_config.qemu_nic_model}",
+						"netdev=net0",
+						"bus=pci.0",
+						"addr=0x12",					# starting point for network interfaces
+						"id=net0",
+						"bootindex=299"
+					]
+					params[:args] = "-netdev " + netdev0.join(",") + " -device " + device0.join(",")
+					# now add a network device for every public_network or private_network
+					# ip addresses are ignored here, as we can't configure anything inside the qemu vm.
+					# at least we can set the predefined mac address and a bridge
+					net_num += 1
+					vm_config.networks.each do |type, options|
+						next if not type.match(/^p.*_network$/)
+						nic = provider_config.qemu_nic_model
+						nic += "=#{options[:macaddress]}" if options[:macaddress]
+						nic += ",bridge=#{options[:bridge]}" if options[:bridge]
+						net = 'net' + net_num.to_s
+						params[net] = nic
+						net_num += 1
+					end
+
+					# some more individual settings
+					params[:ide2] = "#{provider_config.qemu_iso},media=cdrom" if provider_config.qemu_iso
+					params[:sockets] = "#{provider_config.qemu_sockets}".to_i if provider_config.qemu_sockets
+					params[:cores] = "#{provider_config.qemu_cores}".to_i if provider_config.qemu_cores
+					params[:balloon] = "#{provider_config.vm_memory}".to_i if provider_config.vm_memory and provider_config.vm_memory < template_config[:balloon]
+					params[:memory] = "#{provider_config.vm_memory}".to_i if provider_config.vm_memory
+					params
+				end
+
+			end
+		end
+	end
+end

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

@@ -21,6 +21,7 @@ module VagrantPlugins
 					begin
 						vm_id = connection(env).get_free_vm_id
 						params = create_params_openvz(config, env, vm_id) if config.vm_type == :openvz
+						params = create_params_lxc(config, env, vm_id) if config.vm_type == :lxc
 						params = create_params_qemu(config, env, vm_id) if config.vm_type == :qemu
 						exit_status = connection(env).create_vm node: node, vm_type: config.vm_type, params: params
 						exit_status == 'OK' ? exit_status : raise(VagrantPlugins::Proxmox::Errors::ProxmoxTaskFailed, proxmox_exit_status: exit_status)
@@ -62,6 +63,20 @@ module VagrantPlugins
 						params[:ip_address] = get_machine_ip_address(env) if get_machine_ip_address(env)
 					end
 				end
+                
+                private
+				def create_params_lxc(config, env, vm_id)
+					{vmid: vm_id,
+					 ostemplate: config.openvz_os_template,
+					 hostname: env[:machine].config.vm.hostname || env[:machine].name.to_s,
+					 password: 'vagrant',
+					 storage: "#{config.vm_storage}:#{config.vm_disk_size}",
+					 memory: config.vm_memory,
+					 description: "#{config.vm_name_prefix}#{env[:machine].name}"}
+					.tap do |params|
+						params[:net0] = "name=#{get_machine_interface_name(env)},ip=#{get_machine_ip_address(env)}/24,gw=#{get_machine_gw_ip(env)},bridge=#{get_machine_bridge_name(env)}" if get_machine_ip_address(env)
+					end
+				end
 			end
 		end
 	end

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

@@ -11,8 +11,28 @@ module VagrantPlugins
 
 				protected
 				def get_machine_ip_address env
-					env[:machine].config.vm.networks.select { |type, _| type == :public_network }.first[1][:ip] rescue nil
+					config = env[:machine].provider_config
+					if config.vm_type == :qemu
+						env[:machine].config.vm.networks.select { |type, _| type == :forwarded_port }.first[1][:host_ip] rescue nil
+					else
+						env[:machine].config.vm.networks.select { |type, _| type == :public_network }.first[1][:ip] rescue nil
+					end
 				end
+                
+                protected
+                def get_machine_interface_name env
+                    env[:machine].config.vm.networks.select { |type, _| type == :public_network }.first[1][:interface] rescue nil
+                end
+                
+                protected
+                def get_machine_bridge_name env
+                    env[:machine].config.vm.networks.select { |type, _| type == :public_network }.first[1][:bridge] rescue nil
+                end
+                
+                protected
+                def get_machine_gw_ip env
+                    env[:machine].config.vm.networks.select { |type, _| type == :public_network }.first[1][:gw] rescue nil
+                end
 
 				protected
 				def get_machine_macaddress env

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

@@ -7,12 +7,14 @@ module VagrantPlugins
 
 				def initialize app, env
 					@app = app
+					@logger = Log4r::Logger.new 'vagrant_proxmox::action::read_ssh_info'
 				end
 
 				def call env
 					env[:machine_ssh_info] = get_machine_ip_address(env).try do |ip_address|
 						{host: ip_address, port: env[:machine].config.ssh.guest_port}
 					end
+					env[:machine_ssh_info]
 					next_action env
 				end
 

data/lib/vagrant-proxmox/config.rb

@@ -22,7 +22,7 @@ module VagrantPlugins
 			# @return [String]
 			attr_accessor :password
 
-			# The virtual machine type, e.g. :openvz or :qemu
+			# The virtual machine type, e.g. :openvz or :qemu or :lxc
 			#
 			# @return [Symbol]
 			attr_accessor :vm_type
@@ -57,6 +57,17 @@ module VagrantPlugins
 			# @return [Integer]
 			attr_accessor :vm_memory
 
+			# The vm disk size to use for the virtual machine, e.g. '30G'
+			#
+			# @return [String]
+			attr_accessor :vm_disk_size
+
+			# The vm storage to use for the virtual machine, e.g. 'local', 'raid', 'cephstore'
+			# defaults to 'raid' for backwards compatability
+			#
+			# @return [String]
+			attr_accessor :vm_storage
+
 			# The maximum timeout for a proxmox server task (in seconds)
 			#
 			# @return [Integer]
@@ -97,6 +108,11 @@ module VagrantPlugins
 			# @return [Integer]
 			attr_accessor :qemu_sockets
 
+			# The qemu template to clone for the virtual machine
+			#
+			# @return [String]
+			attr_accessor :qemu_template
+
 			# The qemu iso file to use for the virtual machine
 			#
 			# @return [String]
@@ -147,6 +163,8 @@ module VagrantPlugins
 				@vm_id_range = 900..999
 				@vm_name_prefix = 'vagrant_'
 				@vm_memory = 512
+				@vm_disk_size = '20G'
+				@vm_storage = 'local'
 				@task_timeout = 60
 				@task_status_check_interval = 2
 				@ssh_timeout = 60
@@ -155,6 +173,7 @@ module VagrantPlugins
 				@qemu_os = UNSET_VALUE
 				@qemu_cores = 1
 				@qemu_sockets = 1
+				@qemu_template = UNSET_VALUE
 				@qemu_iso = UNSET_VALUE
 				@qemu_iso_file = UNSET_VALUE
 				@replace_qemu_iso_file = false
@@ -174,12 +193,14 @@ module VagrantPlugins
 				@openvz_template_file = nil if @openvz_template_file == UNSET_VALUE
 				@openvz_os_template = "local:vztmpl/#{File.basename @openvz_template_file}" if @openvz_template_file
 				@openvz_os_template = nil if @openvz_os_template == UNSET_VALUE
+				@qemu_template = nil if @qemu_os == UNSET_VALUE
 				@qemu_os = nil if @qemu_os == UNSET_VALUE
 				@qemu_iso_file = nil if @qemu_iso_file == UNSET_VALUE
 				@qemu_iso = "local:iso/#{File.basename @qemu_iso_file}" if @qemu_iso_file
 				@qemu_iso = nil if @qemu_iso == UNSET_VALUE
 				@qemu_disk_size = nil if @qemu_disk_size == UNSET_VALUE
 				@qemu_disk_size = convert_disk_size_to_gigabyte @qemu_disk_size if @qemu_disk_size
+                @vm_disk_size = convert_disk_size_to_gigabyte @vm_disk_size if @vm_disk_size
 			end
 
 			def validate machine
@@ -192,9 +213,12 @@ module VagrantPlugins
 					errors << I18n.t('vagrant_proxmox.errors.no_openvz_os_template_or_openvz_template_file_specified_for_type_openvz') unless @openvz_os_template || @openvz_template_file
 				end
 				if @vm_type == :qemu
-					errors << I18n.t('vagrant_proxmox.errors.no_qemu_os_specified_for_vm_type_qemu') unless @qemu_os
-					errors << I18n.t('vagrant_proxmox.errors.no_qemu_iso_or_qemu_iso_file_specified_for_vm_type_qemu') unless @qemu_iso || @qemu_iso_file
-					errors << I18n.t('vagrant_proxmox.errors.no_qemu_disk_size_specified_for_vm_type_qemu') unless @qemu_disk_size
+					if @qemu_template
+					else
+						errors << I18n.t('vagrant_proxmox.errors.no_qemu_os_specified_for_vm_type_qemu') unless @qemu_os
+						errors << I18n.t('vagrant_proxmox.errors.no_qemu_iso_or_qemu_iso_file_specified_for_vm_type_qemu') unless @qemu_iso || @qemu_iso_file
+						errors << I18n.t('vagrant_proxmox.errors.no_qemu_disk_size_specified_for_vm_type_qemu') unless @qemu_disk_size
+					end
 				end
 				{'Proxmox Provider' => errors}
 			end

data/lib/vagrant-proxmox/errors.rb

@@ -30,6 +30,18 @@ module VagrantPlugins
 				error_key :vm_create_error
 			end
 
+			class VMCloneError < VagrantProxmoxError
+				error_key :vm_clone_error
+			end
+
+			class NoTemplateAvailable < VagrantProxmoxError
+				error_key :no_template_available
+			end
+
+			class VMConfigError < VagrantProxmoxError
+				error_key :vm_configure_error
+			end
+
 			class VMDestroyError < VagrantProxmoxError
 				error_key :vm_destroy_error
 			end

data/lib/vagrant-proxmox/proxmox/connection.rb

@@ -100,6 +100,34 @@ module VagrantPlugins
 				wait_for_completion task_response: response, timeout_message: 'vagrant_proxmox.errors.create_vm_timeout'
 			end
 
+			def clone_vm node: required('node'), vm_type: required('node'), params: required('params')
+				vm_id = params[:vmid]
+				params.delete(:vmid)
+				params.delete(:ostype)
+				params.delete(:ide2)
+				params.delete(:sata0)
+				params.delete(:sockets)
+				params.delete(:cores)
+				params.delete(:description)
+				params.delete(:memory)
+				params.delete(:net0)
+				response = post "/nodes/#{node}/#{vm_type}/#{vm_id}/clone", params
+				wait_for_completion task_response: response, timeout_message: 'vagrant_proxmox.errors.create_vm_timeout'
+			end
+
+			def config_clone node: required('node'), vm_type: required('node'), params: required('params')
+				vm_id = params[:vmid]
+				params.delete(:vmid)
+				response = post "/nodes/#{node}/#{vm_type}/#{vm_id}/config", params
+				wait_for_completion task_response: response, timeout_message: 'vagrant_proxmox.errors.create_vm_timeout'
+			end
+
+			def get_vm_config node: required('node'), vm_id: required('node'), vm_type: required('node')
+				response = get "/nodes/#{node}/#{vm_type}/#{vm_id}/config"
+				response = response[:data]
+				response.empty? ? raise(VagrantPlugins::Proxmox::Errors::VMConfigError) : response
+			end
+
 			def start_vm vm_id
 				vm_info = get_vm_info vm_id
 				response = post "/nodes/#{vm_info[:node]}/#{vm_info[:type]}/#{vm_id}/status/start", nil
@@ -119,6 +147,8 @@ module VagrantPlugins
 			end
 
 			def get_free_vm_id
+                                # to avoid collisions in multi-vm setups
+				sleep (rand(1..3) + 0.1 * rand(0..9))
 				response = get "/cluster/resources?type=vm"
 				allowed_vm_ids = vm_id_range.to_set
 				used_vm_ids = response[:data].map { |vm| vm[:vmid] }
@@ -126,6 +156,12 @@ module VagrantPlugins
 				free_vm_ids.empty? ? raise(VagrantPlugins::Proxmox::Errors::NoVmIdAvailable) : free_vm_ids.first
 			end
 
+			def get_qemu_template_id template
+				response = get "/cluster/resources?type=vm"
+				found_ids = response[:data].select { |vm| vm[:type] == 'qemu' }.select { |vm| vm[:template] == 1 }.select { |vm| vm[:name] == template }.map { |vm| vm[:vmid] }
+				found_ids.empty? ? raise(VagrantPlugins::Proxmox::Errors::NoTemplateAvailable) : found_ids.first
+			end
+
 			def upload_file file, content_type: required('content_type'), node: required('node'), storage: required('storage'), replace: false
 				delete_file(filename: file, content_type: content_type, node: node, storage: storage) if replace
 				unless is_file_in_storage? filename: file, node: node, storage: storage
@@ -144,6 +180,15 @@ module VagrantPlugins
 				res[:data].map { |e| e[:volid] }
 			end
 
+			def get_node_ip node, interface
+				begin
+					response = get "/nodes/#{node}/network/#{interface}"
+					response[:data][:address]
+				rescue ApiError::ServerError
+					:not_created
+				end
+			end
+
 			# This is called every time to retrieve the node and vm_type, hence on large
 			# installations this could be a huge amount of data. Probably an optimization
 			# with a buffer for the machine info could be considered.
@@ -222,4 +267,5 @@ module VagrantPlugins
 			end
 		end
 	end
-end
+end
+

data/lib/vagrant-proxmox/version.rb

@@ -1,7 +1,7 @@
 module VagrantPlugins
 	module Proxmox
 
-		VERSION = '0.0.9'
+		VERSION = '0.0.10'
 
 	end
 end

data/spec/provider_spec.rb

@@ -3,23 +3,26 @@ require 'vagrant-proxmox/provider'
 
 module VagrantPlugins::Proxmox
 
-	describe Provider do
+  describe Provider do
 
-		let(:environment) { Vagrant::Environment.new vagrantfile_name: 'dummy_box/Vagrantfile' }
-		let(:machine) { environment.machine(environment.primary_machine_name, :proxmox) }
-		let(:ui) { double('ui').as_null_object }
+    let(:machine) { environment.machine(environment.primary_machine_name, :proxmox) }
+    let(:environment) { Vagrant::Environment.new vagrantfile_name: 'dummy_box/Vagrantfile' }
+    let(:ui) { double('ui').as_null_object }
 
-		subject { described_class.new(machine) }
+    subject { described_class.new(machine) }
 
-		describe '#ssh_info', :need_box do
-			it 'should call the appropriate actions and return the ssh info' do
-				expect(Action::ConfigValidate).to be_called
-				expect(Action::ConnectProxmox).to be_called
-				expect(Action::ReadSSHInfo).to be_called { |env| env[:machine_ssh_info] = 'ssh_info'}
-				expect(subject.ssh_info).to eq('ssh_info')
-			end
-		end
+    describe '#ssh_info', :need_box do
+      it 'should call the appropriate actions and return the ssh info' do
+        expect(Action::ConfigValidate).to be_called
+        expect(Action::ConnectProxmox).to be_called
+        expect(Action::GetNodeList).to be_called
+        expect(Action::SelectNode).to be_called
+        expect(Action::AdjustForwardedPortParams).to be_called
+        expect(Action::ReadSSHInfo).to be_called { |env| env[:machine_ssh_info] = 'ssh_info' }
+        expect(subject.ssh_info).to eq('ssh_info')
+      end
+    end
 
-	end
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxmox
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Dirk Grappendorf
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -58,16 +58,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,10 @@ files:
 - lib/sanity_checks.rb
 - lib/vagrant-proxmox.rb
 - lib/vagrant-proxmox/action.rb
+- lib/vagrant-proxmox/action/adjust_forwarded_port_params.rb
 - lib/vagrant-proxmox/action/cleanup_after_destroy.rb
+- lib/vagrant-proxmox/action/clone_vm.rb
+- lib/vagrant-proxmox/action/config_clone.rb
 - lib/vagrant-proxmox/action/connect_proxmox.rb
 - lib/vagrant-proxmox/action/create_vm.rb
 - lib/vagrant-proxmox/action/destroy_vm.rb
@@ -312,48 +315,48 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage virtual machines on a Proxmox server.
 test_files:
-- spec/actions/message_already_running_action_spec.rb
-- spec/actions/destroy_vm_action_spec.rb
-- spec/actions/start_vm_action_spec.rb
+- spec/config_spec.rb
+- spec/spec_helpers/time_helpers.rb
+- spec/spec_helpers/common_helpers.rb
+- spec/actions/is_created_action_spec.rb
 - spec/actions/proxmox_action_shared.rb
-- spec/actions/sync_folders_action_spec.rb
-- spec/actions/connect_proxmox_action_spec.rb
-- spec/actions/cleanup_after_destroy_action_spec.rb
-- spec/actions/is_stopped_action_spec.rb
 - spec/actions/read_ssh_info_action_spec.rb
-- spec/actions/create_vm_action_spec.rb
-- spec/actions/proxmox_action_spec.rb
 - spec/actions/shutdown_vm_action_spec.rb
-- spec/actions/read_state_action_spec.rb
-- spec/actions/message_already_stopped_action_spec.rb
+- spec/actions/destroy_vm_action_spec.rb
+- spec/actions/cleanup_after_destroy_action_spec.rb
+- spec/actions/select_node_spec.rb
 - spec/actions/stop_vm_action_spec.rb
+- spec/actions/message_file_not_found_spec.rb
+- spec/actions/read_state_action_spec.rb
+- spec/actions/message_not_created_action_spec.rb
+- spec/actions/create_vm_action_spec.rb
+- spec/actions/start_vm_action_spec.rb
+- spec/actions/message_already_running_action_spec.rb
+- spec/actions/connect_proxmox_action_spec.rb
+- spec/actions/get_node_list_action_spec.rb
 - spec/actions/upload_template_file_action_spec.rb
-- spec/actions/select_node_spec.rb
+- spec/actions/message_not_running_action_spec.rb
+- spec/actions/proxmox_action_spec.rb
 - spec/actions/upload_iso_file_action_spec.rb
-- spec/actions/message_not_created_action_spec.rb
+- spec/actions/sync_folders_action_spec.rb
+- spec/actions/is_stopped_action_spec.rb
+- spec/actions/message_already_stopped_action_spec.rb
 - spec/actions/message_upload_server_error_spec.rb
-- spec/actions/message_not_running_action_spec.rb
-- spec/actions/get_node_list_action_spec.rb
-- spec/actions/message_file_not_found_spec.rb
-- spec/actions/is_created_action_spec.rb
-- spec/plugin_spec.rb
-- spec/spec_helper.rb
-- spec/sanity_checks_spec.rb
-- spec/proxmox/connection_spec.rb
-- spec/proxmox/rest_call_shared.rb
-- spec/commands/ssh_command_spec.rb
-- spec/commands/provision_command_spec.rb
 - spec/commands/up_command_spec.rb
-- spec/commands/destroy_command_spec.rb
-- spec/commands/ssh_run_command_spec.rb
 - spec/commands/halt_command_spec.rb
+- spec/commands/provision_command_spec.rb
+- spec/commands/ssh_run_command_spec.rb
+- spec/commands/destroy_command_spec.rb
+- spec/commands/ssh_command_spec.rb
 - spec/commands/status_command_spec.rb
-- spec/config_spec.rb
+- spec/sanity_checks_spec.rb
+- spec/spec_helper.rb
+- spec/proxmox/connection_spec.rb
+- spec/proxmox/rest_call_shared.rb
+- spec/plugin_spec.rb
 - spec/provider_spec.rb
-- spec/spec_helpers/time_helpers.rb
-- spec/spec_helpers/common_helpers.rb