beaker 1.19.1 → 1.20.0

data/lib/beaker/answers/version32.rb

@@ -1,31 +1,36 @@
 require 'beaker/answers/version30'
 
 module Beaker
-  module Answers
-    module Version32
-      def self.answers(hosts, master_certname, options)
-        dashboard = only_host_with_role(hosts, 'dashboard')
-        database = only_host_with_role(hosts, 'database')
-        master = only_host_with_role(hosts, 'master')
+  # This class provides answer file information for PE version 3.2
+  #
+  # @api private
+  class Version32 < Version30
+    # Return answer data for all hosts.
+    #
+    # @return [Hash] A hash (keyed from hosts) containing hashes of answer file
+    #   data.
+    def generate_answers
+      dashboard = only_host_with_role(@hosts, 'dashboard')
+      database = only_host_with_role(@hosts, 'database')
+      master = only_host_with_role(@hosts, 'master')
 
-        the_answers = Version30.answers(hosts, master_certname, options)
-        if dashboard != master
-          # in 3.2, dashboard needs the master certname
-          the_answers[dashboard.name][:q_puppetmaster_certname] = master_certname
-        end
+      the_answers = super
+      if dashboard != master
+        # in 3.2, dashboard needs the master certname
+        the_answers[dashboard.name][:q_puppetmaster_certname] = master
+      end
 
-        if options[:type] == :upgrade && dashboard != database
-          # In a split configuration, there is no way for the upgrader
-          # to know how much disk space is available for the database
-          # migration. We tell it to continue on, because we're
-          # awesome.
-          the_answers[dashboard.name][:q_upgrade_with_unknown_disk_space] = 'y'
-        end
-        hosts.each do |h|
-          h[:answers] = the_answers[h.name]
-        end
-        return the_answers
+      if @options[:type] == :upgrade && dashboard != database
+        # In a split configuration, there is no way for the upgrader
+        # to know how much disk space is available for the database
+        # migration. We tell it to continue on, because we're
+        # awesome.
+        the_answers[dashboard.name][:q_upgrade_with_unknown_disk_space] = 'y'
+      end
+      @hosts.each do |h|
+        h[:answers] = the_answers[h.name]
       end
+      return the_answers
     end
   end
 end

data/lib/beaker/answers/version34.rb

@@ -1,12 +1,12 @@
 require 'beaker/answers/version32'
 
 module Beaker
-  module Answers
-    module Version34
-      def self.answers(hosts, master_certname, options)
-        the_answers = Version32.answers(hosts, master_certname, options)
-        return the_answers
-      end
+  # This class provides answer file information for PE version 3.4
+  #
+  # @api private
+  class Version34 < Version32
+    def generate_answers
+      super
     end
   end
 end

data/lib/beaker/answers.rb

@@ -1,58 +1,92 @@
-[ 'version34', 'version32', 'version30', 'version28', 'version20' ].each do |lib|
-  require "beaker/answers/#{lib}"
-end
-
 module Beaker
-  # This module provides static methods for accessing PE answer file
+  # This class provides methods for generating PE answer file
   # information.
-  module Answers
+  class Answers
 
     # When given a Puppet Enterprise version, a list of hosts and other
-    # qualifying data this method will return a hash (keyed from the hosts)
-    # of default Puppet Enterprise answer file data hashes.
+    # qualifying data this method will return the appropriate object that can be used
+    # to generate answer file data.
     #
     # @param [String] version Puppet Enterprise version to generate answer data for
     # @param [Array<Beaker::Host>] hosts An array of host objects.
-    # @param [String] master_certname Hostname of the puppet master.
     # @param [Hash] options options for answer files
     # @option options [Symbol] :type Should be one of :upgrade or :install.
     # @return [Hash] A hash (keyed from hosts) containing hashes of answer file
     #   data.
-    def self.answers(version, hosts, master_certname, options)
-
+    def self.create version, hosts, options
       case version
       when /\A3\.4/
-        Version34.answers(hosts, master_certname, options)
+        return Version34.new(version, hosts, options)
       when /\A3\.[2-3]/
-        Version32.answers(hosts, master_certname, options)
+        return Version32.new(version, hosts, options)
       when /\A3\.1/
-        Version30.answers(hosts, master_certname, options)
+        return Version30.new(version, hosts, options)
       when /\A3\.0/
-        Version30.answers(hosts, master_certname, options)
+        return Version30.new(version, hosts, options)
       when /\A2\.8/
-        Version28.answers(hosts, master_certname, options)
+        return Version28.new(version, hosts, options)
       when /\A2\.0/
-        Version20.answers(hosts, master_certname, options)
+        return Version20.new(version, hosts, options)
       else
         raise NotImplementedError, "Don't know how to generate answers for #{version}"
       end
     end
 
+    # The answer value for a provided question.  Use the user answer when available, otherwise return the default
+    # @param [Hash] options options for answer file
+    # @option options [Symbol] :answer Contains a hash of user provided question name and answer value pairs.
+    # @param [String] default Should there be no user value for the provided question name return this default
+    # @return [String] The answer value
+    def answer_for(options, q, default = nil)
+      options[:answers][q] ? options[:answers][q] : default
+    end
+
+    # When given a Puppet Enterprise version, a list of hosts and other
+    # qualifying data this method will return a hash (keyed from the hosts)
+    # of default Puppet Enterprise answer file data hashes.
+    #
+    # @param [String] version Puppet Enterprise version to generate answer data for
+    # @param [Array<Beaker::Host>] hosts An array of host objects.
+    # @param [Hash] options options for answer files
+    # @option options [Symbol] :type Should be one of :upgrade or :install.
+    # @return [Hash] A hash (keyed from hosts) containing hashes of answer file
+    #   data.
+    def initialize(version, hosts, options)
+      @version = version
+      @hosts = hosts
+      @options = options
+    end
+
+    # Generate the answers hash based upon version, host and option information
+    def generate_answers
+      raise "This should be handled by subclasses!"
+    end
+
+    # Access the answers hash for this version, host and option information.  If the answers
+    # have not yet been calculated, generate them.
+    # @return [Hash] A hash of answers keyed by host.name
+    def answers
+      @answers ||= generate_answers
+    end
+
     # This converts a data hash provided by answers, and returns a Puppet
     # Enterprise compatible answer file ready for use.
     #
     # @param [Beaker::Host] host Host object in question to generate the answer
     #   file for.
-    # @param [Hash] answers Answers hash as returned by #answers
     # @return [String] a string of answers
     # @example Generating an answer file for a series of hosts
     #   hosts.each do |host|
-    #     answers = Beaker::Answers.answers("2.0", hosts, "master")
-    #     create_remote_file host, "/mypath/answer", Beaker::Answers.answer_string(host, answers)
+    #     answers = Beaker::Answers.new("2.0", hosts, "master")
+    #     create_remote_file host, "/mypath/answer", answers.answer_string(host, answers)
     #  end
-    def self.answer_string(host, answers)
+    def answer_string(host)
       answers[host.name].map { |k,v| "#{k}=#{v}" }.join("\n")
     end
 
   end
+
+  [ 'version34', 'version32', 'version30', 'version28', 'version20' ].each do |lib|
+    require "beaker/answers/#{lib}"
+  end
 end

data/lib/beaker/cli.rb

@@ -104,7 +104,7 @@ module Beaker
       #cleanup phase
       rescue => e
         #cleanup on error
-        if @options[:preserve_hosts].to_s =~ /(never)/
+        if @options[:preserve_hosts].to_s =~ /(never)|(onpass)/
           @logger.notify "Cleanup: cleaning up after failed run"
           if @network_manager
             @network_manager.cleanup
@@ -161,21 +161,25 @@ module Beaker
     #
     # @return nil
     def print_env_vars_affecting_beaker( log_level )
-      beaker_env_vars = Beaker::Options::Presets::ENVIRONMENT_SPEC.values
       non_beaker_env_vars =  [ 'BUNDLE_PATH', 'BUNDLE_BIN', 'GEM_HOME', 'GEM_PATH', 'RUBYLIB', 'PATH']
-      important_env_vars = beaker_env_vars + non_beaker_env_vars
-      env_var_map = important_env_vars.inject({}) do |memo, possibly_set_vars|
+      env_var_map = non_beaker_env_vars.inject({}) do |memo, possibly_set_vars|
         set_var = Array(possibly_set_vars).detect {|possible_var| ENV[possible_var] }
         memo[set_var] = ENV[set_var] if set_var
         memo
       end
 
-      puts ''
-      @logger.send( log_level, "Important ENV variables that may have affected your run:" )
+      env_var_map = env_var_map.merge(Beaker::Options::Presets.new.env_vars)
+
+      @logger.send( log_level, "\nImportant ENV variables that may have affected your run:" )
       env_var_map.each_pair do |var, value|
-        @logger.send( log_level, "    #{var}\t\t#{value}" )
+        if value.is_a?(Hash)
+          value.each_pair do | subvar, subvalue |
+            @logger.send( log_level, "    #{subvar}\t\t#{subvalue}" )
+          end
+        else
+          @logger.send( log_level, "    #{var}\t\t#{value}" )
+        end
       end
-      puts ''
     end
 
     # Prints the command line that can be called to reproduce this run
@@ -186,10 +190,8 @@ module Beaker
     #
     # @return nil
     def print_command_line( log_level = :debug )
-      puts ''
-      @logger.send(log_level, "You can reproduce this run with:\n")
+      @logger.send(log_level, "\nYou can reproduce this run with:\n")
       @logger.send(log_level, @options[:command_line])
-      puts ''
     end
   end
 end

data/lib/beaker/dsl/helpers.rb

@@ -1219,7 +1219,7 @@ module Beaker
       #wait for a given host to appear in the dashboard
       def wait_for_host_in_dashboard(host)
         hostname = host.node_name
-        retry_command("Wait for #{hostname} to be in the console", dashboard, "! curl --sslv3 -k -I https://#{dashboard}/nodes/#{hostname} | grep '404 Not Found'")
+        retry_command("Wait for #{hostname} to be in the console", dashboard, "! curl --tlsv1 -k -I https://#{dashboard}/nodes/#{hostname} | grep '404 Not Found'")
       end
 
       # Ensure the host has requested a cert, then sign it
@@ -1295,7 +1295,7 @@ module Beaker
       #
       def curl_on(host, cmd, opts = {}, &block)
         if options.is_pe? #check global options hash
-          on host, "curl --sslv3 %s" % cmd, opts, &block
+          on host, "curl --tlsv1 %s" % cmd, opts, &block
         else
           on host, "curl %s" % cmd, opts, &block
         end

data/lib/beaker/dsl/install_utils.rb

@@ -428,8 +428,6 @@ module Beaker
       #
       def do_install hosts, opts = {}
         opts[:type] = opts[:type] || :install
-        hostcert='uname | grep -i sunos > /dev/null && hostname || hostname -s'
-        master_certname = on(master, hostcert).stdout.strip
         pre30database = version_is_less(opts[:pe_ver] || database['pe_ver'], '3.0')
         pre30master = version_is_less(opts[:pe_ver] || master['pe_ver'], '3.0')
 
@@ -479,8 +477,8 @@ module Beaker
             # We only need answers if we're using the classic installer
             version = host['pe_ver'] || opts[:pe_ver]
             if (! host['roles'].include? 'frictionless') || version_is_less(version, '3.2.0')
-              answers = Beaker::Answers.answers(opts[:pe_ver] || host['pe_ver'], hosts, master_certname, opts)
-              create_remote_file host, "#{host['working_dir']}/answers", Beaker::Answers.answer_string(host, answers)
+              answers = Beaker::Answers.create(opts[:pe_ver] || host['pe_ver'], hosts, opts)
+              create_remote_file host, "#{host['working_dir']}/answers", answers.answer_string(host)
             else
               # If We're *not* running the classic installer, we want
               # to make sure the master has packages for us.

data/lib/beaker/host.rb

@@ -268,8 +268,8 @@ module Beaker
     # @param target [String] The destination path on the host
     # @param [Hash{Symbol=>String}] options Options to alter execution
     # @option options [Array<String>] :ignore An array of file/dir paths that will not be copied to the host
-    def do_scp_to source, target, options = {}
-      @logger.debug "localhost $ scp #{source} #{@name}:#{target}"
+    def do_scp_to source, target, options
+      @logger.notify "localhost $ scp #{source} #{@name}:#{target} {:ignore => #{options[:ignore]}}"
 
       result = Result.new(@name, [source, target])
       has_ignore = options[:ignore] and not options[:ignore].empty?
@@ -286,21 +286,24 @@ module Beaker
       if File.file?(source) or (File.directory?(source) and not has_ignore)
         source_file = source
         if has_ignore and (source =~ ignore_re)
-          @logger.debug "After rejecting ignored files/dirs, there is no file to copy"
+          @logger.trace "After rejecting ignored files/dirs, there is no file to copy"
           source_file = nil
           result.stdout = "No files to copy"
           result.exit_code = 1
         end
         if source_file
           result = connection.scp_to(source_file, target, options, $dry_run)
+          @logger.trace result.stdout
         end
       else # a directory with ignores
         dir_source = Dir.glob("#{source}/**/*").reject do |f|
           f =~ ignore_re
         end
-        @logger.debug "After rejecting ignored files/dirs, going to scp [#{dir_source.join(", ")}]"
+        @logger.trace "After rejecting ignored files/dirs, going to scp [#{dir_source.join(", ")}]"
 
         # create necessary directory structure on host
+        # run this quietly (no STDOUT)
+        @logger.quiet(true)
         required_dirs = (dir_source.map{ | dir | File.dirname(dir) }).uniq
         require 'pathname'
         source_path = Pathname.new(source)
@@ -312,6 +315,7 @@ module Beaker
             mkdir_p( File.join(target, dir) )
           end
         end
+        @logger.quiet(false)
 
         # copy each file to the host
         dir_source.each do |s|
@@ -322,10 +326,10 @@ module Beaker
             file_path = File.join(target, s)
           end
           result = connection.scp_to(s, file_path, options, $dry_run)
+          @logger.trace result.stdout
         end
       end
 
-      @logger.debug result.stdout
       return result
     end
 

data/lib/beaker/host_prebuilt_steps.rb

@@ -27,6 +27,7 @@ module Beaker
     # @option opts [Beaker::Logger] :logger A {Beaker::Logger} object
     def timesync host, opts
       logger = opts[:logger]
+      ntp_server = opts[:ntp_server] ? opts[:ntp_server] : NTPSERVER
       block_on host do |host|
         logger.notify "Update system time sync for '#{host.name}'"
         if host['platform'].include? 'windows'
@@ -34,17 +35,15 @@ module Beaker
           # is not actually necessary.
           host.exec(Command.new("w32tm /register"), :acceptable_exit_codes => [0,5])
           host.exec(Command.new("net start w32time"), :acceptable_exit_codes => [0,2])
-          host.exec(Command.new("w32tm /config /manualpeerlist:#{NTPSERVER} /syncfromflags:manual /update"))
+          host.exec(Command.new("w32tm /config /manualpeerlist:#{ntp_server} /syncfromflags:manual /update"))
           host.exec(Command.new("w32tm /resync"))
           logger.notify "NTP date succeeded on #{host}"
         else
           case
-            when host['platform'] =~ /solaris-10/
-              ntp_command = "sleep 10 && ntpdate -w #{NTPSERVER}"
             when host['platform'] =~ /sles-/
-              ntp_command = "sntp #{NTPSERVER}"
+              ntp_command = "sntp #{ntp_server}"
             else
-              ntp_command = "ntpdate -t 20 #{NTPSERVER}"
+              ntp_command = "ntpdate -t 20 #{ntp_server}"
           end
           success=false
           try = 0
@@ -135,25 +134,30 @@ module Beaker
     end
 
     #Determine the Extra Packages for Enterprise Linux URL for the provided Enterprise Linux host.
-    # @param [Host] host One host to act upon
-    # @return [String] The URL for EPL for the provided host
+    # @param [Host, Array<Host>] host One host to act on.  Will use host epel_url, epel_arch and epel_pkg
+    #                                 before using defaults provided in opts.
+    # @return [String, String, String] The URL, arch  and package name for EPL for the provided host
+    # @param [Hash{Symbol=>String}] opts Options to alter execution.
+    # @option opts [String] :epel_url Link to download
+    # @option opts [String] :epel_arch Architecture to download (i386, x86_64, etc), defaults to i386
+    # @option opts [String] :epel_6_pkg Package to download from provided link for el-6
+    # @option opts [String] :epel_5_pkg Package to download from provided link for el-5
     # @raise [Exception] Raises an error if the host provided's platform != /el-(5|6)/
-    def epel_info_for! host
-      version = host['platform'].match(/el-(\d+)/)
+    def epel_info_for host, opts
+      version = host['platform'].version
       if not version
-        raise "epel_info_for! not available for #{host.name} on platform #{host['platform']}"
+        raise "epel_info_for not available for #{host.name} on platform #{host['platform']}"
       end
-      version = version[1]
       if version == '6'
-        pkg = 'epel-release-6-8.noarch.rpm'
-        url = "http://mirror.itc.virginia.edu/fedora-epel/6/i386/#{pkg}"
+        url = "#{host[:epel_url] || opts[:epel_url]}/#{version}"
+        pkg = host[:epel_pkg] || opts[:epel_6_pkg]
       elsif version == '5'
-        pkg = 'epel-release-5-4.noarch.rpm'
-        url = "http://archive.linux.duke.edu/pub/epel/5/i386/#{pkg}"
+        url = "#{host[:epel_url] || opts[:epel_url]}/#{version}"
+        pkg = host[:epel_pkg] || opts[:epel_5_pkg]
       else
-        raise "epel_info_for! does not support el version #{version}, on #{host.name}"
+        raise "epel_info_for does not support el version #{version}, on #{host.name}"
       end
-      return url
+      return url, host[:epel_arch] || opts[:epel_arch] || 'i386', pkg
     end
 
     #Run 'apt-get update' on the provided host or hosts.  If the platform of the provided host is not
@@ -214,10 +218,15 @@ module Beaker
     end
 
     #Install EPEL on host or hosts with platform = /el-(5|6)/.  Do nothing on host or hosts of other platforms.
-    # @param [Host, Array<Host>] host One or more hosts to act upon
+    # @param [Host, Array<Host>] host One or more hosts to act upon.  Will use individual host epel_url, epel_arch
+    #                                 and epel_pkg before using defaults provided in opts.
     # @param [Hash{Symbol=>String}] opts Options to alter execution.
     # @option opts [Boolean] :debug If true, print verbose rpm information when installing EPEL
     # @option opts [Beaker::Logger] :logger A {Beaker::Logger} object
+    # @option opts [String] :epel_url Link to download from 
+    # @option opts [String] :epel_arch Architecture of epel to download (i386, x86_64, etc)
+    # @option opts [String] :epel_6_pkg Package to download from provided link for el-6
+    # @option opts [String] :epel_5_pkg Package to download from provided link for el-5
     def add_el_extras( host, opts )
       #add_el_extras
       #only supports el-* platforms
@@ -228,8 +237,12 @@ module Beaker
         when host['platform'] =~ /el-(5|6)/
           result = host.exec(Command.new('rpm -qa | grep epel-release'), :acceptable_exit_codes => [0,1])
           if result.exit_code == 1
-            url = epel_info_for! host
-            host.exec(Command.new("rpm -i#{debug_opt} #{url}"))
+            url, arch, pkg = epel_info_for host, opts
+            host.exec(Command.new("rpm -i#{debug_opt} #{url}/#{arch}/#{pkg}"))
+            #update /etc/yum.repos.d/epel.repo for new baseurl
+            host.exec(Command.new("sed -i -e 's;#baseurl.*$;baseurl=#{Regexp.escape(url)}/\$basearch;' /etc/yum.repos.d/epel.repo"))
+            #remove mirrorlist
+            host.exec(Command.new("sed -i -e '/mirrorlist/d' /etc/yum.repos.d/epel.repo"))
             host.exec(Command.new('yum clean all && yum makecache'))
           end
         else

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -121,18 +121,20 @@ module Beaker
       time_now = Time.now.getgm #ec2 uses GM time
       @ec2.regions.each do |region|
         @logger.debug "Reviewing: #{region.name}"
-        @ec2.regions[region.name].instances.each do |instance|
-          if (instance.key_name =~ /#{key}/)
-            @logger.debug "Examining #{instance.id} (keyname: #{instance.key_name}, launch time: #{instance.launch_time}, status: #{instance.status})"
-            if ((time_now - instance.launch_time) >  max_age*60*60) and instance.status.to_s !~ /terminated/
-              @logger.debug "Kill! #{instance.id}: #{instance.key_name} (Current status: #{instance.status})"
-              begin
-                instance.terminate()
-                kill_count += 1
-              rescue AWS::EC2::Errors => e
-                @logger.debug "Failed to remove instance: #{instance.id}, #{e}"
+        # Note: don't use instances.each here as that funtion doesn't allow proper rescue from error states
+        instances = @ec2.regions[region.name].instances
+        instances.each do |instance|
+          begin
+            if (instance.key_name =~ /#{key}/)
+              @logger.debug "Examining #{instance.id} (keyname: #{instance.key_name}, launch time: #{instance.launch_time}, status: #{instance.status})"
+              if ((time_now - instance.launch_time) >  max_age*60*60) and instance.status.to_s !~ /terminated/
+                @logger.debug "Kill! #{instance.id}: #{instance.key_name} (Current status: #{instance.status})"
+                  instance.terminate()
+                  kill_count += 1
               end
             end
+          rescue AWS::Core::Resource::NotFound, AWS::EC2::Errors => e
+            @logger.debug "Failed to remove instance: #{instance.id}, #{e}"
           end
         end
         # Occasionaly, tearing down ec2 instances leaves orphaned EBS volumes behind -- these stack up quickly.

data/lib/beaker/hypervisor/ec2_helper.rb

@@ -20,6 +20,7 @@ module Beaker
 
       if roles.include? 'dashboard'
         ports << 443
+        ports << 4435
       end
 
       ports

data/lib/beaker/hypervisor/google_compute.rb

@@ -83,7 +83,6 @@ module Beaker
         host['user'] = 'google_compute'
 
         disable_se_linux(host, @options)
-        disable_iptables(host, @options)
         copy_ssh_to_root(host, @options)
         enable_root_login(host, @options)
         host['user'] = default_user

data/lib/beaker/hypervisor/vagrant.rb

@@ -28,38 +28,33 @@ module Beaker
         v_file << "    v.vm.hostname = '#{host.name}'\n"
         v_file << "    v.vm.box = '#{host['box']}'\n"
         v_file << "    v.vm.box_url = '#{host['box_url']}'\n" unless host['box_url'].nil?
+        v_file << "    v.vm.box_version = '#{host['box_version']}'\n" unless host['box_version'].nil?
+        v_file << "    v.vm.box_check_update = '#{host['box_check_update'] ||= 'true'}'\n"
         v_file << "    v.vm.base_mac = '#{randmac}'\n"
         v_file << "    v.vm.network :private_network, ip: \"#{host['ip'].to_s}\", :netmask => \"#{host['netmask'] ||= "255.255.0.0"}\"\n"
 
-        if host['disk_path']
-          v_file << "    v.vm.provider :virtualbox do |vb|\n"
-          v_file << "      vb.name = '#{host.name}'\n"
-          unless File.exist?(host['disk_path'])
-            host['disk_path'] = File.join(host['disk_path'], "#{host.name}.vmdk")
-            v_file << "      vb.customize ['createhd', '--filename', '#{host['disk_path']}', '--size', #{host['disk_size'] ||= 5 * 1024}, '--format', 'vmdk']\n"
-          end
-          v_file << "      vb.customize ['storageattach', :id, '--storagectl', 'SATA Controller', '--port', 1, '--device', 0, '--type', 'hdd', '--medium','#{host['disk_path']}']\n"
-          v_file << "    end\n"
-        end
-
         if /windows/i.match(host['platform'])
           v_file << "    v.vm.network :forwarded_port, guest: 3389, host: 3389\n"
           v_file << "    v.vm.network :forwarded_port, guest: 5985, host: 5985, id: 'winrm', auto_correct: true\n"
           v_file << "    v.vm.guest = :windows"
         end
 
+        v_file << self.class.provider_vfile_section(host, options)
+
         v_file << "  end\n"
         @logger.debug "created Vagrantfile for VagrantHost #{host.name}"
       end
-      v_file << "  c.vm.provider :virtualbox do |vb|\n"
-      v_file << "    vb.customize [\"modifyvm\", :id, \"--memory\", \"#{options['vagrant_memsize'] ||= '1024'}\"]\n"
-      v_file << "  end\n"
       v_file << "end\n"
       File.open(@vagrant_file, 'w') do |f|
         f.write(v_file)
       end
     end
 
+    def self.provider_vfile_section host, options
+      # Backwards compatibility; default to virtualbox
+      Beaker::VagrantVirtualbox.provider_vfile_section(host, options)
+    end
+
     def set_ssh_config host, user
         f = Tempfile.new("#{host.name}")
         ssh_config = Dir.chdir(@vagrant_path) do
@@ -109,7 +104,7 @@ module Beaker
 
     end
 
-    def provision
+    def provision(provider = nil)
       if !@options[:provision] and !File.file?(@vagrant_file)
         raise "Beaker is configured with provision = false but no vagrant file was found at #{@vagrant_file}. You need to enable provision"
       end
@@ -120,7 +115,7 @@ module Beaker
 
         make_vfile @hosts, @options
 
-        vagrant_cmd("up")
+        vagrant_cmd("up#{" --provider #{provider}" if provider}")
       else #set host ip of already up boxes
         @hosts.each do |host|
           host[:ip] = get_ip_from_vagrant_file(host.name)

data/lib/beaker/hypervisor/vagrant_fusion.rb

@@ -0,0 +1,17 @@
+require 'beaker/hypervisor/vagrant'
+
+class Beaker::VagrantFusion < Beaker::Vagrant
+  def provision(provider = 'vmware_fusion')
+    # By default vmware_fusion creates a .vagrant directory relative to the
+    # Vagrantfile path. That means beaker tries to scp the VM to itself unless
+    # we move the VM files elsewhere.
+    ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant/vmware_fusion'
+    super
+  end
+
+  def self.provider_vfile_section(host, options)
+    "    v.vm.provider :vmware_fusion do |v|\n" +
+    "      v.vmx['memsize'] = '#{options['vagrant_memsize'] ||= '1024'}'\n" +
+    "    end\n"
+  end
+end

data/lib/beaker/hypervisor/vagrant_virtualbox.rb

@@ -0,0 +1,26 @@
+require 'beaker/hypervisor/vagrant'
+
+class Beaker::VagrantVirtualbox < Beaker::Vagrant
+  def provision(provider = 'virtualbox')
+    super
+  end
+
+  def self.provider_vfile_section(host, options)
+    provider_section  = ""
+    provider_section << "    v.vm.provider :virtualbox do |vb|\n"
+    provider_section << "      vb.customize ['modifyvm', :id, '--memory', '#{options['vagrant_memsize'] ||= '1024'}']\n"
+    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 << "    end\n"
+    end
+    provider_section << "    end\n"
+
+    provider_section
+  end
+end

data/lib/beaker/hypervisor/vagrant_workstation.rb

@@ -0,0 +1,13 @@
+require 'beaker/hypervisor/vagrant'
+
+class Beaker::VagrantWorkstation < Beaker::Vagrant
+  def provision(provider = 'vmware_workstation')
+    super
+  end
+
+  def self.provider_vfile_section(host, options)
+    "    v.vm.provider :vmware_workstation do |v|\n" +
+    "      v.vmx['memsize'] = '#{options['vagrant_memsize'] ||= '1024'}'\n" +
+    "    end\n"
+  end
+end

data/lib/beaker/hypervisor/vcloud_pooled.rb

@@ -76,7 +76,9 @@ module Beaker
           response = http.request(request)
           parsed_response = JSON.parse(response.body)
           if parsed_response[h['template']] && parsed_response[h['template']]['ok'] && parsed_response[h['template']]['hostname']
-            h['vmhostname'] = parsed_response[h['template']]['hostname']
+            hostname = parsed_response[h['template']]['hostname']
+            domain = parsed_response['domain']
+            h['vmhostname'] = domain ? "#{hostname}.#{domain}" : hostname
           else
             raise "VcloudPooled.provision - no vCloud host free for #{h.name} in pool"
           end