beaker 2.18.0 → 2.19.0

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

@@ -1,4 +1,4 @@
-[ 'aio_defaults', 'foss_defaults', 'puppet_utils' ].each do |lib|
+[ 'aio_defaults', 'foss_defaults', 'puppet_utils', 'windows_utils' ].each do |lib|
     require "beaker/dsl/install_utils/#{lib}"
 end
 module Beaker
@@ -18,6 +18,7 @@ module Beaker
         include AIODefaults
         include FOSSDefaults
         include PuppetUtils
+        include WindowsUtils
 
         # The default install path
         SourcePath  = "/opt/puppet-git-repos"
@@ -28,24 +29,39 @@ module Beaker
         # Github's ssh signature for cloning via ssh
         GitHubSig   = 'github.com,207.97.227.239 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=='
 
-        # Set defaults and PATH for these hosts to be either foss or aio, have host['type'] == aio for aio settings, defaults
-        # to foss.
+        # lookup project-specific git environment variables
+        # PROJECT_VAR or VAR otherwise return the default
         #
-        # @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.
-        def configure_foss_defaults_on( hosts )
-          block_on hosts do |host|
-            if (not_controller(host) && host[:version] && (not version_is_less(host[:version], '4.0'))) \
-              or (host['type'] && host['type'] =~ /aio/)
-              # add aio defaults to host
-              add_aio_defaults_on(host)
-            else
-              add_foss_defaults_on(host)
-            end
-            # add pathing env
-            add_puppet_paths_on(host)
+        # @!visibility private
+        def lookup_in_env(env_variable_name, project_name=nil, default=nil)
+          env_variable_name     = "#{env_variable_name.upcase.gsub('-','_')}"
+          project_specific_name = "#{project_name.upcase.gsub('-','_')}_#{env_variable_name}" if project_name
+          project_name && ENV[project_specific_name] || ENV[env_variable_name] || default
+        end
+
+        # @param [String] project_name
+        # @param [String] git_fork     When not provided will use PROJECT_FORK environment variable
+        # @param [String] git_server   When not provided will use PROJECT_SERVER environment variable
+        # @param [String] git_protocol 'git','ssh','https'
+        #
+        # @return [String] Returns a git-usable url
+        #
+        # TODO: enable other protocols, clarify, http://git-scm.com/book/ch4-1.html
+        def build_git_url(project_name, git_fork = nil, git_server = nil, git_protocol='https')
+          git_fork   ||= lookup_in_env('FORK',   project_name, 'puppetlabs')
+          git_server ||= lookup_in_env('SERVER', project_name, 'github.com')
+
+          case git_protocol
+          when /(ssh|git)/
+            git_protocol = 'git@'
+          when /https/
+            git_protocol = 'https://'
           end
+
+          repo = (git_server == 'github.com') ? "#{git_fork}/#{project_name}.git" : "#{git_fork}-#{project_name}.git"
+          return git_protocol == 'git@' ? "#{git_protocol}#{git_server}:#{repo}" : "#{git_protocol}#{git_server}/#{repo}"
         end
+        alias_method :build_giturl, :build_git_url
 
         # @param [String] uri A uri in the format of <git uri>#<revision>
         #                     the `git://`, `http://`, `https://`, and ssh
@@ -119,9 +135,18 @@ module Beaker
           version
         end
 
+        # @param [Host] host An object implementing {Beaker::Hosts}'s
+        #                    interface.
+        # @param [String] path The path on the remote [host] to the repository
+        # @param [Hash{Symbol=>String}] repository A hash representing repo
+        #                                          info like that emitted by
+        #                                          {#extract_repo_info_from}
         #
-        # @see #find_git_repo_versions
-        def install_from_git host, path, repository
+        # @note This requires the helper methods:
+        #       * {Beaker::DSL::Helpers#on}
+        #
+        def clone_git_repo_on host, path, repository, opts = {}
+          opts = {:accept_all_exit_codes => true}.merge(opts)
           name          = repository[:name]
           repo          = repository[:path]
           rev           = repository[:rev]
@@ -140,33 +165,41 @@ module Beaker
 
           logger.notify("\n  * Clone #{repo} if needed")
 
-          on host, "test -d #{path} || mkdir -p #{path}"
-          on host, "test -d #{target} || #{clone_cmd}"
+          on host, "test -d #{path} || mkdir -p #{path}", opts
+          on host, "test -d #{target} || #{clone_cmd}", opts
 
           logger.notify("\n  * Update #{name} and check out revision #{rev}")
-
           commands = ["cd #{target}",
                       "remote rm origin",
                       "remote add origin #{repo}",
                       "fetch origin +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/*:refs/remotes/origin/*",
                       "clean -fdx",
                       "checkout -f #{rev}"]
-          on host, commands.join(" && git ")
+          on host, commands.join(" && git "), opts
+        end
 
+        # @see #find_git_repo_versions
+        # @note This assumes the target repository application
+        #   can be installed via an install.rb ruby script.
+        def install_from_git_on host, path, repository, opts = {}
+          opts = {:accept_all_exit_codes => true}.merge(opts)
+          clone_git_repo_on host, path, repository, opts
+          name          = repository[:name]
           logger.notify("\n  * Install #{name} on the system")
           # The solaris ruby IPS package has bindir set to /usr/ruby/1.8/bin.
           # However, this is not the path to which we want to deliver our
           # binaries. So if we are using solaris, we have to pass the bin and
           # sbin directories to the install.rb
+          target        = "#{path}/#{name}"
           install_opts = ''
-          install_opts = '--bindir=/usr/bin --sbindir=/usr/sbin' if
-            host['platform'].include? 'solaris'
+          install_opts = '--bindir=/usr/bin --sbindir=/usr/sbin' if host['platform'].include? 'solaris'
 
-            on host,  "cd #{target} && " +
-                      "if [ -f install.rb ]; then " +
-                      "ruby ./install.rb #{install_opts}; " +
-                      "else true; fi"
+          on host,  "cd #{target} && " +
+                    "if [ -f install.rb ]; then " +
+                    "ruby ./install.rb #{install_opts}; " +
+                    "else true; fi", opts
         end
+        alias_method :install_from_git, :install_from_git_on
 
         # @deprecated Use {#install_puppet_on} instead.
         def install_puppet(opts = {})
@@ -240,6 +273,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'
@@ -291,12 +328,9 @@ 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
+            add_role(host, 'aio') #we are installing agent, so we want aio role
             case host['platform']
             when /el-4|sles/
               # pe-only agent, get from dev repo
@@ -418,7 +452,7 @@ module Beaker
 
             puppet_pkg = opts[:version] ? "puppet-#{opts[:version]}" : 'puppet'
             host.install_package("#{puppet_pkg}")
-            configure_foss_defaults_on( host )
+            configure_type_defaults_on( host )
           end
         end
         alias_method :install_puppet_from_rpm, :install_puppet_from_rpm_on
@@ -452,7 +486,7 @@ module Beaker
             else
               host.install_package('puppet')
             end
-            configure_foss_defaults_on( host )
+            configure_type_defaults_on( host )
           end
         end
         alias_method :install_puppet_from_deb, :install_puppet_from_deb_on
@@ -488,7 +522,7 @@ module Beaker
               install_a_puppet_msi_on(host, opts)
 
             end
-            configure_foss_defaults_on( host )
+            configure_type_defaults_on( host )
           end
         end
         alias_method :install_puppet_from_msi, :install_puppet_from_msi_on
@@ -537,7 +571,7 @@ module Beaker
         def install_puppet_agent_from_msi_on(hosts, opts)
           block_on hosts do |host|
 
-            host[:type] = 'aio' #we are installing agent, so we want aio type
+            add_role(host, 'aio') #we are installing agent, so we want aio role
             is_config_32 = true == (host['ruby_arch'] == 'x86') || host['install_32'] || opts['install_32']
             should_install_64bit = host.is_x86_64? && !is_config_32
             arch = should_install_64bit ? 'x64' : 'x86'
@@ -561,32 +595,57 @@ module Beaker
               raise "Puppet #{version} at #{link} does not exist!"
             end
 
+
+            msi_download_path = "#{get_temp_path(host)}\\#{host['dist']}.msi"
+
             if host.is_cygwin?
-              dest = "#{host['dist']}.msi"
-              on host, "curl -O #{link}"
+              # NOTE: it is critical that -o be before -O on Windows
+              on host, "curl -o \"#{msi_download_path}\" -O #{link}"
 
               #Because the msi installer doesn't add Puppet to the environment path
               #Add both potential paths for simplicity
               #NOTE - this is unnecessary if the host has been correctly identified as 'foss' during set up
               puppetbin_path = "\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\""
               on host, %Q{ echo 'export PATH=$PATH:#{puppetbin_path}' > /etc/bash.bashrc }
-
-              on host, "cmd /C 'start /w msiexec.exe /qn /i #{dest}'"
             else
-              dest = "C:\\Windows\\Temp\\#{host['dist']}.msi"
-
-              on host, powershell("$webclient = New-Object System.Net.WebClient;  $webclient.DownloadFile('#{link}','#{dest}')")
-
-              on host, "start /w msiexec.exe /qn /i #{dest}"
+              on host, powershell("$webclient = New-Object System.Net.WebClient;  $webclient.DownloadFile('#{link}','#{msi_download_path}')")
             end
 
-            configure_foss_defaults_on( host )
+            opts = { :debug => host[:pe_debug] || opts[:pe_debug] }
+            install_msi_on(host, msi_download_path, {}, opts)
+
+            configure_type_defaults_on( host )
             if not host.is_cygwin?
               host.mkdir_p host['distmoduledir']
             end
           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,
@@ -629,7 +688,7 @@ module Beaker
               host.install_package("facter-#{facter_ver}")
               host.install_package("hiera-#{hiera_ver}")
 
-              configure_foss_defaults_on( host )
+              configure_type_defaults_on( host )
             end
           end
         end
@@ -651,7 +710,7 @@ module Beaker
           opts[:puppet_collection] = opts[:puppet_collection].upcase #needs to be upcase, more lovely consistency
           block_on hosts do |host|
 
-            host[:type] = 'aio' #we are installing agent, so we want aio type
+            add_role(host, 'aio') #we are installing agent, so we want aio role
 
             variant, version, arch, codename = host['platform'].to_array
             agent_version = opts[:puppet_agent_version] || 'latest'
@@ -666,7 +725,27 @@ module Beaker
 
             host.install_package(pkg_name)
 
-            configure_foss_defaults_on( host )
+            configure_type_defaults_on( host )
+          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_type_defaults_on(host)
           end
         end
 
@@ -705,6 +784,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 " +
@@ -726,16 +806,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.
@@ -751,7 +833,13 @@ 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
-            configure_foss_defaults_on( host )
+
+            # 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_type_defaults_on( host )
           end
         end
         alias_method :install_puppet_from_gem,          :install_puppet_from_gem_on
@@ -790,7 +878,7 @@ module Beaker
             else
               raise "No repository installation step for #{variant} yet..."
             end
-            configure_foss_defaults_on( host )
+            configure_type_defaults_on( host )
           end
         end
         alias_method :install_puppetlabs_release_repo, :install_puppetlabs_release_repo_on
@@ -931,7 +1019,7 @@ module Beaker
 
             on host, find_and_sed
             on host, "apt-get update"
-            configure_foss_defaults_on( host )
+            configure_type_defaults_on( host )
 
           else
             raise "No repository installation step for #{variant} yet..."
@@ -960,7 +1048,7 @@ module Beaker
           end
           find_command = "find /root/#{package_name} -type f -name '#{find_filename}' -exec #{find_command} {} \\;"
           on host, find_command
-          configure_foss_defaults_on( host )
+          configure_type_defaults_on( host )
         end
 
         # Install development repo of the puppet-agent on the given host(s).  Downloaded from 
@@ -1007,7 +1095,7 @@ module Beaker
             opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
             opts[:copy_dir_external]  ||= File.join('/', 'root')
             opts[:puppet_collection] ||= 'PC1'
-            host[:type] = 'aio' #we are installing agent, so we want aio type
+            add_role(host, 'aio') #we are installing agent, so we want aio role
             release_path = opts[:download_url]
             variant, version, arch, codename = host['platform'].to_array
             copy_dir_local = File.join(opts[:copy_base_local], variant)
@@ -1056,11 +1144,12 @@ module Beaker
             when /^windows$/
               result = on host, "echo #{onhost_copied_file}"
               onhost_copied_file = result.raw_output.chomp
-              on host, Command.new("start /w #{onhost_copied_file}", [], { :cmdexe => true })
+              opts = { :debug => host[:pe_debug] || opts[:pe_debug] }
+              install_msi_on(host, onhost_copied_file, {}, opts)
             when /^osx$/
               host.install_package("#{mac_pkg_name}*")
             end
-            configure_foss_defaults_on( host )
+            configure_type_defaults_on( host )
           end
         end
         alias_method :install_puppetagent_dev_repo, :install_puppet_agent_dev_repo_on
@@ -1092,14 +1181,14 @@ 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'
-            host[:type] = 'aio' #we are installing agent, so we want aio type
+            add_role(host, 'aio') #we are installing agent, so we want aio role
             release_path = opts[:download_url]
             variant, version, arch, codename = host['platform'].to_array
             copy_dir_local = File.join(opts[:copy_base_local], variant)
@@ -1114,6 +1203,7 @@ module Beaker
               if arch == 'x86_64'
                 arch = 'amd64'
               end
+              version = version[0,2] + '.' + version[2,2] if variant =~ /ubuntu/ && version =~ /\.{0}/
               release_file = "/repos/apt/#{codename}/pool/#{opts[:puppet_collection]}/p/puppet-agent/puppet-agent*#{arch}.deb"
               download_file = "puppet-agent-#{variant}-#{version}-#{arch}.tar.gz"
             when /^windows$/
@@ -1124,7 +1214,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$/
@@ -1141,9 +1231,15 @@ module Beaker
             scp_to host, File.join(copy_dir_local, download_file), onhost_copy_base
 
             case variant
-            when /^(fedora|el|centos|sles)$/
+            when /^(fedora-22)$/
+              on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
+              on host, "dnf --nogpgcheck localinstall -y #{onhost_copied_file}"
+            when /^(fedora|el|centos)$/
               on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
               on host, "yum --nogpgcheck localinstall -y #{onhost_copied_file}"
+            when /^(sles)$/
+              on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
+              on host, "rpm -ihv #{onhost_copied_file}"
             when /^(debian|ubuntu|cumulus)$/
               on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
               on host, "dpkg -i --force-all #{onhost_copied_file}"
@@ -1151,19 +1247,20 @@ module Beaker
             when /^windows$/
               result = on host, "echo #{onhost_copied_file}"
               onhost_copied_file = result.raw_output.chomp
-              on host, Command.new("start /w #{onhost_copied_file}", [], { :cmdexe => true })
+              opts = { :debug => host[:pe_debug] || opts[:pe_debug] }
+              install_msi_on(host, onhost_copied_file, {}, opts)
             when /^osx$/
               on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
               # move to better location
               on host, "mv #{onhost_copied_file}.dmg ."
               host.install_package("puppet-agent-*")
             end
-            configure_foss_defaults_on( host )
+            configure_type_defaults_on( host )
           end
         end
 
 
-        # This method will install a pem file certifcate on a windows host
+        # This method will install a pem file certificate on a windows host
         #
         # @param [Host] host                 A host object
         # @param [String] cert_name          The name of the pem file

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

@@ -11,7 +11,7 @@ module Beaker
         PE_DEFAULTS = {
           'mac' => {
             'puppetserver-confdir' => '/etc/puppetlabs/puppetserver/conf.d',
-            'puppetservice'    => 'pe-httpd',
+            'puppetservice'    => 'pe-puppetserver',
             'puppetpath'       => '/etc/puppetlabs/puppet',
             'puppetconfdir'    => '/etc/puppetlabs/puppet',
             'puppetcodedir'    => '/etc/puppetlabs/puppet',
@@ -26,7 +26,7 @@ module Beaker
           },
           'unix' => {
             'puppetserver-confdir' => '/etc/puppetlabs/puppetserver/conf.d',
-            'puppetservice'    => 'pe-httpd',
+            'puppetservice'    => 'pe-puppetserver',
             'puppetpath'       => '/etc/puppetlabs/puppet',
             'puppetconfdir'    => '/etc/puppetlabs/puppet',
             'puppetbin'        => '/opt/puppet/bin/puppet',
@@ -40,7 +40,7 @@ module Beaker
             'sitemoduledir'    => '/opt/puppet/share/puppet/modules',
           },
           'windows' => { #cygwin windows
-            'puppetservice' => 'pe-httpd',
+            'puppetservice' => 'pe-puppetserver',
             'puppetpath'    => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
             'puppetconfdir' => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
             'puppetcodedir' => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
@@ -53,7 +53,7 @@ module Beaker
             'privatebindir' => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet Enterprise/sys/ruby/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet Enterprise/sys/ruby/bin',
           },
           'pswindows' => { #windows windows
-            'puppetservice' => 'pe-httpd',
+            'puppetservice' => 'pe-puppetserver',
             'puppetpath'    => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc',
             'puppetconfdir' => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc',
             'puppetcodedir' => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc',
@@ -79,10 +79,10 @@ module Beaker
             host['group'] = 'pe-puppet'
           end
           host['type'] = 'pe'
-          # newer pe requires a different puppetservice name, set it here on the master
+          # older pe requires a different puppetservice name, set it here on the master
           if host['roles'].include?('master')
-            if host['pe_ver'] and (not version_is_less(host['pe_ver'], '3.4'))
-              host['puppetservice'] = 'pe-puppetserver'
+            if host['pe_ver'] and (version_is_less(host['pe_ver'], '3.4'))
+              host['puppetservice'] = 'pe-httpd'
             end
           end
         end
@@ -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/