beaker 1.10.0 → 1.11.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmMxMzJlYWRhZjA1M2U5OWUxMGRhZWQ0NWU1Njg2MjA2OGUzNDRkOA==
+    NGI2MDZhMzFhYTIwNGMwNzViMzQ4MjU5NjczOWJhMmY3OGNmOWU2ZQ==
   data.tar.gz: !binary |-
-    MzBiMjE4MGVmM2YyOTBiNmUzNzcwNGJhMWYyNTMzYzA0YmI1YzMzMQ==
+    MWM4MTYyNjdlYzM2NWNhYmU2OWFkMjc1NjhlZTZkNjI4MzRlOTNkNA==
 SHA512:
   metadata.gz: !binary |-
-    YzIyOWQ2MGVkNzk2MWZkZTY2NmQ4YzY1NmRjMGI4ZGMxMzEwNjc2YmI1NWFk
-    MjEzY2NhYjdhNjI0MjNjMDIwN2U4MDk5YzEwY2NhNDk2NTg0NWIxMmY4OTFj
-    YTI2MThkNGExNjVmYjIwNmU4OGY5YjQ5NDA0MTY4ZGE1OGI3NGE=
+    MjY3ZDE5N2MwYjEzMzYxYzk0ZGE3YTA1MzE4NjBjY2UyMzU0OTA3YjFjNzYw
+    NWUxZDJlYWM1N2JjYWM2YWU5YjJlMzRjZTNiMGViNjQ3ZTUzNzI1MTUxNGVk
+    ZmRjYzIzMDZlOGU5M2M5NzEzNmI5MTM1NGEyN2VmMDc3MGM1M2U=
   data.tar.gz: !binary |-
-    YmE3OGU1MGIzMmRjMmM1MGM3MTcwMjdmODM5MzYyYzQ0ZWQyMWQ5N2E4YjQ3
-    NDE2MzQ1YmU0ZDIxOWEwYTAxZDliOTBkOTEwMTQ2ZDJmMTQyNmQ3ZTI3MWU5
-    YWQ1YWE3N2QwYmMyYTRkZjQwMjk2MGJlMGZjMjA4ODVjODEzMDQ=
+    MWU4NmVmN2I0MTQyMjgzZDk1YzI5NGZmOWJiZGEwMGU1MzZmMGI0OTg5NjI4
+    MzNiMTVhNWQ4M2JhMTIzM2E0YTM3MDI3YzFjMjU0NzRjNzI5MGYyN2U4MjNi
+    NjEzNWRiODVjY2UxNGVkOTA1MjU0MWM3OGY2YWY0Zjg3MGFmZjM=

data/.travis.yml

@@ -2,10 +2,10 @@ before_install:
   - gem update --system 2.2.1
   - gem --version
 language: ruby
-script: "bundle exec rspec"
+script: "bundle exec rake travis"
 notifications:
   email: false
 rvm:
   - 2.0.0
   - 1.9.3
-  - 1.8.7
+  - 1.8.7-p374

data/Rakefile

@@ -5,6 +5,15 @@ task :spec do
   Rake::Task['test:spec'].invoke
 end
 
+task :yard do
+  Rake::Task['docs:gen'].invoke
+end
+
+task :travis do
+  Rake::Task['yard'].invoke unless RUBY_VERSION < '1.9'
+  Rake::Task['spec'].invoke
+end
+
 namespace :test do
   desc 'Run specs (with coverage on 1.9), alias `spec` & the default'
   task :spec do
@@ -63,7 +72,11 @@ namespace :docs do
   task :gen => 'docs:clear' do
     original_dir = Dir.pwd
     Dir.chdir( File.expand_path(File.dirname(__FILE__)) )
-    sh 'bundle exec yard doc'
+    output = `bundle exec yard doc`
+    puts output
+    if output =~ /\[warn\]|\[error\]/
+      raise "Errors/Warnings during yard documentation generation"
+    end
     Dir.chdir( original_dir )
   end
 

data/beaker.gemspec

@@ -39,8 +39,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rbvmomi', '1.8.1'
   s.add_runtime_dependency 'blimpy', '~> 0.6'
   s.add_runtime_dependency 'fission', '~> 0.4'
-  s.add_runtime_dependency 'google-api-client', '~> 0.6.4'
+  s.add_runtime_dependency 'google-api-client', '~> 0.7.1'
   s.add_runtime_dependency 'aws-sdk', '~> 1.38'
+  s.add_runtime_dependency 'docker-api' unless RUBY_VERSION < '1.9'
 
   # These are transitive dependencies that we include or pin to because...
   # Ruby 1.8 compatibility

data/lib/beaker/answers/version20.rb

@@ -46,13 +46,13 @@ module Beaker
           master_a[:q_puppetmaster_dnsaltnames]+=","+master['ip']
         end
 
-        dashboard_user = "'#{ENV['q_puppet_enterpriseconsole_auth_user_email'] || 'admin@example.com'}'"
-        smtp_host = "'#{ENV['q_puppet_enterpriseconsole_smtp_host'] || dashboard}'"
-        dashboard_password = ENV['q_puppet_enterpriseconsole_auth_password'] || '~!@#$%^*-/ aZ'
-        smtp_port = "'#{ENV['q_puppet_enterpriseconsole_smtp_port'] || 25}'"
-        smtp_username = ENV['q_puppet_enterpriseconsole_smtp_username']
-        smtp_password = ENV['q_puppet_enterpriseconsole_smtp_password']
-        smtp_use_tls = "'#{ENV['q_puppet_enterpriseconsole_smtp_use_tls'] || 'n'}'"
+        dashboard_user = "'#{options[:answers][:q_puppet_enterpriseconsole_auth_user_email]}'"
+        smtp_host = "'#{options[:answers][:q_puppet_enterpriseconsole_smtp_host] || dashboard}'"
+        dashboard_password = options[:answers][:q_puppet_enterpriseconsole_auth_password]
+        smtp_port = "'#{options[:answers][:q_puppet_enterpriseconsole_smtp_port]}'"
+        smtp_username = options[:answers][:q_puppet_enterpriseconsole_smtp_username]
+        smtp_password = options[:answers][:q_puppet_enterpriseconsole_smtp_password]
+        smtp_use_tls = "'#{options[:answers][:q_puppet_enterpriseconsole_smtp_use_tls]}'"
 
         console_a = {
           :q_puppet_enterpriseconsole_install => 'y',

data/lib/beaker/answers/version28.rb

@@ -47,13 +47,13 @@ module Beaker
           master_a[:q_puppetmaster_dnsaltnames]+=","+master['ip']
         end
 
-        dashboard_user = "'#{ENV['q_puppet_enterpriseconsole_auth_user_email'] || 'admin@example.com'}'"
-        smtp_host = "'#{ENV['q_puppet_enterpriseconsole_smtp_host'] || dashboard}'"
-        dashboard_password = ENV['q_puppet_enterpriseconsole_auth_password'] || '~!@#$%^*-/ aZ'
-        smtp_port = "'#{ENV['q_puppet_enterpriseconsole_smtp_port'] || 25}'"
-        smtp_username = ENV['q_puppet_enterpriseconsole_smtp_username']
-        smtp_password = ENV['q_puppet_enterpriseconsole_smtp_password']
-        smtp_use_tls = "'#{ENV['q_puppet_enterpriseconsole_smtp_use_tls'] || 'n'}'"
+        dashboard_user = "'#{options[:answers][:q_puppet_enterpriseconsole_auth_user_email]}'"
+        smtp_host = "'#{options[:answers][:q_puppet_enterpriseconsole_smtp_host] || dashboard}'"
+        dashboard_password = options[:answers][:q_puppet_enterpriseconsole_auth_password]
+        smtp_port = "'#{options[:answers][:q_puppet_enterpriseconsole_smtp_port]}'"
+        smtp_username = options[:answers][:q_puppet_enterpriseconsole_smtp_username]
+        smtp_password = options[:answers][:q_puppet_enterpriseconsole_smtp_password]
+        smtp_use_tls = "'#{options[:answers][:q_puppet_enterpriseconsole_smtp_use_tls]}'"
 
         console_a = {
           :q_puppet_enterpriseconsole_install => 'y',

data/lib/beaker/answers/version30.rb

@@ -22,7 +22,7 @@ module Beaker
         agent_a = {
           :q_puppetagent_install => 'y',
           :q_puppet_cloud_install => 'y',
-          :q_verify_packages => ENV['q_verify_packages'] || 'y',
+          :q_verify_packages => options[:answers][:q_verify_packages],
           :q_puppet_symlinks_install => 'y',
           :q_puppetagent_certname => host,
           :q_puppetagent_server => master_certname,
@@ -66,8 +66,8 @@ module Beaker
         end
 
         # Common answers for console and database
-        dashboard_password = "'#{ENV['q_puppet_enterpriseconsole_auth_password'] || '~!@#$%^*-/ aZ'}'"
-        puppetdb_password = "'#{ENV['q_puppetdb_password'] || '~!@#$%^*-/ aZ'}'"
+        dashboard_password = "'#{options[:answers][:q_puppet_enterpriseconsole_auth_password]}'" 
+        puppetdb_password = "'#{options[:answers][:q_puppetdb_password]}'"
 
         console_database_a = {
           :q_puppetdb_database_name => 'pe-puppetdb',
@@ -85,13 +85,14 @@ module Beaker
         }
 
         # Console only answers
-        dashboard_user = "'#{ENV['q_puppet_enterpriseconsole_auth_user_email'] || 'admin@example.com'}'"
+        dashboard_user = "'#{options[:answers][:q_puppet_enterpriseconsole_auth_user_email]}'"
 
-        smtp_host = "'#{ENV['q_puppet_enterpriseconsole_smtp_host'] || dashboard}'"
-        smtp_port = "'#{ENV['q_puppet_enterpriseconsole_smtp_port'] || 25}'"
-        smtp_username = ENV['q_puppet_enterpriseconsole_smtp_username']
-        smtp_password = ENV['q_puppet_enterpriseconsole_smtp_password']
-        smtp_use_tls = "'#{ENV['q_puppet_enterpriseconsole_smtp_use_tls'] || 'n'}'"
+
+        smtp_host = "'#{options[:answers][:q_puppet_enterpriseconsole_smtp_host] || dashboard}'"
+        smtp_port = "'#{options[:answers][:q_puppet_enterpriseconsole_smtp_port]}'"
+        smtp_username = options[:answers][:q_puppet_enterpriseconsole_smtp_username]
+        smtp_password = options[:answers][:q_puppet_enterpriseconsole_smtp_password]
+        smtp_use_tls = "'#{options[:answers][:q_puppet_enterpriseconsole_smtp_use_tls]}'"
 
         console_a = {
           :q_puppet_enterpriseconsole_install => 'y',

data/lib/beaker/dsl/helpers.rb

@@ -13,6 +13,7 @@ module Beaker
     # To mix this is into a class you need the following:
     # * a method *hosts* that yields any hosts implementing
     #   {Beaker::Host}'s interface to act upon.
+    # * a method *options* that provides an options hash, see {Beaker::Options::OptionsHash}
     # * a method *logger* that yields a logger implementing
     #   {Beaker::Logger}'s interface.
     # * the module {Beaker::DSL::Roles} that provides access to the various hosts implementing
@@ -245,7 +246,7 @@ module Beaker
       # @param [String] path     The path to the generated repository config
       #                          files. ex: /myproject/pkg/repo_configs
       # @param [String] name     A human-readable name for the repository
-      # @param [String[ version  The version of the project, as used by the
+      # @param [String] version  The version of the project, as used by the
       #                          packaging tools. This can be determined with
       #                          `rake pl:print_build_params` from the packaging
       #                          repo.
@@ -667,7 +668,7 @@ module Beaker
       #                          :expect_failures to create the full list of 
       #                          passing exit codes.
       #
-      # @options opts [Hash]    :environment Additional environment variables to be
+      # @option opts [Hash]     :environment Additional environment variables to be
       #                         passed to the 'puppet apply' command
       #
       # @option opts [Boolean]  :catch_failures (false) By default `puppet
@@ -698,6 +699,11 @@ module Beaker
       #                         from Puppet verion 3.2
       #                         By default it will use the 'current' parser.
       #
+      # @option opts [String]   :modulepath The search path for modules, as
+      #                         a list of directories separated by the system
+      #                         path separator character. (The POSIX path separator
+      #                         is ‘:’, and the Windows path separator is ‘;’.) 
+      #
       # @param [Block] block This method will yield to a block of code passed
       #                      by the caller; this can be used for additional
       #                      validation, etc.
@@ -716,6 +722,7 @@ module Beaker
         args << "--parseonly" if opts[:parseonly]
         args << "--trace" if opts[:trace]
         args << "--parser future" if opts[:future_parser]
+        args << "--modulepath #{opts[:modulepath]}" if opts[:modulepath]
 
         # From puppet help:
         # "... an exit code of '2' means there were changes, an exit code of
@@ -860,8 +867,12 @@ module Beaker
       # forge api v3 canonical source is forgeapi.puppetlabs.com
       #
       # @param machine [String] the host to perform the stub on
-      def stub_forge_on(machine)
-        @forge_ip ||= Resolv.getaddress(forge)
+      # @param forge_host [String] The URL to use as the forge alias, will default to using :forge_host in the 
+      #                             global options hash
+      def stub_forge_on(machine, forge_host = nil)
+        #use global options hash
+        forge_host ||= options[:forge_host]
+        @forge_ip ||= Resolv.getaddress(forge_host)
         stub_hosts_on(machine, 'forge.puppetlabs.com' => @forge_ip)
         stub_hosts_on(machine, 'forgeapi.puppetlabs.com' => @forge_ip)
       end
@@ -870,8 +881,10 @@ module Beaker
       # the forge alias.
       #
       # @see #stub_forge_on
-      def stub_forge
-        stub_forge_on(default)
+      def stub_forge(forge_host = nil)
+        #use global options hash
+        forge_host ||= options[:forge_host]
+        stub_forge_on(default, forge_host)
       end
 
       def sleep_until_puppetdb_started(host)
@@ -1009,6 +1022,124 @@ module Beaker
       end
 
 
+      #Install local module for acceptance testing
+      # should be used as a presuite to ensure local module is copied to the hosts you want, particularly masters
+      # @api dsl
+      # @param [Host, Array<Host>, String, Symbol] host
+      #                   One or more hosts to act upon,
+      #                   or a role (String or Symbol) that identifies one or more hosts.
+      # @option opts [String] :source ('./')
+      #                   The current directory where the module sits, otherwise will try
+      #                         and walk the tree to figure out
+      # @option opts [String] :module_name (nil)
+      #                   Name which the module should be installed under, please do not include author,
+      #                     if none is provided it will attempt to parse the metadata.json and then the Modulefile to determine
+      #                     the name of the module
+      # @option opts [String] :target_module_path (host['puppetpath']/modules)
+      #                   Location where the module should be installed, will default
+      #                    to host['puppetpath']/modules
+      # @raise [ArgumentError] if not host is provided or module_name is not provided and can not be found in Modulefile
+      #
+      def copy_root_module_to(host, opts = {})
+        if !host
+          raise(ArgumentError, "Host must be defined")
+        end
+        source = opts[:source] || parse_for_moduleroot(Dir.getwd)
+        target_module_path = opts[:target_module_path] || "#{host['puppetpath']}/modules"
+
+        module_name = opts[:module_name] || parse_for_modulename(source)
+        if !module_name
+          logger.debug('Still unable to determine the modulename')
+          raise(ArgumentError, "Unable to determine the module name, please update your call of puppet_module_install")
+        end
+
+        module_dir = File.join(target_module_path, module_name)
+        on host, "mkdir -p #{target_module_path}"
+        ['manifests', 'lib', 'templates', 'metadata.json', 'Modulefile', 'files', 'Gemfile'].each do |item|
+          item_source = File.join(source, item)
+          if File.exists? item_source
+            options = {}
+            if File.directory? item_source
+              on host, "mkdir -p #{File.join(module_dir, item)}"
+              options = { :mkdir => true }
+            end
+            host.do_scp_to(item_source, module_dir, options)
+          end
+        end
+      end
+
+
+      #Recursive method for finding the module root
+      # Assumes that a Modulefile exists
+      # @param [String] possible_module_directory
+      #                   will look for Modulefile and if none found go up one level and try again until root is reached
+      #
+      # @return [String,nil]
+      def parse_for_moduleroot(possible_module_directory)
+        if File.exists?("#{possible_module_directory}/Modulefile")
+          possible_module_directory
+        elsif possible_module_directory === '/'
+          logger.error "At root, can't parse for another directory"
+          nil
+        else
+          logger.debug "No Modulefile found at #{possible_module_directory}, moving up"
+          parse_for_moduleroot File.expand_path(File.join(possible_module_directory,'..'))
+        end
+      end
+
+
+      #Parse root directory of a module for module name
+      # Searches for metadata.json and then if none found, Modulefile and parses for the Name attribute
+      # @param [String] root_module_dir
+      # @return [String] module name
+      def parse_for_modulename(root_module_dir)
+        module_name = nil
+        if File.exists?("#{root_module_dir}/metadata.json")
+          logger.debug "Attempting to parse Modulename from metadata.json"
+          module_json = JSON.parse (File.read "#{root_module_dir}/metadata.json")
+          if(module_json.has_key?('name'))
+            module_name = get_module_name(module_json['name'])
+          end
+        end
+        if !module_name && File.exists?("#{root_module_dir}/Modulefile")
+          logger.debug "Attempting to parse Modulename from Modulefile"
+          if /^name\s+'?(\w+-\w+)'?\s*$/i.match(File.read("#{root_module_dir}/Modulefile"))
+            module_name = get_module_name(Regexp.last_match[1])
+          end
+        end
+        if !module_name
+          logger.debug "Unable to determine name, returning null"
+        end
+        module_name
+      end
+
+      #Parse modulename from the pattern 'Auther-ModuleName'
+      #
+      # @param [String] author_module_name <Author>-<ModuleName> pattern
+      #
+      # @return [String,nil]
+      #
+      def get_module_name(author_module_name)
+        split_name = split_author_modulename(author_module_name)
+        if split_name
+          split_name[:module]
+        end
+      end
+
+      #Split the Author-Name into a hash
+      # @param [String] author_module_attr
+      #
+      # @return [Hash<Symbol,String>,nil] :author and :module symbols will be returned
+      #
+      def split_author_modulename(author_module_attr)
+        result = /(\w+)-(\w+)/.match(author_module_attr)
+        if result
+          {:author => result[1], :module => result[2]}
+        else
+          nil
+        end
+      end
+
     end
   end
 end

data/lib/beaker/dsl/install_utils.rb

@@ -6,6 +6,14 @@ module Beaker
     # This module contains methods to help cloning, extracting git info,
     # ordering of Puppet packages, and installing ruby projects that
     # contain an `install.rb` script.
+    #
+    # To mix this is into a class you need the following:
+    # * a method *hosts* that yields any hosts implementing
+    #   {Beaker::Host}'s interface to act upon.
+    # * a method *options* that provides an options hash, see {Beaker::Options::OptionsHash}
+    # * the module {Beaker::DSL::Roles} that provides access to the various hosts implementing
+    #   {Beaker::Host}'s interface to act upon
+    # * the module {Beaker::DSL::Wrappers} the provides convenience methods for {Beaker::DSL::Command} creation
     module InstallUtils
 
       # The default install path
@@ -132,18 +140,18 @@ module Beaker
       #Create the PE install command string based upon the host and options settings
       # @param [Host] host The host that PE is to be installed on
       #                    For UNIX machines using the full PE installer, the host object must have the 'pe_installer' field set correctly.
-      # @param [Hash{Symbol=>String}] options The options
-      # @option options [String] :pe_ver_win Default PE version to install or upgrade to on Windows hosts
+      # @param [Hash{Symbol=>String}] opts The options
+      # @option opts [String] :pe_ver_win Default PE version to install or upgrade to on Windows hosts
       #                          (Othersie uses individual Windows hosts pe_ver)
-      # @option options [String  :pe_ver Default PE version to install or upgrade to
+      # @option opts [String  :pe_ver Default PE version to install or upgrade to
       #                          (Otherwise uses individual hosts pe_ver)
       # @example
-      #      on host, "#{installer_cmd(host, options)} -a #{host['working_dir']}/answers"
+      #      on host, "#{installer_cmd(host, opts)} -a #{host['working_dir']}/answers"
       # @api private
-      def installer_cmd(host, options)
-        version = options[:pe_ver] || host['pe_ver']
+      def installer_cmd(host, opts)
+        version = opts[:pe_ver] || host['pe_ver']
         if host['platform'] =~ /windows/
-          version = options[:pe_ver_win] || host['pe_ver']
+          version = opts[:pe_ver_win] || host['pe_ver']
           "cd #{host['working_dir']} && cmd /C 'start /w msiexec.exe /qn /i puppet-enterprise-#{version}.msi PUPPET_MASTER_SERVER=#{master} PUPPET_AGENT_CERTNAME=#{host}'"
         # Frictionless install didn't exist pre-3.2.0, so in that case we fall
         # through and do a regular install.
@@ -174,18 +182,18 @@ module Beaker
 
       #Determine the PE package to download/upload on a windows host, download/upload that package onto the host.
       # @param [Host] host The windows host to download/upload and unpack PE onto
-      # @param  [Hash{Symbol=>Symbol, String}] options The options
-      # @option options [String] :pe_dir Default directory or URL to pull PE package from
+      # @param  [Hash{Symbol=>Symbol, String}] opts The options
+      # @option opts [String] :pe_dir Default directory or URL to pull PE package from
       #                  (Otherwise uses individual hosts pe_dir)
-      # @option options [String] :pe_ver Default PE version to install or upgrade to
+      # @option opts [String] :pe_ver Default PE version to install or upgrade to
       #                  (Otherwise uses individual hosts pe_ver)
-      # @option options [String] :pe_ver_win Default PE version to install or upgrade to on Windows hosts
+      # @option opts [String] :pe_ver_win Default PE version to install or upgrade to on Windows hosts
       #                  (Otherwise uses individual Windows hosts pe_ver)
       # @api private
-      def fetch_puppet_on_windows(host, options)
-        path = options[:pe_dir] || host['pe_dir']
+      def fetch_puppet_on_windows(host, opts)
+        path = opts[:pe_dir] || host['pe_dir']
         local = File.directory?(path)
-        version = options[:pe_ver_win] || host['pe_ver']
+        version = opts[:pe_ver_win] || host['pe_ver']
         filename = "puppet-enterprise-#{version}"
         extension = ".msi"
         if local
@@ -204,14 +212,14 @@ module Beaker
       #Determine the PE package to download/upload on a unix style host, download/upload that package onto the host
       #and unpack it.
       # @param [Host] host The unix style host to download/upload and unpack PE onto
-      # @param  [Hash{Symbol=>Symbol, String}] options The options
-      # @option options [String] :pe_dir Default directory or URL to pull PE package from
+      # @param  [Hash{Symbol=>Symbol, String}] opts The options
+      # @option opts [String] :pe_dir Default directory or URL to pull PE package from
       #                  (Otherwise uses individual hosts pe_dir)
-      # @option options [String] :pe_ver Default PE version to install or upgrade to
+      # @option opts [String] :pe_ver Default PE version to install or upgrade to
       #                  (Otherwise uses individual hosts pe_ver)
       # @api private
-      def fetch_puppet_on_unix(host, options)
-        path = options[:pe_dir] || host['pe_dir']
+      def fetch_puppet_on_unix(host, opts)
+        path = opts[:pe_dir] || host['pe_dir']
         local = File.directory?(path)
         filename = "#{host['dist']}"
         if local
@@ -241,24 +249,24 @@ module Beaker
       #Determine the PE package to download/upload per-host, download/upload that package onto the host
       #and unpack it.
       # @param [Array<Host>] hosts The hosts to download/upload and unpack PE onto
-      # @param  [Hash{Symbol=>Symbol, String}] options The options
-      # @option options [String] :pe_dir Default directory or URL to pull PE package from
+      # @param  [Hash{Symbol=>Symbol, String}] opts The options
+      # @option opts [String] :pe_dir Default directory or URL to pull PE package from
       #                  (Otherwise uses individual hosts pe_dir)
-      # @option options [String] :pe_ver Default PE version to install or upgrade to
+      # @option opts [String] :pe_ver Default PE version to install or upgrade to
       #                  (Otherwise uses individual hosts pe_ver)
-      # @option options [String] :pe_ver_win Default PE version to install or upgrade to on Windows hosts
+      # @option opts [String] :pe_ver_win Default PE version to install or upgrade to on Windows hosts
       #                  (Otherwise uses individual Windows hosts pe_ver)
       # @api private
-      def fetch_puppet(hosts, options)
+      def fetch_puppet(hosts, opts)
         hosts.each do |host|
           # We install Puppet from the master for frictionless installs, so we don't need to *fetch* anything
-          next if host['roles'].include? 'frictionless' and ! version_is_less(options[:pe_ver] || host['pe_ver'], '3.2.0')
+          next if host['roles'].include? 'frictionless' and ! version_is_less(opts[:pe_ver] || host['pe_ver'], '3.2.0')
 
           windows = host['platform'] =~ /windows/
           if windows
-            fetch_puppet_on_windows(host, options)
+            fetch_puppet_on_windows(host, opts)
           else
-            fetch_puppet_on_unix(host, options)
+            fetch_puppet_on_unix(host, opts)
           end
         end
       end
@@ -276,26 +284,28 @@ module Beaker
 
       #Perform a Puppet Enterprise upgrade or install
       # @param [Array<Host>] hosts The hosts to install or upgrade PE on
-      # @param  [Hash{Symbol=>Symbol, String}] options The options
-      # @option options [String] :pe_dir Default directory or URL to pull PE package from
+      # @param  [Hash{Symbol=>Symbol, String}] opts The options
+      # @option opts [String] :pe_dir Default directory or URL to pull PE package from
       #                  (Otherwise uses individual hosts pe_dir)
-      # @option options [String] :pe_ver Default PE version to install or upgrade to
+      # @option opts [String] :pe_ver Default PE version to install or upgrade to
       #                  (Otherwise uses individual hosts pe_ver)
-      # @option options [String] :pe_ver_win Default PE version to install or upgrade to on Windows hosts
+      # @option opts [String] :pe_ver_win Default PE version to install or upgrade to on Windows hosts
       #                  (Otherwise uses individual Windows hosts pe_ver)
-      # @option options [Symbol] :type (:install) One of :upgrade or :install
+      # @option opts [Symbol] :type (:install) One of :upgrade or :install
+      # @option opts [Hash<String>] :answers Pre-set answers based upon ENV vars and defaults
+      #                             (See {Beaker::Options::Presets.env_vars})
       #
       # @example
       #  do_install(hosts, {:type => :upgrade, :pe_dir => path, :pe_ver => version, :pe_ver_win =>  version_win})
       #
       # @api private
       #
-      def do_install hosts, options = {}
-        options[:type] = options[:type] || :install
+      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(options[:pe_ver] || database['pe_ver'], '3.0')
-        pre30master = version_is_less(options[:pe_ver] || master['pe_ver'], '3.0')
+        pre30database = version_is_less(opts[:pe_ver] || database['pe_ver'], '3.0')
+        pre30master = version_is_less(opts[:pe_ver] || master['pe_ver'], '3.0')
 
         # Set PE distribution for all the hosts, create working dir
         use_all_tar = ENV['PE_USE_ALL_TAR'] == 'true'
@@ -303,25 +313,25 @@ module Beaker
           host['pe_installer'] ||= 'puppet-enterprise-installer'
           if host['platform'] !~ /windows/
             platform = use_all_tar ? 'all' : host['platform']
-            version = options[:pe_ver] || host['pe_ver']
+            version = opts[:pe_ver] || host['pe_ver']
             host['dist'] = "puppet-enterprise-#{version}-#{platform}"
           end
           host['working_dir'] = "/tmp/" + Time.new.strftime("%Y-%m-%d_%H.%M.%S") #unique working dirs make me happy
           on host, "mkdir #{host['working_dir']}"
         end
 
-        fetch_puppet(hosts, options)
+        fetch_puppet(hosts, opts)
 
         hosts.each do |host|
           # Database host was added in 3.0. Skip it if installing an older version
           next if host == database and host != master and host != dashboard and pre30database
           if host['platform'] =~ /windows/
-            on host, installer_cmd(host, options)
+            on host, installer_cmd(host, opts)
           else
             # We only need answers if we're using the classic installer
-            version = options[:pe_ver] || host['pe_ver']
+            version = opts[:pe_ver] || host['pe_ver']
             if (! host['roles'].include? 'frictionless') || version_is_less(version, '3.2.0')
-              answers = Beaker::Answers.answers(options[:pe_ver] || host['pe_ver'], hosts, master_certname, options)
+              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)
             else
               # If We're *not* running the classic installer, we want
@@ -329,7 +339,7 @@ module Beaker
               deploy_frictionless_to_master(host)
             end
 
-            on host, installer_cmd(host, options)
+            on host, installer_cmd(host, opts)
           end
         end
 
@@ -440,7 +450,7 @@ module Beaker
       # @return nil
       def install_puppet
         hosts.each do |host|
-          if host['platform'] =~ /el-(5|6)/
+          if host['platform'] =~ /el-(5|6|7)/
             relver = $1
             on host, "rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-el-#{relver}.noarch.rpm"
             on host, 'yum install -y puppet'
@@ -449,6 +459,9 @@ module Beaker
             on host, "rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-fedora-#{relver}.noarch.rpm"
             on host, 'yum install -y puppet'
           elsif host['platform'] =~ /(ubuntu|debian)/
+            if ! host.check_for_package 'lsb-release'
+              host.install_package('lsb-release')
+            end
             if ! host.check_for_package 'curl'
               on host, 'apt-get install -y curl'
             end
@@ -484,7 +497,8 @@ module Beaker
               Beaker::Options::PEVersionScraper.load_pe_version(host[:pe_dir] || options[:pe_dir], options[:pe_version_file])
           end
         end
-        do_install sorted_hosts
+        #send in the global options hash
+        do_install sorted_hosts, options
       end
 
       #Upgrade PE based upon host configuration and options
@@ -512,7 +526,8 @@ module Beaker
             host['pe_installer'] ||= 'puppet-enterprise-upgrader'
           end
         end
-        do_install(sorted_hosts, {:type => :upgrade})
+        #send in the global options hash
+        do_install(sorted_hosts, options.merge({:type => :upgrade}))
       end
     end
   end