lib/beaker/hypervisor/vagrant_virtualbox.rb in beaker-2.18.1 vs lib/beaker/hypervisor/vagrant_virtualbox.rb in beaker-2.18.2

@@ -16,11 +16,11 @@
   end
 
   def self.provider_vfile_section(host, options)
     provider_section  = ""
     provider_section << "    v.vm.provider :virtualbox do |vb|\n"
-    provider_section << "      vb.customize ['modifyvm', :id, '--memory', '#{options['vagrant_memsize'] ||= '1024'}']\n"
+    provider_section << "      vb.customize ['modifyvm', :id, '--memory', '#{options['vagrant_memsize'] ||= '1024'}', '--cpus', '#{options['vagrant_cpus'] ||= '1'}']\n"
     provider_section << "      vb.vbguest.auto_update = false" if options[:vbguest_plugin] == 'disable'
 
     # Guest volume support
     # - Creates a new AHCI controller with the requisite number of ports,
     #   the default controller is limited in its number of supported ports (2).
@@ -50,20 +50,25 @@
           '--medium', volume_path,
         ])
       end
     end
 
+    provider_section << "      vb.customize [\"modifyvm\", :id, \"--natdnshostresolver1\", \"#{host['natdns']}\"]\n" unless host['natdns'].nil?
+
+    provider_section << "      vb.customize [\"modifyvm\", :id, \"--natdnsproxy1\", \"#{host['natdns']}\"]\n" unless host['natdns'].nil?
+
+    provider_section << "      vb.gui = true\n" unless host['vb_gui'].nil?
+
+    provider_section << "      [\"modifyvm\", :id, \"--cpuidset\", \"1\",\"000206a7\",\"02100800\",\"1fbae3bf\",\"bfebfbff\"\]" if /osx/i.match(host['platform'])
+
     if host['disk_path']
       unless File.exist?(host['disk_path'])
         host['disk_path'] = File.join(host['disk_path'], "#{host.name}.vmdk")
         provider_section << "      vb.customize ['createhd', '--filename', '#{host['disk_path']}', '--size', #{host['disk_size'] ||= 5 * 1024}, '--format', 'vmdk']\n"
       end
       provider_section << "      vb.customize ['storageattach', :id, '--storagectl', 'SATA Controller', '--port', 1, '--device', 0, '--type', 'hdd', '--medium','#{host['disk_path']}']\n"
-      provider_section << "      vb.customize [\"modifyvm\", :id, \"--natdnshostresolver1\", \"#{host['natdns']}\"]\n" unless host['natdns'].nil?
-      provider_section << "      vb.customize [\"modifyvm\", :id, \"--natdnsproxy1\", \"#{host['natdns']}\"]\n" unless host['natdns'].nil?
-      provider_section << "      vb.gui = true\n" unless host['vb_gui'].nil?
-      provider_section << "      [\"modifyvm\", :id, \"--cpuidset\", \"1\",\"000206a7\",\"02100800\",\"1fbae3bf\",\"bfebfbff\"\]" if /osx/i.match(host['platform'])
     end
+
     provider_section << "    end\n"
 
     provider_section
   end
 end