beaker 2.18.1 → 2.18.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDk4YmZiMzQwNWUxOTczZGZjMmYwYTBhNzQ1NWQyODc3NDlhZGYzMg==
+    ZjJkOGY3MjE3NTZiNGQyN2UzNWY3ODU0NGJjMmU0NGZiN2U2OTRmMQ==
   data.tar.gz: !binary |-
-    ZmU3YjQ2ZjhmNjM3ODBjZjIwYTI3YTQ2ODRjY2U1ZTgyNjlmNTY3ZA==
+    NTZkMTMzZWZiZTFlYjI4Y2RkYWRlMWIwNGI1NDRmNGNlZGNlYTdiNg==
 SHA512:
   metadata.gz: !binary |-
-    MzYzNzNjNTIxMTkzNTI3ZGQxZDQ3ODBjZjc4ZmQwNGNiOTdhYjE0NzlkYjk1
-    YTdjZjk3NDRiMGU3MWQzZGIxMjg2MmFhNjcwZDQ0ZjBlYWZhOTk5OTJkN2Vk
-    ODEzNmUxZTZlYjNmNTI2MzZmYzY0ZDNjZGQ1ZjBjMWE1NjJmMzY=
+    MGQzZDcxNmVmODU0YTY0MjBmMjViYjNkM2I5NmY1YjQ5M2YyZmE3OGUwNjEx
+    OGFhNjcwNDdlYzY2YjRlNWJkNjZjNGUyYTRmMGQwZmM4ODU3Y2MxMDg5NmMz
+    MGMzZGMzY2ZlYzQyZmYzYzI4MTEwZWYxMWU1NmZiYjAxNWMyOTg=
   data.tar.gz: !binary |-
-    OGEwNDc5MjlhMDIzMGJhMThjZDk4ZTI4NmI3MTE5NDk5ZjU0ODE2ODg1OTFk
-    YTE1ODVkNTkzMWQ2OGU5OWI4M2E4MDhlNzA2ZDc2Mzc1MGI3YTc2MGNkMmU1
-    YWEyNjBiZDA3ZmY0OTI3MzAyOWFkN2IyOTNhMDk4ZGI3ZDVjN2U=
+    NDg1MjMyNjljZGYxNDFkMDI5YWI0NzUzODI0ZDg3ZGM2Y2M2MjE4YWJjNzFh
+    ZjI3ZTI3ZTg1YTIzZDAzY2ZkYzQxMGM1OWZmMWUyNDMwYjRhODZmMjkzM2Vk
+    NjIwNDY3MDExOTUxMTE1MDRiMjVkMDk3YzY1Y2RhZjQwYzhjOTc=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 14 Jul, 2015 (f9939536)](#LATEST)
+* [LATEST - 27 Jul, 2015 (15c0496b)](#LATEST)
+* [2.18.1 - 14 Jul, 2015 (6a82f99f)](#2.18.1)
 * [2.18.0 - 13 Jul, 2015 (e018f2fc)](#2.18.0)
 * [2.17.0 - 10 Jul, 2015 (aaac4771)](#2.17.0)
 * [2.16.0 - 6 Jul, 2015 (b3e76227)](#2.16.0)
@@ -88,7 +89,202 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 14 Jul, 2015 (f9939536)
+### <a name = "LATEST">LATEST - 27 Jul, 2015 (15c0496b)
+
+* (GEM) update beaker version to 2.18.2 (15c0496b)
+
+* Merge pull request #894 from anodelman/shallow (d2860c7a)
+
+
+```
+Merge pull request #894 from anodelman/shallow
+
+(BKR-405) The "install_pe" DSL Method Fails to Install SG...
+```
+* Merge pull request #880 from petems/BKR-326-fix_freebsd_install (6383f3d6)
+
+
+```
+Merge pull request #880 from petems/BKR-326-fix_freebsd_install
+
+(BKR-326) Fixes FreeBSD install to use ports
+```
+* Merge pull request #896 from bstopp/master (35f8e63e)
+
+
+```
+Merge pull request #896 from bstopp/master
+
+(BKR-417) Add support for specifying # of CPUs in VirtualBox
+```
+* Merge pull request #900 from ferventcoder/maint/issue/start-wait-winrm (f8f01651)
+
+
+```
+Merge pull request #900 from ferventcoder/maint/issue/start-wait-winrm
+
+(maint) Always wait for Windows agent installs
+```
+* Merge pull request #901 from justinstoller/bug/master/bkr-420_no-more-latest (282371b4)
+
+
+```
+Merge pull request #901 from justinstoller/bug/master/bkr-420_no-more-latest
+
+(BKR-420) Allow easily installing latest puppet-agent
+```
+* (BKR-420) Allow easily installing latest puppet-agent (460a6247)
+
+
+```
+(BKR-420) Allow easily installing latest puppet-agent
+
+Prior to this we were over eagerly failing if there was no puppet-agent
+version explicitly set.  Having install_puppet_agent install the latest
+released version of puppet-agent is a desired and common workflow.
+
+This patch removes the aggressive failing on non-specified puppet-agent
+versions in `install_puppet_agent_on`
+```
+* (maint) use type over cat in pure Windows (f53a9f6d)
+
+
+```
+(maint) use type over cat in pure Windows
+
+If the host is not a cygwin environment, prefer `type` to produce the
+contents of the log file over `cat`. `type` is built-in, where `cat` is
+only available if someone has put *nix tools on the path, whether
+through a git install (MinGW tools), installing GnuWin utils or some
+other method.
+```
+* (maint) Always wait for Windows agent installs (c8cb9384)
+
+
+```
+(maint) Always wait for Windows agent installs
+
+When installing Windows agents with cygwin or any other means, always
+prefer `start /w` over just calling msiexec.
+
+This adds to what was first introduced in 9c32cac7a7a5bf.
+```
+* Merge branch 'master' of github.com:bstopp/beaker (4452e5a9)
+
+* Merge pull request #889 from spjmurray/bkr_401_os_volume_races (5c17bca4)
+
+
+```
+Merge pull request #889 from spjmurray/bkr_401_os_volume_races
+
+(BKR-401) fix race in OpenStack volume deletion
+```
+* Merge pull request #892 from petems/maint_move_vb_vagrant_out_of_disk_path (17fe242f)
+
+
+```
+Merge pull request #892 from petems/maint_move_vb_vagrant_out_of_disk_path
+
+(maint) Moves various VB options out of `disk_path` logic
+```
+* Merge pull request #812 from bodgit/openbsd (e37685d0)
+
+
+```
+Merge pull request #812 from bodgit/openbsd
+
+(BKR-249) Add OpenBSD support
+```
+* Merge pull request #898 from kevpl/bkr415_acceptance_fix (888788a9)
+
+
+```
+Merge pull request #898 from kevpl/bkr415_acceptance_fix
+
+(BKR-415) re-targeted puppet_pkg acceptance from 3.7.5 -> 3.8.1
+```
+* (BKR-415) re-targeted puppet_pkg acceptance from 3.7.5 -> 3.8.1 (c37cc8d7)
+
+* This patch adds support for configuring the number of CPUs for (c3fae736)
+
+
+```
+This patch adds support for configuring the number of CPUs for
+vagrant VirtualBox instances. The `vagrant_cpus` config option is
+used to set the value.
+```
+* (BKR-417) This patch adds support for configuring the number of CPUs for (837fe37e)
+
+
+```
+(BKR-417) This patch adds support for configuring the number of CPUs for
+vagrant VirtualBox instances. The `vagrant_cpus` config option is
+used to set the value.
+```
+* (BKR-405) The "install_pe" DSL Method Fails to Install SG... (c31f2d9d)
+
+
+```
+(BKR-405) The "install_pe" DSL Method Fails to Install SG...
+
+...if "Latest-win" Version File is Missing
+
+- do not attempt to determine windows pe_ver if master version is
+  greater than 3.99, just inherit from the master (if it exists)
+- there's probably more edge cases here, but I don't believe that
+  install_pe can handle every combinations of platforms/versions
+```
+* (maint) Moves out of `disk_path` logic... (c8f98aa6)
+
+
+```
+(maint) Moves out of `disk_path` logic...
+
+Looks like these got moved into the `if` logic for `disk_path` accidentally around v2.8. This means that you can no longer use these options without adding disk_path logic in later versions of Beaker. This moves them back into their own section.
+```
+* (BKR-401) fix race in OpenStack volume deletion (b93046ed)
+
+
+```
+(BKR-401) fix race in OpenStack volume deletion
+
+There is a delay between a volume being detached from a virtual machine and
+when it is ready to be deleted.  The code as it stands is likely to hit a 400
+error as the volume is still in the 'detaching' state.  Add in a wait_for
+statement to allow the volume to get back into the 'available' state before
+deleting
+```
+* (BKR-326) Fixes FreeBSD install to use ports (a0d47d14)
+
+
+```
+(BKR-326) Fixes FreeBSD install to use ports
+
+* Adds helper method to `FreeBSD:Pkg` to install packages on FreeBSD using ports with sensible default arguments
+```
+* (BKR-249) Add OpenBSD support (3f72ecfc)
+
+
+```
+(BKR-249) Add OpenBSD support
+
+Add install method to prefer installing the OpenBSD-maintained Puppet package
+which tends to work better than vanilla gem versions. Also add enough smarts
+to be able to do gem installations. The shell is not a login shell therefore
+it doesn't pick up the .profile that contains the PKG_PATH variable so pkg_add
+doesn't automatically install from the network so add the PKG_PATH to the
+.ssh/environment too.
+
+The packaging support handles the case when there are multiple rubies
+available. Currently it will install the newest in the list that is older than
+2.2.x as that doesn't work with all versions of Puppet. Also, if installing the
+package advises to create symlinks to make this package the default, perform
+this step automatically. This handles for example when installing ruby-1.9.3
+and all the commands have a 19 suffix, etc.
+```
+### <a name = "2.18.1">2.18.1 - 14 Jul, 2015 (6a82f99f)
+
+* (HISTORY) update beaker history for gem release 2.18.1 (6a82f99f)
 
 * (GEM) update beaker version to 2.18.1 (f9939536)
 

data/acceptance/pre_suite/puppet_gem/install.rb

@@ -1,10 +1,3 @@
 hosts.each do |host|
   install_puppet_from_gem(host, {:version => '3.7.5'})
-
-  if host['platform'] =~ /sles/
-    host.mkdir_p(host['puppetbindir'])
-    ['facter', 'hiera', 'puppet'].each do |tool|
-      on host, "ln -s /usr/bin/#{tool}.ruby* #{host['puppetbindir']}/#{tool}"
-    end
-  end
-end
+end

data/acceptance/pre_suite/puppet_pkg/install.rb

@@ -1,7 +1,7 @@
 # the version is required on windows
 # all versions are required for osx
 install_puppet({
-  :version        => '3.7.5',
+  :version        => '3.8.1',
   :facter_version => '2.1.0',
   :hiera_version  => '1.3.4',
 })

data/lib/beaker/command.rb

@@ -197,7 +197,7 @@ module Beaker
     # @return a new {SedCommand} object
     def initialize platform, expression, filename, opts = {}
       command = "sed -i -e \"#{expression}\" #{filename}"
-      if platform =~ /solaris|aix|osx/
+      if platform =~ /solaris|aix|osx|openbsd/
         command.slice! '-i '
         temp_file = opts[:temp_file] ? opts[:temp_file] : "#{filename}.tmp"
         command << " > #{temp_file} && mv #{temp_file} #{filename} && rm -f #{temp_file}"

data/lib/beaker/dsl/helpers/puppet_helpers.rb

@@ -623,13 +623,15 @@ module Beaker
               end
             end
 
-            # The agent service is `pe-puppet` everywhere EXCEPT certain linux distros on PE 2.8
-            # In all the case that it is different, this init script will exist. So we can assume
-            # that if the script doesn't exist, we should just use `pe-puppet`
-            agent_service = 'pe-puppet-agent'
-            agent_service = 'pe-puppet' unless agent.file_exist?('/etc/init.d/pe-puppet-agent')
             # In 4.0 this was changed to just be `puppet`
-            agent_service = 'puppet' unless version_is_less(agent['pe_ver'], '4.0')
+            agent_service = 'puppet'
+            if !aio_version?(agent)
+              # The agent service is `pe-puppet` everywhere EXCEPT certain linux distros on PE 2.8
+              # In all the case that it is different, this init script will exist. So we can assume
+              # that if the script doesn't exist, we should just use `pe-puppet`
+              agent_service = 'pe-puppet-agent'
+              agent_service = 'pe-puppet' unless agent.file_exist?('/etc/init.d/pe-puppet-agent')
+            end
 
             # Under a number of stupid circumstances, we can't stop the
             # agent using puppet.  This is usually because of issues with

data/lib/beaker/dsl/install_utils/foss_defaults.rb

@@ -34,6 +34,21 @@ module Beaker
             'distmoduledir'     => '/usr/local/etc/puppet/modules',
             'sitemoduledir'     => '/usr/share/puppet/modules',
           },
+          'openbsd' => {
+            'puppetserver-confdir' => '/etc/puppetserver/conf.d',
+            'puppetservice'     => 'puppetmaster',
+            'puppetpath'        => '/etc/puppet/modules',
+            'puppetvardir'      => '/var/puppet',
+            'puppetbin'         => '/usr/local/bin/puppet',
+            'puppetbindir'      => '/usr/local/bin',
+            'hieralibdir'       => '/opt/puppet-git-repos/hiera/lib',
+            'hierapuppetlibdir' => '/opt/puppet-git-repos/hiera-puppet/lib',
+            'hierabindir'       => '/opt/puppet-git-repos/hiera/bin',
+            'hieradatadir'      => '/etc/puppet/hieradata',
+            'hieraconf'         => '/etc/puppet/hiera.yaml',
+            'distmoduledir'     => '/etc/puppet/modules',
+            'sitemoduledir'     => '/usr/local/share/puppet/modules',
+          },
           'mac' => {
             'puppetserver-confdir' => '/etc/puppetserver/conf.d',
             'puppetservice'     => 'puppetmaster',
@@ -123,6 +138,8 @@ module Beaker
               platform = 'unix'
             when /freebsd/
               platform = 'freebsd'
+            when /openbsd/
+              platform = 'openbsd'
             when /mac/
               platform = 'mac'
             when /pswindows/
@@ -155,6 +172,8 @@ module Beaker
               platform = 'unix'
             when /freebsd/
               platform = 'freebsd'
+            when /openbsd/
+              platform = 'openbsd'
             when /mac/
               platform = 'mac'
             when /pswindows/

data/lib/beaker/dsl/install_utils/foss_utils.rb

@@ -242,6 +242,10 @@ module Beaker
                 install_puppet_from_msi_on(host, opts)
               elsif host['platform'] =~ /osx/
                 install_puppet_from_dmg_on(host, opts)
+              elsif host['platform'] =~ /openbsd/
+                install_puppet_from_openbsd_packages_on(host, opts)
+              elsif host['platform'] =~ /freebsd/
+                install_puppet_from_freebsd_ports_on(host, opts)
               else
                 if opts[:default_action] == 'gem_install'
                   opts[:version] ||= '~> 3.x'
@@ -293,9 +297,6 @@ module Beaker
           opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
           opts[:puppet_collection] ||= 'pc1' #hi!  i'm case sensitive!  be careful!
           opts[:puppet_agent_version] ||= opts[:version] #backwards compatability with old parameter name
-          if not opts[:puppet_agent_version]
-            raise "must provide :puppet_agent_version (puppet-agent version) for install_puppet_agent_on"
-          end
 
           block_on hosts do |host|
             host[:type] = 'aio' #we are installing agent, so we want aio type
@@ -589,6 +590,31 @@ module Beaker
           end
         end
 
+        # Installs Puppet and dependencies from FreeBSD ports
+        #
+        # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
+        #                            or a role (String or Symbol) that identifies one or more hosts.
+        # @param [Hash{Symbol=>String}] opts An options hash
+        # @option opts [String] :version The version of Puppet to install (shows warning)
+        #
+        # @return nil
+        # @api private
+        def install_puppet_from_freebsd_ports_on( hosts, opts )
+          if (opts[:version])
+            logger.warn "If you wish to choose a specific Puppet version, use `install_puppet_from_gem_on('~> 3.*')`"
+          end
+
+          block_on hosts do |host|
+            if host['platform'] =~ /freebsd-9/
+              host.install_package("puppet")
+            else
+              host.install_package("sysutils/puppet")
+            end
+          end
+
+        end
+        alias_method :install_puppet_from_freebsd_ports, :install_puppet_from_freebsd_ports_on
+
         # Installs Puppet and dependencies from dmg on provided host(s).
         #
         # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
@@ -672,6 +698,26 @@ module Beaker
           end
         end
 
+        # Installs Puppet and dependencies from OpenBSD packages
+        #
+        # @param [Host, Array<Host>, String, Symbol] hosts The host to install packages on
+        # @param [Hash{Symbol=>String}] opts An options hash
+        # @option opts [String] :version The version of Puppet to install (shows warning)
+        #
+        # @return nil
+        # @api private
+        def install_puppet_from_openbsd_packages_on(hosts, opts)
+          if (opts[:version])
+            logger.warn "If you wish to choose a specific Puppet version, use `install_puppet_from_gem_on('~> 3.*')`"
+          end
+
+          block_on hosts do |host|
+            host.install_package('puppet')
+
+            configure_foss_defaults_on(host)
+          end
+        end
+
         # Installs Puppet and dependencies from gem on provided host(s)
         #
         # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
@@ -707,6 +753,7 @@ module Beaker
                        when /solaris-11/                            then 'ruby-18'
                        when /ubuntu-14/                             then 'ruby'
                        when /solaris-10|ubuntu|debian|el-|cumulus/  then 'rubygems'
+                       when /openbsd/                               then 'ruby'
                        else
                          raise "install_puppet() called with default_action " +
                                "'gem_install' but program `gem' is " +
@@ -728,16 +775,18 @@ module Beaker
               on host, "echo '#{path_with_gem}' >> ~/.bashrc"
             end
 
+            gemflags = '--no-ri --no-rdoc --no-format-executable'
+
             if opts[:facter_version]
-              on host, "gem install facter -v'#{opts[:facter_version]}' --no-ri --no-rdoc"
+              on host, "gem install facter -v'#{opts[:facter_version]}' #{gemflags}"
             end
 
             if opts[:hiera_version]
-              on host, "gem install hiera -v'#{opts[:hiera_version]}' --no-ri --no-rdoc"
+              on host, "gem install hiera -v'#{opts[:hiera_version]}' #{gemflags}"
             end
 
             ver_cmd = opts[:version] ? "-v '#{opts[:version]}'" : ''
-            on host, "gem install puppet #{ver_cmd} --no-ri --no-rdoc"
+            on host, "gem install puppet #{ver_cmd} #{gemflags}"
 
             # Similar to the treatment of 'gem' above.
             # This avoids adding /opt/csw/bin to PATH.
@@ -753,6 +802,12 @@ module Beaker
               on host, "ln -s #{gem_exec_dir}/facter /usr/bin/facter"
               on host, "ln -s #{gem_exec_dir}/puppet /usr/bin/puppet"
             end
+
+            # A gem install might not necessarily create these
+            ['confdir', 'logdir', 'codedir'].each do |key|
+              host.mkdir_p host.puppet[key] if host.puppet.has_key?(key)
+            end
+
             configure_foss_defaults_on( host )
           end
         end
@@ -1094,10 +1149,10 @@ module Beaker
         def install_puppet_agent_pe_promoted_repo_on( hosts, opts )
           opts[:puppet_agent_version] ||= 'latest'
           block_on hosts do |host|
-            pe_ver = host[:pe_ver] || opts[:pe_ver] || '4.0'
+            pe_ver = host[:pe_ver] || opts[:pe_ver] || '4.0.0-rc1'
             variant, version, arch, codename = host['platform'].to_array
             opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
-            opts[:download_url] = "#{opts[:pe_promoted_builds_url]}/puppet-agent/#{ pe_ver }/#{ opts[:puppet_agent_version] }/repos/"
+            opts[:download_url] = "#{opts[:pe_promoted_builds_url]}/puppet-agent/#{ pe_ver }/#{ opts[:puppet_agent_version] }/repos"
             opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
             opts[:copy_dir_external]  ||= File.join('/', 'root')
             opts[:puppet_collection] ||= 'PC1'
@@ -1126,7 +1181,7 @@ module Beaker
               # - we do not have install_32 set on host
               # - we do not have install_32 set globally
               arch_suffix = should_install_64bit ? '64' : '86'
-              release_path += "windows/"
+              release_path += "/windows/"
               release_file = "/puppet-agent-x#{arch_suffix}.msi"
               download_file = "puppet-agent-x#{arch_suffix}.msi"
             when /^osx$/

data/lib/beaker/dsl/install_utils/pe_defaults.rb

@@ -93,7 +93,7 @@ module Beaker
         def add_pe_defaults_on(hosts)
           block_on hosts do | host |
             case host.class.to_s.downcase
-            when /aix|freebsd|unix/
+            when /aix|(free|open)bsd|unix/
               platform = 'unix'
             when /mac/
               platform = 'mac'
@@ -123,10 +123,8 @@ module Beaker
         def remove_pe_defaults_on(hosts)
           block_on hosts do | host |
             case host.class.to_s.downcase
-            when /aix|unix/
+            when /aix|(free|open)bsd|unix/
               platform = 'unix'
-            when /freebsd/
-              platform = 'freebsd'
             when /mac/
               platform = 'mac'
             when /pswindows/

data/lib/beaker/dsl/install_utils/pe_utils.rb

@@ -95,12 +95,11 @@ module Beaker
           version = host['pe_ver'] || opts[:pe_ver]
           if host['platform'] =~ /windows/
             log_file = "#{File.basename(host['working_dir'])}.log"
-            pe_debug = host[:pe_debug] || opts[:pe_debug] ? " && cat #{log_file}" : ''
-            if host.is_cygwin?
-              "cd #{host['working_dir']} && cmd /C 'start /w msiexec.exe /qn /L*V #{log_file} /i #{host['dist']}.msi PUPPET_MASTER_SERVER=#{master} PUPPET_AGENT_CERTNAME=#{host}'#{pe_debug}"
-            else
-              "cd #{host['working_dir']} &&  msiexec.exe /qn /L*V #{log_file} /i #{host['dist']}.msi PUPPET_MASTER_SERVER=#{master} PUPPET_AGENT_CERTNAME=#{host}#{pe_debug}"
-            end
+            # cat may not be available with strictly Windows environments
+            # Prefer `type` as an alternative to `cat` if non-cygwin
+            win_cat = host.is_cygwin? ? "cat" : "type"
+            pe_debug = host[:pe_debug] || opts[:pe_debug] ? " && #{win_cat} #{log_file}" : ''
+            "cd #{host['working_dir']} && cmd /C 'start /w msiexec.exe /qn /L*V #{log_file} /i #{host['dist']}.msi PUPPET_MASTER_SERVER=#{master} PUPPET_AGENT_CERTNAME=#{host}'#{pe_debug}"
           # Frictionless install didn't exist pre-3.2.0, so in that case we fall
           # through and do a regular install.
           elsif host['roles'].include? 'frictionless' and ! version_is_less(version, '3.2.0')
@@ -344,6 +343,7 @@ module Beaker
         # @option opts [Boolean] :fetch_local_then_push_to_host determines whether
         #                 you use Beaker as the middleman for this (true), or curl the
         #                 file from the host (false; default behavior)
+        # @option opts [Boolean] :masterless Are we performing a masterless installation?
         #
         # @example
         #  do_install(hosts, {:type => :upgrade, :pe_dir => path, :pe_ver => version, :pe_ver_win =>  version_win})
@@ -354,8 +354,7 @@ module Beaker
         # @api private
         #
         def do_install hosts, opts = {}
-          masterless = (defined? options) ? options[:masterless] : false
-          opts[:masterless] = masterless # has to pass masterless down for answer generation awareness
+          masterless = opts[:masterless]
           opts[:type] = opts[:type] || :install
           unless masterless
             pre30database = version_is_less(opts[:pe_ver] || database['pe_ver'], '3.0')
@@ -416,10 +415,10 @@ module Beaker
           install_hosts.each do |host|
             if agent_only_check_needed && hosts_agent_only.include?(host)
               host['type'] = 'aio'
-              install_puppet_agent_pe_promoted_repo_on(host, { :puppet_agent_version => opts[:puppet_agent_version],
-                                                               :puppet_agent_sha => opts[:puppet_agent_sha],
-                                                               :pe_ver => opts[:pe_ver],
-                                                               :puppet_collection => opts[:puppet_collection] })
+              install_puppet_agent_pe_promoted_repo_on(host, { :puppet_agent_version => host[:puppet_agent_version] || opts[:puppet_agent_version],
+                                                               :puppet_agent_sha => host[:puppet_agent_sha] || opts[:puppet_agent_sha],
+                                                               :pe_ver => host[:pe_ver] || opts[:pe_ver],
+                                                               :puppet_collection => host[:puppet_collection] || opts[:puppet_collection] })
               setup_defaults_and_config_helper_on(host, master, [0, 1])
             elsif host['platform'] =~ /windows/
               on host, installer_cmd(host, opts)
@@ -555,9 +554,10 @@ module Beaker
         # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
         #                            or a role (String or Symbol) that identifies one or more hosts.
         # @!macro common_opts
+        # @option opts [Boolean] :masterless Are we performing a masterless installation?
         # @option opts [String] :puppet_agent_version  Version of puppet-agent to install. Required for PE agent
         #                                 only hosts on 4.0+
-        # @option opts [String] :puppet_agent_sha The sha of puppet-agent to install, defaults to puppet-agent-version.
+        # @option opts [String] :puppet_agent_sha The sha of puppet-agent to install, defaults to puppet_agent_version.
         #                                 Required for PE agent only hosts on 4.0+
         # @option opts [String] :pe_ver   The version of PE (will also use host['pe_ver']), defaults to '4.0'
         # @option opts [String] :puppet_collection   The puppet collection for puppet-agent install.
@@ -572,14 +572,19 @@ module Beaker
         def install_pe_on(hosts, opts)
           #process the version files if necessary
           confine_block(:to, {}, hosts) do
-            hosts.each do |host|
+            sorted_hosts.each do |host|
               host['pe_dir'] ||= opts[:pe_dir]
               if host['platform'] =~ /windows/
-                host['pe_ver'] = host['pe_ver'] || opts['pe_ver'] ||
-                  Beaker::Options::PEVersionScraper.load_pe_version(host[:pe_dir] || opts[:pe_dir], opts[:pe_version_file_win])
+                # we don't need the pe_version if:
+                # * master pe_ver > 4.0
+                if not (!opts[:masterless] && master[:pe_ver] && !version_is_less(master[:pe_ver], '3.99'))
+                  host['pe_ver'] ||= Beaker::Options::PEVersionScraper.load_pe_version(host[:pe_dir] || opts[:pe_dir], opts[:pe_version_file_win])
+                else
+                  # inherit the master's version
+                  host['pe_ver'] ||= master[:pe_ver]
+                end
               else
-                host['pe_ver'] = host['pe_ver'] || opts['pe_ver'] ||
-                  Beaker::Options::PEVersionScraper.load_pe_version(host[:pe_dir] || opts[:pe_dir], opts[:pe_version_file])
+                host['pe_ver'] ||= Beaker::Options::PEVersionScraper.load_pe_version(host[:pe_dir] || opts[:pe_dir], opts[:pe_version_file])
               end
             end
             do_install sorted_hosts, opts

data/lib/beaker/host.rb

@@ -20,6 +20,14 @@ module Beaker
         @command = command
       end
 
+      def has_key?(k)
+        cmd = PuppetCommand.new(@command, '--configprint all')
+        keys = @host.exec(cmd).stdout.split("\n").collect do |x|
+          x[/^[^\s]+/]
+        end
+        keys.include?(k)
+      end
+
       def [](k)
         cmd = PuppetCommand.new(@command, "--configprint #{k.to_s}")
         @host.exec(cmd).stdout.strip
@@ -457,12 +465,12 @@ module Beaker
   end
 
   [
-     'unix',
-     'aix',
-     'mac',
-     'freebsd',
-     'windows',
-     'pswindows',
+    'unix',
+    'aix',
+    'mac',
+    'freebsd',
+    'windows',
+    'pswindows',
   ].each do |lib|
     require "beaker/host/#{lib}"
   end

data/lib/beaker/host/freebsd.rb

@@ -7,11 +7,13 @@ module FreeBSD
 
     [
       'exec',
+      'pkg',
     ].each do |lib|
         require "beaker/host/freebsd/#{lib}"
     end
 
     include FreeBSD::Exec
+    include FreeBSD::Pkg
 
     def platform_defaults
       h = Beaker::Options::OptionsHash.new

data/lib/beaker/host/freebsd/pkg.rb

@@ -0,0 +1,18 @@
+module FreeBSD::Pkg
+  include Beaker::CommandFactory
+
+  def install_package(name, cmdline_args = nil, opts = {})
+    case self['platform']
+    when /freebsd-9/
+      cmdline_args ||= '-rF'
+      result = execute("pkg_add #{cmdline_args} #{name}", opts) { |result| result }
+    when /freebsd-10/
+      cmdline_args ||= '-y'
+      result = execute("pkg install #{cmdline_args} #{name}", opts) { |result| result }
+    else
+      raise "Package #{name} could not be installed on #{self}"
+    end
+    result.exit_code == 0
+  end
+
+end

data/lib/beaker/host/unix/exec.rb

@@ -102,11 +102,11 @@ module Unix::Exec
     env_file = self[:ssh_env_file]
     escaped_val = Regexp.escape(val).gsub('/', '\/').gsub(';', '\;')
     #see if the key/value pair already exists
-    if exec(Beaker::Command.new("grep #{key}=.*#{escaped_val} #{env_file}"), :accept_all_exit_codes => true ).exit_code == 0
+    if exec(Beaker::Command.new("grep ^#{key}=.*#{escaped_val} #{env_file}"), :accept_all_exit_codes => true ).exit_code == 0
       return #nothing to do here, key value pair already exists
     #see if the key already exists
-    elsif exec(Beaker::Command.new("grep #{key} #{env_file}"), :accept_all_exit_codes => true ).exit_code == 0
-      exec(Beaker::SedCommand.new(self['platform'], "s/#{key}=/#{key}=#{escaped_val}:/", env_file))
+    elsif exec(Beaker::Command.new("grep ^#{key} #{env_file}"), :accept_all_exit_codes => true ).exit_code == 0
+      exec(Beaker::SedCommand.new(self['platform'], "s/^#{key}=/#{key}=#{escaped_val}:/", env_file))
     else
       exec(Beaker::Command.new("echo \"#{key}=#{val}\" >> #{env_file}"))
     end

data/lib/beaker/host/unix/pkg.rb

@@ -40,6 +40,8 @@ module Unix::Pkg
         result = execute("pkg_info #{name}", opts) { |result| result }
       when /freebsd-10/
         result = execute("pkg info #{name}", opts) { |result| result }
+      when /openbsd/
+        result = execute("pkg_info #{name}", opts) { |result| result }
       else
         raise "Package #{name} cannot be queried on #{self}"
     end
@@ -82,6 +84,32 @@ module Unix::Pkg
         execute("pkg_add -fr #{cmdline_args} #{name}", opts)
       when /freebsd-10/
         execute("pkg #{cmdline_args} install #{name}", opts)
+      when /openbsd/
+        begin
+          execute("pkg_add -I #{cmdline_args} #{name}", opts) do |command|
+            # Handles where there are multiple rubies, installs the latest one
+            if command.stderr =~ /^Ambiguous: #{name} could be (.+)$/
+              name = $1.chomp.split(' ').collect { |x|
+                x =~ /-(\d[^-p]+)/
+                [x, $1]
+              }.select { |x|
+                # Blacklist Ruby 2.2.0+ for the sake of Puppet 3.x
+                Gem::Version.new(x[1]) < Gem::Version.new('2.2.0')
+              }.sort { |a,b|
+                Gem::Version.new(b[1]) <=> Gem::Version.new(a[1])
+              }.collect { |x|
+                x[0]
+              }.first
+              raise ArgumentException
+            end
+            # If the package advises symlinks to be created, do it
+            command.stdout.split(/\n/).select { |x| x =~ /^\s+ln\s/ }.each do |ln|
+              execute(ln, opts)
+            end
+          end
+        rescue
+          retry
+        end
       else
         raise "Package #{name} cannot be installed on #{self}"
     end

data/lib/beaker/host_prebuilt_steps.rb

@@ -14,6 +14,7 @@ module Beaker
     TRIES = 5
     UNIX_PACKAGES = ['curl', 'ntpdate']
     FREEBSD_PACKAGES = ['curl', 'perl5']
+    OPENBSD_PACKAGES = ['curl']
     WINDOWS_PACKAGES = ['curl']
     PSWINDOWS_PACKAGES = []
     SLES10_PACKAGES = ['curl']
@@ -103,6 +104,8 @@ module Beaker
           check_and_install_packages_if_needed(host, PSWINDOWS_PACKAGES)
         when host['platform'] =~ /freebsd/
           check_and_install_packages_if_needed(host, FREEBSD_PACKAGES)
+        when host['platform'] =~ /openbsd/
+          check_and_install_packages_if_needed(host, OPENBSD_PACKAGES)
         when host['platform'] !~ /debian|aix|solaris|windows|sles-|osx-|cumulus|f5-/
           check_and_install_packages_if_needed(host, UNIX_PACKAGES)
         end
@@ -319,6 +322,8 @@ module Beaker
           host.exec(Command.new('sudo cp -r .ssh /var/root/.'), {:pty => true})
         elsif host['platform'] =~ /freebsd/
           host.exec(Command.new('sudo cp -r .ssh /root/.'), {:pty => true})
+        elsif host['platform'] =~ /openbsd/
+          host.exec(Command.new('sudo cp -r .ssh /root/.'), {:pty => true})
         else
           host.exec(Command.new('sudo su -c "cp -r .ssh /root/."'), {:pty => true})
         end
@@ -359,6 +364,8 @@ module Beaker
           host.exec(Command.new("sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' /etc/sshd_config"))
         elsif host['platform'] =~ /freebsd/
           host.exec(Command.new("sudo sed -i -e 's/#PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"), {:pty => true} )
+        elsif host['platform'] =~ /openbsd/
+          host.exec(Command.new("sudo perl -pi -e 's/^PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config"), {:pty => true} )
         elsif not host.is_powershell?
           host.exec(Command.new("sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\""), {:pty => true})
         else
@@ -371,7 +378,7 @@ module Beaker
           host.exec(Command.new("sudo -E systemctl restart sshd.service"), {:pty => true})
         elsif host['platform'] =~ /centos|el-|redhat|fedora|eos/
           host.exec(Command.new("sudo -E /sbin/service sshd reload"), {:pty => true})
-        elsif host['platform'] =~ /freebsd/
+        elsif host['platform'] =~ /(free|open)bsd/
           host.exec(Command.new("sudo /etc/rc.d/sshd restart"))
         else
           logger.warn("Attempting to update ssh on non-supported platform: #{host.name}: #{host['platform']}")
@@ -520,7 +527,7 @@ module Beaker
           host.exec(Command.new("echo '\nPermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
           host.exec(Command.new("stopsrc -g ssh"))
           host.exec(Command.new("startsrc -g ssh"))
-        when /freebsd/
+        when /(free|open)bsd/
           host.exec(Command.new("sudo perl -pi -e 's/^#?PermitUserEnvironment no/PermitUserEnvironment yes/' /etc/ssh/sshd_config"), {:pty => true} )
           host.exec(Command.new("sudo /etc/rc.d/sshd restart"))
         end
@@ -532,6 +539,13 @@ module Beaker
           host.exec(Command.new("touch #{host[:ssh_env_file]}"))
           #add the constructed env vars to this host
           host.add_env_var('PATH', '$PATH')
+          # FIXME
+          if host['platform'] =~ /openbsd-(\d)\.?(\d)-(.+)/
+            version = "#{$1}.#{$2}"
+            arch = $3
+            arch = 'amd64' if ['x64', 'x86_64'].include?(arch)
+            host.add_env_var('PKG_PATH', "http://ftp.openbsd.org/pub/OpenBSD/#{version}/packages/#{arch}/")
+          end
         end
         #add the env var set to this test host
         env.each_pair do |var, value|

data/lib/beaker/hypervisor/openstack.rb

@@ -153,6 +153,7 @@ module Beaker
       vm.volumes.each do |vol|
         @logger.debug "Deleting volume #{vol.name} for OpenStack host #{vm.name}"
         vm.detach_volume(vol.id)
+        vol.wait_for { ready? }
         vol.destroy
       end
     end

data/lib/beaker/hypervisor/vagrant_virtualbox.rb

@@ -18,7 +18,7 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
   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
@@ -52,17 +52,22 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
       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

data/lib/beaker/platform.rb

@@ -3,7 +3,7 @@ module Beaker
   # all String methods while adding several platform-specific use cases.
   class Platform < String
     # Supported platforms
-    PLATFORMS = /^(cisco|freebsd|osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el|eos|cumulus|f5)\-.+\-.+$/
+    PLATFORMS = /^(cisco|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el|eos|cumulus|f5)\-.+\-.+$/
 
     # Platform version numbers vs. codenames conversion hash
     PLATFORM_VERSION_CODES =
@@ -44,6 +44,8 @@ module Beaker
     # Creates the Platform object.  Checks to ensure that the platform String
     # provided meets the platform formatting rules.  Platforms name must be of
     # the format /^OSFAMILY-VERSION-ARCH.*$/ where OSFAMILY is one of:
+    # * freebsd
+    # * openbsd
     # * osx
     # * centos
     # * fedora

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.18.1'
+    STRING = '2.18.2'
   end
 end

data/spec/beaker/dsl/helpers/puppet_helpers_spec.rb

@@ -394,7 +394,6 @@ describe ClassMixedWithDSLHelpers do
       allow( el_agent ).to receive( :puppet ).and_return( { 'vardir' => vardir } )
 
       expect( el_agent ).to receive( :file_exist? ).with("/var/state/agent_catalog_run.lock").and_return(false)
-      expect( el_agent ).to receive( :file_exist? ).with("/etc/init.d/pe-puppet-agent").and_return(true)
 
       expect( subject ).to receive( :puppet_resource ).with( "service", "puppet", "ensure=stopped").once
       expect( subject ).to receive( :on ).once

data/spec/beaker/dsl/install_utils/foss_utils_spec.rb

@@ -37,6 +37,12 @@ describe ClassMixedWithDSLInstallUtils do
   let(:machost)       { make_host( 'machost', { :platform => 'osx-10.9-x86_64',
                                                 :pe_ver => '3.0',
                                                 :working_dir => '/tmp' } ) }
+  let(:freebsdhost9)   { make_host( 'freebsdhost9', { :platform => 'freebsd-9-x64',
+                                                :pe_ver => '3.0',
+                                                :working_dir => '/tmp' } ) }
+  let(:freebsdhost10)   { make_host( 'freebsdhost10', { :platform => 'freebsd-10-x64',
+                                                :pe_ver => '3.0',
+                                                :working_dir => '/tmp' } ) }
   let(:unixhost)      { make_host( 'unixhost', { :platform => 'linux',
                                                  :pe_ver => '3.0',
                                                  :working_dir => '/tmp',
@@ -154,6 +160,20 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
+  context 'install_puppet_from_freebsd_ports_on' do
+    it 'installs puppet on FreeBSD 9' do
+      expect(freebsdhost9).to receive(:install_package).with('puppet')
+
+      subject.install_puppet_from_freebsd_ports_on( freebsdhost9, {}  )
+    end
+
+    it 'installs puppet on FreeBSD 10' do
+      expect(freebsdhost10).to receive(:install_package).with('sysutils/puppet')
+
+      subject.install_puppet_from_freebsd_ports_on( freebsdhost10, {}  )
+    end
+  end
+
   context 'install_puppet_from_msi' do
 
     it 'installs puppet on cygwin windows' do

data/spec/beaker/dsl/install_utils/pe_utils_spec.rb

@@ -394,9 +394,9 @@ describe ClassMixedWithDSLInstallUtils do
         :pe_ver => '3.0',
         :roles => ['agent']
       }, 1)
+      opts[:masterless] = true
 
       allow( subject ).to receive( :hosts ).and_return( hosts )
-      allow( subject ).to receive( :options ).and_return({ :masterless => true })
       allow( subject ).to receive( :on ).and_return( Beaker::Result.new( {}, '' ) )
       allow( subject ).to receive( :fetch_pe ).and_return( true )
       allow( subject ).to receive( :create_remote_file ).and_return( true )
@@ -454,9 +454,9 @@ describe ClassMixedWithDSLInstallUtils do
       #run installer on all hosts
       expect( subject ).to receive( :on ).with( hosts[0], /puppet-enterprise-installer/ ).once
       expect( subject ).to receive( :install_puppet_agent_pe_promoted_repo_on ).with( hosts[1],
-                                                                                     {:puppet_agent_version=>nil, :puppet_agent_sha=>nil, :pe_ver=>nil, :puppet_collection=>nil} ).once
+                                                                                     {:puppet_agent_version=>nil, :puppet_agent_sha=>nil, :pe_ver=>hosts[1][:pe_ver], :puppet_collection=>nil} ).once
       expect( subject ).to receive( :install_puppet_agent_pe_promoted_repo_on ).with( hosts[2],
-                                                                                     {:puppet_agent_version=>nil, :puppet_agent_sha=>nil, :pe_ver=>nil, :puppet_collection=>nil} ).once
+                                                                                     {:puppet_agent_version=>nil, :puppet_agent_sha=>nil, :pe_ver=>hosts[2][:pe_ver], :puppet_collection=>nil} ).once
       hosts.each do |host|
         expect( subject ).to receive( :add_aio_defaults_on ).with( host ).once
         expect( subject ).to receive( :sign_certificate_for ).with( host ).once
@@ -510,7 +510,7 @@ describe ClassMixedWithDSLInstallUtils do
       #run installer on all hosts
       expect( subject ).to receive( :on ).with( hosts[0], /puppet-enterprise-installer/ ).once
       expect( subject ).to receive( :install_puppet_agent_pe_promoted_repo_on ).with( hosts[1],
-                                                                                      {:puppet_agent_version=>nil, :puppet_agent_sha=>nil, :pe_ver=>nil, :puppet_collection=>nil} ).once
+                                                                                      {:puppet_agent_version=>nil, :puppet_agent_sha=>nil, :pe_ver=>hosts[1][:pe_ver], :puppet_collection=>nil} ).once
       expect( subject ).to receive( :on ).with( hosts[2], /puppet-enterprise-installer/ ).once
       hosts.each do |host|
         if subject.aio_version?(host)

data/spec/beaker/host_spec.rb

@@ -186,7 +186,7 @@ module Beaker
       it "does nothing if the key/value pair already exists" do
         result = Beaker::Result.new(host, '')
         result.exit_code = 0
-        expect( Beaker::Command ).to receive(:new).with("grep KEY=.*\\/my\\/first\\/value ~/.ssh/environment")
+        expect( Beaker::Command ).to receive(:new).with("grep ^KEY=.*\\/my\\/first\\/value ~/.ssh/environment")
         expect( host ).to receive(:exec).once.and_return(result)
 
         host.add_env_var('key', '/my/first/value')
@@ -195,9 +195,9 @@ module Beaker
       it "adds new line to environment file if no env var of that name already exists" do
         result = Beaker::Result.new(host, '')
         result.exit_code = 1
-        expect( Beaker::Command ).to receive(:new).with("grep KEY=.*\\/my\\/first\\/value ~/.ssh/environment")
+        expect( Beaker::Command ).to receive(:new).with("grep ^KEY=.*\\/my\\/first\\/value ~/.ssh/environment")
         expect( host ).to receive(:exec).and_return(result)
-        expect( Beaker::Command ).to receive(:new).with(/grep KEY ~\/\.ssh\/environment/)
+        expect( Beaker::Command ).to receive(:new).with(/grep \^KEY ~\/\.ssh\/environment/)
         expect( host ).to receive(:exec).and_return(result)
         expect( Beaker::Command ).to receive(:new).with("echo \"KEY=/my/first/value\" >> ~/.ssh/environment")
         host.add_env_var('key', '/my/first/value')
@@ -206,13 +206,13 @@ module Beaker
       it "updates existing line in environment file when adding additional value to existing variable" do
         result = Beaker::Result.new(host, '')
         result.exit_code = 1
-        expect( Beaker::Command ).to receive(:new).with("grep KEY=.*\\/my\\/first\\/value ~/.ssh/environment")
+        expect( Beaker::Command ).to receive(:new).with("grep ^KEY=.*\\/my\\/first\\/value ~/.ssh/environment")
         expect( host ).to receive(:exec).and_return(result)
         result = Beaker::Result.new(host, '')
         result.exit_code = 0
-        expect( Beaker::Command ).to receive(:new).with(/grep KEY ~\/\.ssh\/environment/)
+        expect( Beaker::Command ).to receive(:new).with(/grep \^KEY ~\/\.ssh\/environment/)
         expect( host ).to receive(:exec).and_return(result)
-        expect( Beaker::SedCommand ).to receive(:new).with('unix', 's/KEY=/KEY=\\/my\\/first\\/value:/', '~/.ssh/environment')
+        expect( Beaker::SedCommand ).to receive(:new).with('unix', 's/^KEY=/KEY=\\/my\\/first\\/value:/', '~/.ssh/environment')
         host.add_env_var('key', '/my/first/value')
       end
 

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -42,7 +42,7 @@ Vagrant.configure("2") do |c|
     v.vm.box_check_update = 'true'
     v.vm.network :private_network, ip: "ip.address.for.vm1", :netmask => "255.255.0.0", :mac => "0123456789"
     v.vm.provider :virtualbox do |vb|
-      vb.customize ['modifyvm', :id, '--memory', '1024']
+      vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1']
     end
   end
   c.vm.define 'vm2' do |v|
@@ -52,7 +52,7 @@ Vagrant.configure("2") do |c|
     v.vm.box_check_update = 'true'
     v.vm.network :private_network, ip: "ip.address.for.vm2", :netmask => "255.255.0.0", :mac => "0123456789"
     v.vm.provider :virtualbox do |vb|
-      vb.customize ['modifyvm', :id, '--memory', '1024']
+      vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1']
     end
   end
   c.vm.define 'vm3' do |v|
@@ -62,7 +62,7 @@ Vagrant.configure("2") do |c|
     v.vm.box_check_update = 'true'
     v.vm.network :private_network, ip: "ip.address.for.vm3", :netmask => "255.255.0.0", :mac => "0123456789"
     v.vm.provider :virtualbox do |vb|
-      vb.customize ['modifyvm', :id, '--memory', '1024']
+      vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1']
     end
   end
 end
@@ -120,11 +120,25 @@ EOF
 
       generated_file = File.read( File.expand_path( File.join( path, "Vagrantfile") ) )
 
-      match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', 'hello!'\]/)
+      match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', 'hello!', '--cpus', '1'\]/)
 
       expect( match ).to_not be nil
 
     end
+    
+    it "uses the cpus defined per vagrant host" do
+      path = vagrant.instance_variable_get( :@vagrant_path )
+      allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
+  
+      vagrant.make_vfile( @hosts, {'vagrant_cpus' => 'goodbye!'} )
+  
+      generated_file = File.read( File.expand_path( File.join( path, "Vagrantfile") ) )
+  
+      match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', '1024', '--cpus', 'goodbye!'\]/)
+  
+      expect( match ).to_not be nil
+  
+    end
 
     it "can generate a new /etc/hosts file referencing each host" do
 

data/spec/beaker/hypervisor/vagrant_virtualbox_spec.rb

@@ -27,7 +27,7 @@ describe Beaker::VagrantVirtualbox do
     vagrant.make_vfile( @hosts )
 
     vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
-    expect( vagrantfile ).to include( %Q{    v.vm.provider :virtualbox do |vb|\n      vb.customize ['modifyvm', :id, '--memory', '1024']\n    end})
+    expect( vagrantfile ).to include( %Q{    v.vm.provider :virtualbox do |vb|\n      vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1']\n    end})
   end
 
   it "can disable the vb guest plugin" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.18.1
+  version: 2.18.2
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -447,6 +447,7 @@ files:
 - lib/beaker/host/aix/user.rb
 - lib/beaker/host/freebsd.rb
 - lib/beaker/host/freebsd/exec.rb
+- lib/beaker/host/freebsd/pkg.rb
 - lib/beaker/host/mac.rb
 - lib/beaker/host/mac/exec.rb
 - lib/beaker/host/mac/group.rb