kitchen-vagrant 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa2fafbce94824f6ab027a6c789c348f632b1f73
-  data.tar.gz: 8c9e54c05057b57e46906e737c7a04c20101ede1
+  metadata.gz: f0dc4619e60934c3bee08b3a56a3f443d1507e81
+  data.tar.gz: 1b12e75c49a66943965fbfcffef1dd57f91d84fd
 SHA512:
-  metadata.gz: 21d53d3e3fa7bb48da1bf39d2af83cffeecea6c2d1fbf444ba188eaeb52650a6db05fdb19b552f3e27b3f2d61a2061c4059919a77fb9a3d30d9077345edee5ae
-  data.tar.gz: abacc35c6a871434db004664a72d88547d008ec9f5b9d3154ba404003233bfbf0e812ac4d1ebf82aa0c4f8ae0d35429ba4fabd995ce32e6142167fed6e430f92
+  metadata.gz: 4bfd34c4956cda9d30fa4537e63b21a0b42e2133cae2e8bae9abe43da8627df4c0144a37734dd8b38daeed871c1ecb2115d0bb49a3aa91ad2dc72ac948c1e6f1
+  data.tar.gz: c306ce6aafdcfd0f303d0a681da0857c07f6e847b09ba0df643faee89763098cc97ad386117c7df1bc760154a92dbbe9880511eb1678cbd0023a81ddc3c817cc

data/.travis.yml

@@ -4,7 +4,6 @@ rvm:
   - 2.2
   - 2.1
   - 2.0.0
-  - 1.9.3
   - ruby-head
 
 bundler_args: --without guard

data/CHANGELOG.md

@@ -1,3 +1,37 @@
+## [0.20.0](https://github.com/test-kitchen/kitchen-vagrant/tree/v0.20.0) (2016-04-07)
+[Full Changelog](https://github.com/test-kitchen/kitchen-vagrant/compare/v0.19.0...v0.20.0)
+
+**Implemented enhancements:**
+
+- Make Vagrant binary a parameter [\#218](https://github.com/test-kitchen/kitchen-vagrant/issues/218)
+- WARN: Child with name 'dna.json' found in multiple directories: /tmp/kitchen/dna.json and /tmp/kitchen/dna.json [\#198](https://github.com/test-kitchen/kitchen-vagrant/issues/198)
+- Default bento boxes should be pulled from Atlas [\#193](https://github.com/test-kitchen/kitchen-vagrant/issues/193)
+- Easily override instance name [\#169](https://github.com/test-kitchen/kitchen-vagrant/issues/169)
+- Easily override instance name [\#169](https://github.com/test-kitchen/kitchen-vagrant/issues/169)
+- Make vagrant binary a parameter [\#219](https://github.com/test-kitchen/kitchen-vagrant/pull/219) ([bheuvel](https://github.com/bheuvel))
+- HyperV acts as OpenStack, CloudStack [\#217](https://github.com/test-kitchen/kitchen-vagrant/pull/217) ([bheuvel](https://github.com/bheuvel))
+- Add support for hyperv customize [\#212](https://github.com/test-kitchen/kitchen-vagrant/pull/212) ([giseongeom](https://github.com/giseongeom))
+- Add option for box\_download\_insecure to be passed to Vagrantfile [\#208](https://github.com/test-kitchen/kitchen-vagrant/pull/208) ([drrk](https://github.com/drrk))
+- fix libvirt customize [\#204](https://github.com/test-kitchen/kitchen-vagrant/pull/204) ([akissa](https://github.com/akissa))
+- Add linked\_clone config option [\#203](https://github.com/test-kitchen/kitchen-vagrant/pull/203) ([bborysenko](https://github.com/bborysenko))
+- Use Bento's Atlas boxes by default if detected [\#195](https://github.com/test-kitchen/kitchen-vagrant/pull/195) ([andytson](https://github.com/andytson))
+- Parallels: Use "memory" and "cpus" customization shortcuts [\#194](https://github.com/test-kitchen/kitchen-vagrant/pull/194) ([legal90](https://github.com/legal90))
+- Add support for boot\_timeout driver setting [\#184](https://github.com/test-kitchen/kitchen-vagrant/pull/184) ([gh2k](https://github.com/gh2k))
+- Fixes box check update bug [\#182](https://github.com/test-kitchen/kitchen-vagrant/pull/182) ([roderickrandolph](https://github.com/roderickrandolph))
+- Add cloudstack support [\#167](https://github.com/test-kitchen/kitchen-vagrant/pull/167) ([miguelaferreira](https://github.com/miguelaferreira))
+
+**Fixed bugs:**
+
+- setting box\_check\_update to false does not disable box update checking [\#181](https://github.com/test-kitchen/kitchen-vagrant/issues/181)
+
+**Merged pull requests:**
+
+- Updating readme for Parallels [\#221](https://github.com/test-kitchen/kitchen-vagrant/pull/221) ([cheeseplus](https://github.com/cheeseplus))
+- Adding changelog generator [\#220](https://github.com/test-kitchen/kitchen-vagrant/pull/220) ([cheeseplus](https://github.com/cheeseplus))
+- Updating Readme to reflect changes to default boxes [\#215](https://github.com/test-kitchen/kitchen-vagrant/pull/215) ([cheeseplus](https://github.com/cheeseplus))
+- Ruby 1.9.3 is no longer supported [\#209](https://github.com/test-kitchen/kitchen-vagrant/pull/209) ([drrk](https://github.com/drrk))
+
+
 ## 0.19.0 / 2015-09-18
 
 ### Bug fixes

data/README.md

@@ -33,7 +33,7 @@ If you are creating Windows VMs over a WinRM Transport, then the
 [vagrant-winrm][vagrant_winrm] Vagrant plugin must be installed. As a
 consequence, the minimum version of Vagrant required is 1.6 or higher.
 
-### <a name="dependencies-virtualization"></a> Virtualbox and/or VMware Fusion/Workstation
+### <a name="dependencies-virtualization"></a> Virtualbox, VMware Fusion/Workstation, and/or Parallels
 
 Currently this driver supports VirtualBox and VMware Fusion/Workstation.
 Virtualbox is free and is the default provider for Vagrant.
@@ -49,6 +49,13 @@ software from VMware and then must also purchase the Vagrant VMware plugin.
 
 [VMware Workstation][workstation_dl]
 
+If you would like to use Parallels you must also purchase the software but the
+`vagrant-parallels` plugin is freely available.
+
+[Parllels][parallels_dl]
+
+[Vagrant Parallels Provider][vagrant_parallels]
+
 
 ## <a name="installation"></a> Installation and Setup
 
@@ -56,21 +63,24 @@ Please read the [Driver usage][driver_usage] page for more details.
 
 ## <a name="default-config"></a> Default Configuration
 
-This driver can predict the Vagrant box name and download URL for a select
-number of platforms (VirtualBox and VMware providers only) that have been published by
-Chef Software Inc, in the [Bento][bento] project such as:
+For a select number of platforms and a select number of hypervisors (VirtualBox, VMware,
+and Parallels) default boxes are published under the [Bento organization][bento_org]
+on [Atlas][atlas] such as:
 
 ```yaml
 ---
 platforms:
-  - name: ubuntu-10.04
   - name: ubuntu-12.04
   - name: ubuntu-14.04
-  - name: ubuntu-13.04
   - name: centos-5.11
-  - name: centos-6.6
-  - name: debian-7.8
-  - name: freebsd-10.1
+  - name: centos-6.7
+  - name: centos-7.2
+  - name: debian-7.9
+  - name: debian-8.3
+  - name: fedora-22
+  - name: fedora-23
+  - name: freebsd-9.3
+  - name: freebsd-10.2
 ```
 
 This will effectively generate a configuration similar to:
@@ -78,18 +88,21 @@ This will effectively generate a configuration similar to:
 ```yaml
 ---
 platforms:
-  - name: ubuntu-10.04
-    driver:
-      box: opscode-ubuntu-10.04
-      box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-10.04_chef-provisionerless.box
   - name: ubuntu-12.04
     driver:
-      box: opscode-ubuntu-12.04
-      box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-12.04_chef-provisionerless.box
+      box: bento/ubuntu-12.04
   - name: ubuntu-14.04
     driver:
-      box: opscode-ubuntu-14.04
-      box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box
+      box: bento/ubuntu-14.04
+  - name: centos-5.11
+    driver:
+      box: bento/centos-5.11
+  - name: centos-6.7
+    driver:
+      box: bento/centos-6.7
+  - name: centos-7.2
+    driver:
+      box: bento/centos-7.2
   # ...
 ```
 
@@ -137,7 +150,7 @@ default `box` value of `"opscode-ubuntu-14.04"`. Alternatively, a box called
 
 ### <a name="config-box-check-update"></a> box\_check\_update
 
-Whether to check for box updates (disabled by default).
+Whether to check for box updates (enabled by default).
 
 ### <a name="config-box-url"></a> box\_url
 
@@ -251,6 +264,30 @@ end
 
 For more info about GUI vs. Headless mode please see [vagrant configuration docs][vagrant_config_vbox]
 
+### <a name="config-linked_clone"></a> linked_clone
+
+Allows to use linked clones to import boxes for VirtualBox, VMware and Parallels Desktop. Default is **nil**.
+
+```yaml
+---
+platforms:
+  - name: ubuntu-14.04
+    driver:
+      linked_clone: true
+```
+
+will generate a Vagrantfile configuration similar to:
+
+```ruby
+Vagrant.configure("2") do |config|
+  # ...
+
+  c.vm.provider :virtualbox do |p|
+    p.linked_clone = true
+  end
+end
+```
+
 ### <a name="config-network"></a> network
 
 An **Array** of network customizations for the virtual machine. Each Array
@@ -452,3 +489,7 @@ Apache 2.0 (see [LICENSE][license])
 [vmware_plugin]:            http://www.vagrantup.com/vmware
 [fusion_dl]:                http://www.vmware.com/products/fusion/overview.html
 [workstation_dl]:           http://www.vmware.com/products/workstation/
+[bento_org]:                https://atlas.hashicorp.com/bento
+[atlas]:                    https://atlas.hashicorp.com/
+[parallels_dl]:             http://www.parallels.com/products/desktop/download/
+[vagrant_parallels]:        https://github.com/Parallels/vagrant-parallels

data/Rakefile

@@ -35,3 +35,12 @@ desc "Run all quality tasks"
 task :quality => [:cane, :style, :stats]
 
 task :default => [:test, :quality]
+
+require "github_changelog_generator/task"
+
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  config.future_release = Kitchen::Driver::VAGRANT_VERSION
+  config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature,Improvement".split(",")
+  config.bug_labels = "bug,Bug".split(",")
+  config.exclude_labels = %w[Duplicate Question Discussion No_Changelog]
+end

data/kitchen-vagrant.gemspec

@@ -25,10 +25,11 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec",     "~> 3.2"
   gem.add_development_dependency "simplecov", "~> 0.9"
+  gem.add_development_dependency "github_changelog_generator", "1.11.3"
 
   # style and complexity libraries are tightly version pinned as newer releases
   # may introduce new and undesireable style choices which would be immediately
   # enforced in CI
-  gem.add_development_dependency "finstyle",  "1.4.0"
+  gem.add_development_dependency "finstyle",  "1.5.0"
   gem.add_development_dependency "cane",      "2.6.2"
 end

data/lib/kitchen/driver/vagrant.rb

@@ -43,14 +43,20 @@ module Kitchen
 
       default_config :box_check_update, nil
 
+      default_config :box_download_insecure, nil
+
       default_config(:box_url) { |driver| driver.default_box_url }
 
       default_config :box_version, nil
 
+      default_config :boot_timeout, nil
+
       default_config :customize, {}
 
       default_config :gui, nil
 
+      default_config :linked_clone, nil
+
       default_config :network, []
 
       default_config :pre_create_command, nil
@@ -65,6 +71,8 @@ module Kitchen
 
       default_config :synced_folders, []
 
+      default_config :vagrant_binary, "vagrant"
+
       default_config :vagrantfile_erb,
         File.join(File.dirname(__FILE__), "../../../templates/Vagrantfile.erb")
       expand_path_for :vagrantfile_erb
@@ -94,7 +102,7 @@ module Kitchen
       # @return [String,nil] the Vagrant box for this Instance
       def default_box
         if bento_box?(instance.platform.name)
-          "opscode-#{instance.platform.name}"
+          "bento/#{instance.platform.name}"
         else
           instance.platform.name
         end
@@ -102,15 +110,7 @@ module Kitchen
 
       # @return [String,nil] the Vagrant box URL for this Instance
       def default_box_url
-        return unless bento_box?(instance.platform.name)
-
-        provider = config[:provider]
-        provider = "vmware" if config[:provider] =~ /^vmware_(.+)$/
-
-        if %w[virtualbox vmware].include?(provider)
-          "https://opscode-vm-bento.s3.amazonaws.com/vagrant/#{provider}/" \
-            "opscode_#{instance.platform.name}_chef-provisionerless.box"
-        end
+        nil
       end
 
       # Destroys an instance.
@@ -123,7 +123,7 @@ module Kitchen
         create_vagrantfile
         @vagrantfile_created = false
         instance.transport.connection(state).close
-        run("vagrant destroy -f")
+        run("#{config[:vagrant_binary]} destroy -f")
         FileUtils.rm_rf(vagrant_root)
         info("Vagrant instance #{instance.to_str} destroyed.")
         state.delete(:hostname)
@@ -367,7 +367,7 @@ module Kitchen
       #
       # @api private
       def run_vagrant_up
-        cmd = "vagrant up"
+        cmd = "#{config[:vagrant_binary]} up"
         cmd += " --no-provision" unless config[:provision]
         cmd += " --provider #{config[:provider]}" if config[:provider]
         run(cmd)
@@ -405,7 +405,8 @@ module Kitchen
       #   invocation
       # @api private
       def vagrant_config(type)
-        lines = run_silently("vagrant #{type}-config").split("\n").map do |line|
+        lines = run_silently("#{config[:vagrant_binary]} #{type}-config").
+          split("\n").map do |line|
           tokens = line.strip.partition(" ")
           [tokens.first, tokens.last.gsub(/"/, "")]
         end
@@ -417,7 +418,8 @@ module Kitchen
       # @api private
       def vagrant_version
         self.class.vagrant_version ||= run_silently(
-          "vagrant --version", :cwd => Dir.pwd).chomp.split(" ").last
+          "#{config[:vagrant_binary]} --version", :cwd => Dir.pwd).
+          chomp.split(" ").last
       rescue Errno::ENOENT
         raise UserError, "Vagrant #{MIN_VER} or higher is not installed." \
           " Please download a package from #{WEBSITE}."
@@ -450,7 +452,7 @@ module Kitchen
         return true if self.class.winrm_plugin_passed
 
         self.class.winrm_plugin_passed = run_silently(
-          "vagrant plugin list", :cwd => Dir.pwd).
+          "#{config[:vagrant_binary]} plugin list", :cwd => Dir.pwd).
           split("\n").find { |line| line =~ /^vagrant-winrm\s+/ }
       end
     end

data/lib/kitchen/driver/vagrant_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Vagrant Kitchen driver
-    VAGRANT_VERSION = "0.19.0"
+    VAGRANT_VERSION = "0.20.0"
   end
 end

data/spec/kitchen/driver/vagrant_spec.rb

@@ -154,7 +154,7 @@ describe Kitchen::Driver::Vagrant do
         before { allow(platform).to receive(:name) { "#{name}-99.04" } }
 
         it "sets :box based on the platform name by default" do
-          expect(driver[:box]).to eq("opscode-#{name}-99.04")
+          expect(driver[:box]).to eq("bento/#{name}-99.04")
         end
 
         it "sets :box to a custom value" do
@@ -163,25 +163,7 @@ describe Kitchen::Driver::Vagrant do
           expect(driver[:box]).to eq("booya")
         end
 
-        it "sets :box_url to a bento box URL for a virtualbox provider" do
-          config[:provider] = "virtualbox"
-
-          expect(driver[:box_url]).to eq(
-            "https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/" \
-            "opscode_#{name}-99.04_chef-provisionerless.box"
-          )
-        end
-
-        it "sets :box_url to a bento box URL for a vmware-based provider" do
-          config[:provider] = "vmware_awesometown"
-
-          expect(driver[:box_url]).to eq(
-            "https://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/" \
-            "opscode_#{name}-99.04_chef-provisionerless.box"
-          )
-        end
-
-        it "sets :box_url to nil for any other provider" do
+        it "sets :box_url to nil" do
           config[:provider] = "the-next-coolness"
 
           expect(driver[:box_url]).to eq(nil)
@@ -218,6 +200,16 @@ describe Kitchen::Driver::Vagrant do
       expect(driver[:box_check_update]).to eq(true)
     end
 
+    it "sets :box_download_insecure to nil by default" do
+      expect(driver[:box_download_insecure]).to eq(nil)
+    end
+
+    it "sets :box_download_insecure to a custom value" do
+      config[:box_download_insecure] = true
+
+      expect(driver[:box_download_insecure]).to eq(true)
+    end
+
     it "sets :box_version to nil by default" do
       expect(driver[:box_version]).to eq(nil)
     end
@@ -228,6 +220,16 @@ describe Kitchen::Driver::Vagrant do
       expect(driver[:box_version]).to eq("1.2.3")
     end
 
+    it "sets :boot_timeout to nil by default" do
+      expect(driver[:boot_timeout]).to eq(nil)
+    end
+
+    it "sets :boot_timeout to a custom value" do
+      config[:boot_timeout] = 600
+
+      expect(driver[:boot_timeout]).to eq(600)
+    end
+
     it "sets :customize to an empty hash by default" do
       expect(driver[:customize]).to eq({})
     end
@@ -242,6 +244,10 @@ describe Kitchen::Driver::Vagrant do
       expect(driver[:gui]).to eq(nil)
     end
 
+    it "sets :linked_clone to nil by default" do
+      expect(driver[:linked_clone]).to eq(nil)
+    end
+
     it "sets :network to an empty array by default" do
       expect(driver[:network]).to eq([])
     end
@@ -354,6 +360,15 @@ describe Kitchen::Driver::Vagrant do
       ])
     end
 
+    it "sets :vagrant_binary to 'vagrant' by default" do
+      expect(driver[:vagrant_binary]).to eq("vagrant")
+    end
+
+    it "sets :vagrant_binary to a custom value" do
+      config[:vagrant_binary] = "vagrant.cmd"
+      expect(driver[:vagrant_binary]).to eq("vagrant.cmd")
+    end
+
     it "sets :vagrantfile_erb to a default" do
       expect(driver[:vagrantfile_erb]).to match(
         %r{/kitchen-vagrant/templates/Vagrantfile\.erb$}
@@ -936,6 +951,22 @@ describe Kitchen::Driver::Vagrant do
       expect(vagrantfile).to match(regexify(%{c.vm.box_version = "a.b.c"}))
     end
 
+    it "sets no vm.boot_timeout if missing" do
+      config[:boot_timeout] = nil
+      cmd
+
+      expect(vagrantfile).to_not match(regexify(%{c.vm.boot_timeout}, :partial))
+    end
+
+    it "sets no vm.boot_timeout if :boot_timeout is set" do
+      config[:boot_timeout] = 600
+      cmd
+
+      expect(vagrantfile).to match(
+        regexify(%{c.vm.boot_timeout = 600}, :partial)
+      )
+    end
+
     it "sets no vm.box_check_update if missing" do
       config[:box_check_update] = nil
       cmd
@@ -945,6 +976,13 @@ describe Kitchen::Driver::Vagrant do
       )
     end
 
+    it "sets vm.box_check_update to false if :box_check_update is false" do
+      config[:box_check_update] = false
+      cmd
+
+      expect(vagrantfile).to match(regexify(%{c.vm.box_check_update = "false"}))
+    end
+
     it "sets vm.box_check_update if :box_check_update is set" do
       config[:box_check_update] = "um"
       cmd
@@ -952,6 +990,35 @@ describe Kitchen::Driver::Vagrant do
       expect(vagrantfile).to match(regexify(%{c.vm.box_check_update = "um"}))
     end
 
+    it "sets no vm.box_download_insecure if missing" do
+      config[:box_download_insecure] = nil
+      cmd
+
+      expect(vagrantfile).to_not match(
+        regexify(%{c.vm.box_download_insecure}, :partial)
+      )
+    end
+
+    it "sets vm.box_download_insecure to false
+          if :box_download_insecure is false" do
+
+      config[:box_download_insecure] = false
+      cmd
+
+      expect(
+        vagrantfile).to match(regexify(%{c.vm.box_download_insecure = "false"})
+      )
+    end
+
+    it "sets vm.box_download_insecure if :box_download_insecure is set" do
+      config[:box_download_insecure] = "um"
+      cmd
+
+      expect(
+        vagrantfile).to match(regexify(%{c.vm.box_download_insecure = "um"})
+      )
+    end
+
     it "sets no vm.communicator if missing" do
       config[:communicator] = nil
       cmd
@@ -1128,6 +1195,36 @@ describe Kitchen::Driver::Vagrant do
           end
         RUBY
       end
+
+      it "does not set :linked_clone to nil" do
+        config[:linked_clone] = nil
+        cmd
+
+        expect(vagrantfile).to_not match(
+          regexify(%{p.linked_clone = }, :partial))
+      end
+
+      it "sets :linked_clone to false if set" do
+        config[:linked_clone] = false
+        cmd
+
+        expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
+          c.vm.provider :virtualbox do |p|
+            p.linked_clone = false
+          end
+        RUBY
+      end
+
+      it "sets :linked_clone to true if set" do
+        config[:linked_clone] = true
+        cmd
+
+        expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
+          c.vm.provider :virtualbox do |p|
+            p.linked_clone = true
+          end
+        RUBY
+      end
     end
 
     context "for parallels provider" do
@@ -1148,6 +1245,51 @@ describe Kitchen::Driver::Vagrant do
           end
         RUBY
       end
+
+      it "adds a short form of :memory and :cpus elements in :customize" do
+        config[:customize] = {
+          :memory => 2048,
+          :cpus => 4
+        }
+        cmd
+
+        expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
+          c.vm.provider :parallels do |p|
+            p.memory = 2048
+            p.cpus = 4
+          end
+        RUBY
+      end
+
+      it "does not set :linked_clone to nil" do
+        config[:linked_clone] = nil
+        cmd
+
+        expect(vagrantfile).to_not match(
+          regexify(%{p.linked_clone = }, :partial))
+      end
+
+      it "sets :linked_clone to false if set" do
+        config[:linked_clone] = false
+        cmd
+
+        expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
+          c.vm.provider :parallels do |p|
+            p.linked_clone = false
+          end
+        RUBY
+      end
+
+      it "sets :linked_clone to true if set" do
+        config[:linked_clone] = true
+        cmd
+
+        expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
+          c.vm.provider :parallels do |p|
+            p.linked_clone = true
+          end
+        RUBY
+      end
     end
 
     context "for rackspace provider" do
@@ -1213,14 +1355,16 @@ describe Kitchen::Driver::Vagrant do
       it "adds a line for each element in :customize" do
         config[:customize] = {
           :a_key => "some value",
-          :something => "else"
+          :something => "else",
+          :a_number_key => 1024
         }
         cmd
 
         expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
           c.vm.provider :libvirt do |p|
-            p.a_key = some value
-            p.something = else
+            p.a_key = "some value"
+            p.something = "else"
+            p.a_number_key = 1024
           end
         RUBY
       end
@@ -1457,6 +1601,180 @@ describe Kitchen::Driver::Vagrant do
         RUBY
       end
     end
+
+    context "for cloudstack provider" do
+
+      before { config[:provider] = "cloudstack" }
+
+      it "adds a line for each element in :customize" do
+        config[:customize] = {
+          :a_key => "some value",
+          :something => "else"
+        }
+        cmd
+
+        expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
+          c.vm.provider :cloudstack do |p|
+            p.a_key = "some value"
+            p.something = "else"
+          end
+        RUBY
+      end
+
+      it "builds an array of hashes for firewall rules in :customize" do
+        config[:customize] = {
+          :firewall_rules => [
+            {
+              :ipaddress => "A.A.A.A",
+              :cidrlist  => "B.B.B.B/24",
+              :protocol  => "tcp",
+              :startport => 2222,
+              :endport   => 2222
+            },
+            {
+              :ipaddress => "C.C.C.C",
+              :cidrlist  => "D.D.D.D/32",
+              :protocol  => "tcp",
+              :startport => 80,
+              :endport   => 81
+            }
+          ]
+        }
+        cmd
+
+        expectation = <<-RUBY.gsub(/^ {8}/, "").gsub(/,\n     /, ",").chomp
+          c.vm.provider :cloudstack do |p|
+            p.firewall_rules = [{:ipaddress=>"A.A.A.A", :cidrlist=>"B.B.B.B/24",
+              :protocol=>"tcp", :startport=>2222,
+              :endport=>2222}, {:ipaddress=>"C.C.C.C", :cidrlist=>"D.D.D.D/32",
+              :protocol=>"tcp", :startport=>80, :endport=>81}]
+          end
+        RUBY
+
+        expect(vagrantfile).to match(regexify(expectation))
+      end
+
+      it "builds an array for security group ids in :customize" do
+        config[:customize] = {
+          :security_group_ids => ["aaaa-bbbb-cccc-dddd",
+                                  "1111-2222-3333-4444"]
+        }
+        cmd
+
+        expectation = <<-RUBY.gsub(/^ {8}/, "").gsub(/,\n     /, ",").chomp
+          c.vm.provider :cloudstack do |p|
+            p.security_group_ids = ["aaaa-bbbb-cccc-dddd",
+              "1111-2222-3333-4444"]
+          end
+        RUBY
+
+        expect(vagrantfile).to match(regexify(expectation))
+      end
+
+      it "builds an array for security group names in :customize" do
+        config[:customize] = {
+          :security_group_names => %w[min_fantastiska_security_group
+                                      another_security_group]
+        }
+        cmd
+
+        expectation = <<-RUBY.gsub(/^ {8}/, "").gsub(/,\n     /, ",").chomp
+          c.vm.provider :cloudstack do |p|
+            p.security_group_names = ["min_fantastiska_security_group",
+              "another_security_group"]
+          end
+        RUBY
+
+        expect(vagrantfile).to match(regexify(expectation))
+      end
+
+      it "builds an array of hashes for security groups in :customize" do
+        config[:customize] = {
+          :security_groups => [
+            {
+              :name        => "Awesome_security_group",
+              :description => "Created from the Vagrantfile",
+              :rules => [
+                {
+                  :type => "ingress",
+                  :protocol => "TCP",
+                  :startport => 22,
+                  :endport => 22,
+                  :cidrlist => "0.0.0.0/0"
+                },
+                {
+                  :type => "egress",
+                  :protocol => "TCP",
+                  :startport => 81,
+                  :endport => 82,
+                  :cidrlist => "1.2.3.4/24"
+                }
+              ]
+            }
+          ]
+        }
+        cmd
+
+        expectation = <<-RUBY.gsub(/^ {8}/, "").gsub(/,\n     /, ",").chomp
+          c.vm.provider :cloudstack do |p|
+            p.security_groups = [{:name=>"Awesome_security_group",
+              :description=>"Created from the Vagrantfile",
+              :rules=>[{:type=>"ingress", :protocol=>"TCP", :startport=>22,
+              :endport=>22, :cidrlist=>"0.0.0.0/0"}, {:type=>"egress",
+              :protocol=>"TCP", :startport=>81, :endport=>82,
+              :cidrlist=>"1.2.3.4/24"}]}]
+          end
+        RUBY
+
+        expect(vagrantfile).to match(regexify(expectation))
+      end
+
+      it "builds an array of hashes for static nat in :customize" do
+        config[:customize] = {
+          :static_nat => [{ :idaddress => "A.A.A.A" }]
+        }
+        cmd
+
+        expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
+          c.vm.provider :cloudstack do |p|
+            p.static_nat = [{:idaddress=>"A.A.A.A"}]
+          end
+        RUBY
+      end
+
+      it "builds an array of hashes for port forwarding rules in :customize" do
+        config[:customize] = {
+          :port_forwarding_rules => [
+            {
+              :ipaddress => "X.X.X.X",
+              :protocol => "tcp",
+              :publicport => 22,
+              :privateport => 22,
+              :openfirewall => false
+            },
+            {
+              :ipaddress => "X.X.X.X",
+              :protocol => "tcp",
+              :publicport => 80,
+              :privateport => 80,
+              :openfirewall => false
+            }
+          ]
+        }
+        cmd
+
+        expectation = <<-RUBY.gsub(/^ {8}/, "").gsub(/,\n     /, ",").chomp
+          c.vm.provider :cloudstack do |p|
+            p.port_forwarding_rules = [{:ipaddress=>"X.X.X.X",
+              :protocol=>"tcp", :publicport=>22, :privateport=>22,
+              :openfirewall=>false}, {:ipaddress=>"X.X.X.X", :protocol=>"tcp",
+              :publicport=>80, :privateport=>80, :openfirewall=>false}]
+          end
+        RUBY
+
+        expect(vagrantfile).to match(regexify(expectation))
+      end
+    end
   end
 
   def debug_lines

data/templates/Vagrantfile.erb

@@ -14,10 +14,14 @@ Vagrant.configure("2") do |c|
   c.vm.box_version = "<%= config[:box_version] %>"
 <% end %>
 
-<% if config[:box_check_update] %>
+<% if !config[:box_check_update].nil? %>
   c.vm.box_check_update = "<%= config[:box_check_update] %>"
 <% end %>
 
+<% if !config[:box_download_insecure].nil? %>
+  c.vm.box_download_insecure = "<%= config[:box_download_insecure] %>"
+<% end %>
+
 <% if config[:vm_hostname] %>
   c.vm.hostname = "<%= config[:vm_hostname] %>"
 <% end %>
@@ -58,6 +62,10 @@ Vagrant.configure("2") do |c|
   <% end %>
 <% end %>
 
+<% if config[:boot_timeout] %>
+  c.vm.boot_timeout = <%= config[:boot_timeout] %>
+<% end %>
+
 <% Array(config[:network]).each do |opts| %>
   c.vm.network(:<%= opts[0] %>, <%= opts[1..-1].join(", ") %>)
 <% end %>
@@ -72,12 +80,24 @@ Vagrant.configure("2") do |c|
    when "virtualbox", /^vmware_/
      if config[:gui] == true || config[:gui] == false %>
     p.gui = <%= config[:gui] %>
+<%   end
+   end
+
+   case config[:provider]
+   when "virtualbox", /^vmware_/, "parallels"
+     if config[:linked_clone] == true || config[:linked_clone] == false %>
+    p.linked_clone = <%= config[:linked_clone] %>
 <%   end
    end %>
+
 <% config[:customize].each do |key, value| %>
   <% case config[:provider]
      when "libvirt" %>
+  <% if value.is_a? String %>
+    p.<%= key %> = "<%= value%>"
+  <% else %>
     p.<%= key %> = <%= value%>
+  <% end %>
   <% when "lxc" %>
     <% if key == :container_name %>
     p.container_name = <%= value == ":machine" ? value : "\"#{value}\"" %>
@@ -95,7 +115,11 @@ Vagrant.configure("2") do |c|
     p.server = "<%= value %>"
     <% end %>
   <% when "parallels" %>
+    <% if key == :memory || key == :cpus %>
+    p.<%= key %> = <%= value %>
+    <% else %>
     p.customize ["set", :id, "--<%= key.to_s.gsub('_', '-') %>", "<%= value %>"]
+    <% end %>
   <% when "rackspace" %>
     p.<%= key %> = "<%= value%>"
   <% when "softlayer" %>
@@ -118,7 +142,7 @@ Vagrant.configure("2") do |c|
     <% else %>
     p.vmx["<%= key %>"] = "<%= value %>"
     <% end %>
-  <% when "openstack" %>
+  <% when "openstack", "cloudstack", "hyperv" %>
     <% if value.is_a? String %>
     p.<%= key %> = "<%= value%>"
     <% else  %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -80,20 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.11.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.11.3
 - !ruby/object:Gem::Dependency
   name: finstyle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
@@ -150,10 +164,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.
 test_files:
 - spec/kitchen/driver/vagrant_spec.rb
 - spec/spec_helper.rb
+has_rdoc: