beaker 2.18.0 → 2.19.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.19.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -248,6 +248,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: beaker-answers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: stringify-hash
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
@@ -390,6 +418,7 @@ files:
 - acceptance/fixtures/module/spec/spec_helper_acceptance.rb
 - acceptance/fixtures/module/tests/init.pp
 - acceptance/fixtures/module/vendor/bundle/ruby/gems.txt
+- acceptance/lib/beaker/acceptance/install_utils.rb
 - acceptance/pre_suite/README.md
 - acceptance/pre_suite/pe/install.rb
 - acceptance/pre_suite/puppet_gem/install.rb
@@ -397,6 +426,7 @@ files:
 - acceptance/pre_suite/puppet_pkg/install.rb
 - acceptance/tests/base/README.md
 - acceptance/tests/base/host.rb
+- acceptance/tests/foss_utils/clone_git_repo_on.rb
 - acceptance/tests/hypervisor/communication.rb
 - acceptance/tests/puppet/README.md
 - acceptance/tests/puppet/install_smoke.rb
@@ -404,14 +434,6 @@ files:
 - bin/beaker
 - ext/completion/beaker-completion.bash
 - lib/beaker.rb
-- lib/beaker/answers.rb
-- lib/beaker/answers/version20.rb
-- lib/beaker/answers/version28.rb
-- lib/beaker/answers/version30.rb
-- lib/beaker/answers/version32.rb
-- lib/beaker/answers/version34.rb
-- lib/beaker/answers/version38.rb
-- lib/beaker/answers/version40.rb
 - lib/beaker/cli.rb
 - lib/beaker/command.rb
 - lib/beaker/command_factory.rb
@@ -434,6 +456,7 @@ files:
 - lib/beaker/dsl/install_utils/pe_defaults.rb
 - lib/beaker/dsl/install_utils/pe_utils.rb
 - lib/beaker/dsl/install_utils/puppet_utils.rb
+- lib/beaker/dsl/install_utils/windows_utils.rb
 - lib/beaker/dsl/outcomes.rb
 - lib/beaker/dsl/patterns.rb
 - lib/beaker/dsl/roles.rb
@@ -447,6 +470,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
@@ -518,7 +542,6 @@ files:
 - lib/beaker/test_case.rb
 - lib/beaker/test_suite.rb
 - lib/beaker/version.rb
-- spec/beaker/answers_spec.rb
 - spec/beaker/cli_spec.rb
 - spec/beaker/command_spec.rb
 - spec/beaker/dsl/assertions_spec.rb
@@ -535,6 +558,7 @@ files:
 - spec/beaker/dsl/install_utils/pe_defaults_spec.rb
 - spec/beaker/dsl/install_utils/pe_utils_spec.rb
 - spec/beaker/dsl/install_utils/puppet_utils_spec.rb
+- spec/beaker/dsl/install_utils/windows_utils_spec.rb
 - spec/beaker/dsl/outcomes_spec.rb
 - spec/beaker/dsl/roles_spec.rb
 - spec/beaker/dsl/structure_spec.rb

data/lib/beaker/answers/version20.rb

@@ -1,120 +0,0 @@
-module Beaker
-  # This class provides answer file information for PE version 2.0
-  #
-  # @api private
-  class Version20 < Answers
-    # Return answer data for a host
-    #
-    # @param [Beaker::Host] host Host to return data for
-    # @param [Beaker::Host] master Host object representing the master
-    # @param [Beaker::Host] dashboard Host object representing the dashboard
-    # @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 host_answers(host, master, dashboard, options)
-      return nil if host['platform'] =~ /windows/
-
-      agent_a = {
-        :q_install => 'y',
-        :q_puppetagent_install => 'y',
-        :q_puppet_cloud_install => 'y',
-        :q_puppet_symlinks_install => 'y',
-        :q_vendor_packages_install => 'y',
-        :q_puppetagent_certname => host.to_s,
-        :q_puppetagent_server => master.to_s,
-
-        # Disable console and master by default
-        # This will be overridden by other blocks being merged in
-        :q_puppetmaster_install => 'n',
-        :q_puppet_enterpriseconsole_install => 'n',
-      }
-
-      master_dns_altnames = [master.to_s, master['ip'], 'puppet'].compact.uniq.join(',')
-      master_a = {
-        :q_puppetmaster_install => 'y',
-        :q_puppetmaster_certname => master.to_s,
-        :q_puppetmaster_dnsaltnames => master_dns_altnames,
-        :q_puppetmaster_enterpriseconsole_hostname => dashboard.to_s,
-        :q_puppetmaster_enterpriseconsole_port => answer_for(options, :q_puppetmaster_enterpriseconsole_port, 443),
-        :q_puppetmaster_forward_facts => 'y',
-      }
-
-      dashboard_user = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_user_email)}'"
-      smtp_host = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_host, dashboard.to_s)}'"
-      dashboard_password = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_password)}'"
-      smtp_port = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_port)}'"
-      smtp_username = answer_for(options, :q_puppet_enterpriseconsole_smtp_username)
-      smtp_password = answer_for(options, :q_puppet_enterpriseconsole_smtp_password)
-      smtp_use_tls = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_use_tls)}'"
-      auth_database_name = answer_for(options, :q_puppet_enterpriseconsole_auth_database_name, 'console_auth')
-      auth_database_user = answer_for(options, :q_puppet_enterpriseconsole_auth_database_user, 'mYu7hu3r')
-      console_database_name = answer_for(options, :q_puppet_enterpriseconsole_database_name, 'console')
-      console_database_user = answer_for(options, :q_puppet_enterpriseconsole_database_user, 'mYc0nS03u3r')
-      console_inventory_port = answer_for(options, :q_puppet_enterpriseconsole_inventory_port, 8140)
-      console_httpd_port = answer_for(options, :q_puppet_enterpriseconsole_httpd_port, 443)
-
-      console_a = {
-        :q_puppet_enterpriseconsole_install => 'y',
-        :q_puppet_enterpriseconsole_database_install => 'y',
-        :q_puppet_enterpriseconsole_auth_database_name => auth_database_name,
-        :q_puppet_enterpriseconsole_auth_database_user => auth_database_user,
-        :q_puppet_enterpriseconsole_auth_database_password => dashboard_password,
-        :q_puppet_enterpriseconsole_database_name => console_database_name,
-        :q_puppet_enterpriseconsole_database_user => console_database_user,
-        :q_puppet_enterpriseconsole_database_root_password => dashboard_password,
-        :q_puppet_enterpriseconsole_database_password => dashboard_password,
-        :q_puppet_enterpriseconsole_inventory_hostname => host.to_s,
-        :q_puppet_enterpriseconsole_inventory_certname => host.to_s,
-        :q_puppet_enterpriseconsole_inventory_dnsaltnames => master.to_s,
-        :q_puppet_enterpriseconsole_inventory_port => console_inventory_port,
-        :q_puppet_enterpriseconsole_master_hostname => master.to_s,
-        :q_puppet_enterpriseconsole_auth_user_email => dashboard_user,
-        :q_puppet_enterpriseconsole_auth_password => dashboard_password,
-        :q_puppet_enterpriseconsole_httpd_port => console_httpd_port,
-        :q_puppet_enterpriseconsole_smtp_host => smtp_host,
-        :q_puppet_enterpriseconsole_smtp_use_tls => smtp_use_tls,
-        :q_puppet_enterpriseconsole_smtp_port => smtp_port,
-      }
-
-      console_a[:q_puppet_enterpriseconsole_auth_user] = console_a[:q_puppet_enterpriseconsole_auth_user_email]
-
-      if smtp_password and smtp_username
-        console_a.merge!({
-                           :q_puppet_enterpriseconsole_smtp_password => "'#{smtp_password}'",
-                           :q_puppet_enterpriseconsole_smtp_username => "'#{smtp_username}'",
-                           :q_puppet_enterpriseconsole_smtp_user_auth => 'y'
-                         })
-      end
-
-      answers = agent_a.dup
-      if host == master
-        answers.merge! master_a
-      end
-
-      if host == dashboard
-        answers.merge! console_a
-      end
-
-      return answers
-    end
-
-    # Return answer data for all hosts.
-    #
-    # @return [Hash] A hash (keyed from hosts) containing hashes of answer file
-    #   data.
-    def generate_answers
-      the_answers = {}
-      dashboard = only_host_with_role(@hosts, 'dashboard')
-      master = only_host_with_role(@hosts, 'master')
-      @hosts.each do |h|
-        the_answers[h.name] = host_answers(h, master, dashboard, @options)
-        if the_answers[h.name] && h[:custom_answers]
-          the_answers[h.name] = the_answers[h.name].merge(h[:custom_answers])
-        end
-        h[:answers] = the_answers[h.name]
-      end
-      return the_answers
-    end
-  end
-end

data/lib/beaker/answers/version28.rb

@@ -1,121 +0,0 @@
-module Beaker
-  # This class provides answer file information for PE version 2.8
-  #
-  # @api private
-  class Version28 < Answers
-
-    # Return answer data for a host
-    #
-    # @param [Beaker::Host] host Host to return data for
-    # @param [Beaker::Host] master Host object representing the master
-    # @param [Beaker::Host] dashboard Host object representing the dashboard
-    # @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 host_answers(host, master, dashboard, options)
-      return nil if host['platform'] =~ /windows/
-
-      agent_a = {
-        :q_install => 'y',
-        :q_puppetagent_install => 'y',
-        :q_puppet_cloud_install => 'y',
-        :q_puppet_symlinks_install => 'y',
-        :q_vendor_packages_install => 'y',
-        :q_puppetagent_certname => host.to_s,
-        :q_puppetagent_server => master.to_s,
-
-        # Disable console and master by default
-        # This will be overridden by other blocks being merged in
-        :q_puppetmaster_install => 'n',
-        :q_puppet_enterpriseconsole_install => 'n',
-      }
-
-      master_dns_altnames = [master.to_s, master['ip'], 'puppet'].compact.uniq.join(',')
-      master_a = {
-        :q_puppetmaster_install => 'y',
-        :q_puppetmaster_certname => master.to_s,
-        :q_puppetmaster_dnsaltnames => master_dns_altnames,
-        :q_puppetmaster_enterpriseconsole_hostname => dashboard.to_s,
-        :q_puppetmaster_enterpriseconsole_port => answer_for(options, :q_puppetmaster_enterpriseconsole_port, 443),
-        :q_puppetmaster_forward_facts => 'y',
-      }
-
-      dashboard_user = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_user_email)}'"
-      smtp_host = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_host, dashboard.to_s)}'"
-      dashboard_password = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_password)}'"
-      smtp_port = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_port)}'"
-      smtp_username = answer_for(options, :q_puppet_enterpriseconsole_smtp_username)
-      smtp_password = answer_for(options, :q_puppet_enterpriseconsole_smtp_password)
-      smtp_use_tls = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_use_tls)}'"
-      auth_database_name = answer_for(options, :q_puppet_enterpriseconsole_auth_database_name, 'console_auth')
-      auth_database_user = answer_for(options, :q_puppet_enterpriseconsole_auth_database_user, 'mYu7hu3r')
-      console_database_name = answer_for(options, :q_puppet_enterpriseconsole_database_name, 'console')
-      console_database_user = answer_for(options, :q_puppet_enterpriseconsole_database_user, 'mYc0nS03u3r')
-      console_inventory_port = answer_for(options, :q_puppet_enterpriseconsole_inventory_port, 8140)
-      console_httpd_port = answer_for(options, :q_puppet_enterpriseconsole_httpd_port, 443)
-
-      console_a = {
-        :q_puppet_enterpriseconsole_install => 'y',
-        :q_puppet_enterpriseconsole_database_install => 'y',
-        :q_puppet_enterpriseconsole_auth_database_name => auth_database_name,
-        :q_puppet_enterpriseconsole_auth_database_user => auth_database_user,
-        :q_puppet_enterpriseconsole_auth_database_password => dashboard_password,
-        :q_puppet_enterpriseconsole_database_name => console_database_name,
-        :q_puppet_enterpriseconsole_database_user => console_database_user,
-        :q_puppet_enterpriseconsole_database_password => dashboard_password,
-        :q_puppet_enterpriseconsole_inventory_hostname => host.to_s,
-        :q_puppet_enterpriseconsole_inventory_certname => host.to_s,
-        :q_puppet_enterpriseconsole_inventory_dnsaltnames => master.to_s,
-        :q_puppet_enterpriseconsole_inventory_port => console_inventory_port,
-        :q_puppet_enterpriseconsole_master_hostname => master.to_s,
-        :q_puppet_enterpriseconsole_auth_user_email => dashboard_user,
-        :q_puppet_enterpriseconsole_auth_password => dashboard_password,
-        :q_puppet_enterpriseconsole_httpd_port => console_httpd_port,
-        :q_puppet_enterpriseconsole_smtp_host => smtp_host,
-        :q_puppet_enterpriseconsole_smtp_use_tls => smtp_use_tls,
-        :q_puppet_enterpriseconsole_smtp_port => smtp_port,
-      }
-
-      console_a[:q_puppet_enterpriseconsole_auth_user] = console_a[:q_puppet_enterpriseconsole_auth_user_email]
-
-      if smtp_password and smtp_username
-        console_a.merge!({
-                           :q_puppet_enterpriseconsole_smtp_password => "'#{smtp_password}'",
-                           :q_puppet_enterpriseconsole_smtp_username => "'#{smtp_username}'",
-                           :q_puppet_enterpriseconsole_smtp_user_auth => 'y'
-                         })
-      end
-
-      answers = agent_a.dup
-      if host == master
-        answers.merge! master_a
-      end
-
-      if host == dashboard
-        answers.merge! console_a
-      end
-
-      return answers
-    end
-
-    # Return answer data for all hosts.
-    #
-    # @return [Hash] A hash (keyed from hosts) containing hashes of answer file
-    #   data.
-    def generate_answers
-      the_answers = {}
-      dashboard = only_host_with_role(@hosts, 'dashboard')
-      master = only_host_with_role(@hosts, 'master')
-      @hosts.each do |h|
-        the_answers[h.name] = host_answers(h, master, dashboard, @options)
-        if the_answers[h.name] && h[:custom_answers]
-          the_answers[h.name] = the_answers[h.name].merge(h[:custom_answers])
-        end
-        h[:answers] = the_answers[h.name]
-      end
-      return the_answers
-    end
-
-  end
-end

data/lib/beaker/answers/version30.rb

@@ -1,227 +0,0 @@
-module Beaker
-  # This class provides answer file information for PE version 3.x
-  #
-  # @api private
-  class Version30 < Answers
-    # Return answer data for a host
-    #
-    # @param [Beaker::Host] host Host to return data for
-    # @param [Beaker::Host] master Host object representing the master
-    # @param [Beaker::Host] dashboard Host object representing the dashboard
-    # @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 host_answers(host, master, database, dashboard, options)
-      # Windows hosts don't have normal answers...
-      return nil if host['platform'] =~ /windows/
-      masterless = options[:masterless]
-
-      # Everything's an agent
-      agent_a = {
-        :q_puppetagent_install => answer_for(options, :q_puppetagent_install, 'y'),
-        :q_puppet_cloud_install => answer_for(options, :q_puppet_cloud_install, 'y'),
-        :q_verify_packages => answer_for(options, :q_verify_packages, 'y'),
-        :q_puppet_symlinks_install => answer_for(options, :q_puppet_symlinks_install, 'y'),
-        :q_puppetagent_certname => answer_for(options, :q_puppetagent_certname, host.to_s),
-
-        # Disable database, console, and master by default
-        # This will be overridden by other blocks being merged in.
-        :q_puppetmaster_install => answer_for(options, :q_puppetmaster_install, 'n'),
-        :q_all_in_one_install => answer_for(options, :q_all_in_one_install, 'n'),
-        :q_puppet_enterpriseconsole_install => answer_for(options, :q_puppet_enterpriseconsole_install, 'n'),
-        :q_puppetdb_install => answer_for(options, :q_puppetdb_install, 'n'),
-        :q_database_install => answer_for(options, :q_database_install, 'n'),
-      }
-      agent_a[:q_puppetagent_server] = masterless ? host.to_s : master.to_s
-      agent_a[:q_continue_or_reenter_master_hostname] = 'c' if masterless
-
-      # These base answers are needed by all
-      common_a = {
-        :q_install => answer_for(options, :q_install, 'y'),
-        :q_vendor_packages_install => answer_for(options, :q_vendor_packages_install, 'y'),
-      }
-
-      unless masterless
-        # master/database answers
-        master_database_a = {
-          :q_puppetmaster_certname => answer_for(options, :q_puppetmaster_certname, master.to_s)
-        }
-
-        # Master/dashboard answers
-        master_console_a = {
-          :q_puppetdb_hostname  => answer_for(options, :q_puppetdb_hostname, database.to_s),
-          :q_puppetdb_port      => answer_for(options, :q_puppetdb_port, 8081)
-        }
-
-        # Master only answers
-        master_dns_altnames = [master.to_s, master['ip'], 'puppet'].compact.uniq.join(',')
-        master_a = {
-          :q_puppetmaster_install => answer_for(options, :q_puppetmaster_install, 'y'),
-          :q_puppetmaster_dnsaltnames => master_dns_altnames,
-          :q_puppetmaster_enterpriseconsole_hostname => answer_for(options, :q_puppetmaster_enterpriseconsole_hostname, dashboard.to_s),
-          :q_puppetmaster_enterpriseconsole_port => answer_for(options, :q_puppetmaster_enterpriseconsole_port, 443),
-        }
-
-        # Common answers for console and database
-        console_auth_password = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_password)}'"
-        puppetdb_database_name = answer_for(options, :q_puppetdb_database_name, 'pe-puppetdb')
-        puppetdb_database_user = answer_for(options, :q_puppetdb_database_user, 'mYpdBu3r')
-        puppetdb_database_password = answer_for(options, :q_puppetdb_database_password, "'#{answer_for(options, :q_puppetdb_password)}'")
-        console_auth_database_name = answer_for(options, :q_puppet_enterpriseconsole_auth_database_name, 'console_auth')
-        console_auth_database_user = answer_for(options, :q_puppet_enterpriseconsole_auth_database_user, 'mYu7hu3r')
-        console_auth_database_password = answer_for(options, :q_puppet_enterpriseconsole_auth_database_password, console_auth_password)
-        console_database_name = answer_for(options, :q_puppet_enterpriseconsole_database_name, 'console')
-        console_database_user = answer_for(options, :q_puppet_enterpriseconsole_database_user, 'mYc0nS03u3r')
-        console_database_host = answer_for(options, :q_database_host, database.to_s)
-        console_database_port = answer_for(options, :q_database_port, 5432)
-        console_database_password = answer_for(options, :q_puppet_enterpriseconsole_database_password, console_auth_password)
-
-        console_database_a = {
-          :q_puppetdb_database_name => puppetdb_database_name,
-          :q_puppetdb_database_user => puppetdb_database_user,
-          :q_puppetdb_database_password => puppetdb_database_password,
-          :q_puppet_enterpriseconsole_auth_database_name => console_auth_database_name,
-          :q_puppet_enterpriseconsole_auth_database_user => console_auth_database_user,
-          :q_puppet_enterpriseconsole_auth_database_password => console_auth_database_password,
-          :q_puppet_enterpriseconsole_database_name => console_database_name,
-          :q_puppet_enterpriseconsole_database_user => console_database_user,
-          :q_puppet_enterpriseconsole_database_password => console_database_password,
-          :q_database_host => console_database_host,
-          :q_database_port => console_database_port,
-        }
-
-        # Console only answers
-        dashboard_user = "'#{answer_for(options, :q_puppet_enterpriseconsole_auth_user_email)}'"
-
-
-        console_install = answer_for(options, :q_puppet_enterpriseconsole_install, 'y')
-        console_inventory_hostname = answer_for(options, :q_puppet_enterpriseconsole_inventory_hostname, host.to_s)
-        console_inventory_certname = answer_for(options, :q_puppet_enterpriseconsole_inventory_certname, host.to_s)
-        console_inventory_dnsaltnames = answer_for(options, :q_puppet_enterpriseconsole_inventory_dnsaltnames, dashboard.to_s)
-        smtp_host = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_host, dashboard.to_s)}'"
-        smtp_port = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_port)}'"
-        smtp_username = answer_for(options, :q_puppet_enterpriseconsole_smtp_username)
-        smtp_password = answer_for(options, :q_puppet_enterpriseconsole_smtp_password)
-        smtp_use_tls = "'#{answer_for(options, :q_puppet_enterpriseconsole_smtp_use_tls)}'"
-        console_inventory_port = answer_for(options, :q_puppet_enterpriseconsole_inventory_port, 8140)
-        master_hostname = answer_for(options, :q_puppet_enterpriseconsole_master_hostname, master.to_s)
-        console_httpd_port = answer_for(options, :q_puppet_enterpriseconsole_httpd_port, 443)
-
-        console_a = {
-          :q_puppet_enterpriseconsole_install => console_install,
-          :q_puppet_enterpriseconsole_inventory_hostname => console_inventory_hostname,
-          :q_puppet_enterpriseconsole_inventory_certname => console_inventory_certname,
-          :q_puppet_enterpriseconsole_inventory_dnsaltnames => console_inventory_dnsaltnames,
-          :q_puppet_enterpriseconsole_inventory_port => console_inventory_port,
-          :q_puppet_enterpriseconsole_master_hostname => master_hostname,
-          :q_puppet_enterpriseconsole_auth_user_email => dashboard_user,
-          :q_puppet_enterpriseconsole_auth_password => console_auth_password,
-          :q_puppet_enterpriseconsole_httpd_port => console_httpd_port,
-          :q_puppet_enterpriseconsole_smtp_host => smtp_host,
-          :q_puppet_enterpriseconsole_smtp_use_tls => smtp_use_tls,
-          :q_puppet_enterpriseconsole_smtp_port => smtp_port,
-        }
-
-        if smtp_password and smtp_username
-          console_smtp_user_auth = answer_for(options, :q_puppet_enterpriseconsole_smtp_user_auth, 'y')
-          console_a.merge!({
-                             :q_puppet_enterpriseconsole_smtp_password => "'#{smtp_password}'",
-                             :q_puppet_enterpriseconsole_smtp_username => "'#{smtp_username}'",
-                             :q_puppet_enterpriseconsole_smtp_user_auth => console_smtp_user_auth
-                           })
-        end
-
-        # Database only answers
-        database_a = {
-          :q_puppetdb_install => answer_for(options, :q_puppetdb_install, 'y'),
-          :q_database_install => answer_for(options, :q_database_install, 'y'),
-          :q_database_root_password => "'#{answer_for(options, :q_database_root_password, '=ZYdjiP3jCwV5eo9s1MBd')}'",
-          :q_database_root_user => answer_for(options, :q_database_root_user, 'pe-postgres'),
-        }
-      end
-
-      # Special answers for special hosts
-      aix_a = {
-        :q_run_updtvpkg => answer_for(options, :q_run_updtvpkg, 'y'),
-      }
-
-      answers = common_a.dup
-
-      unless options[:type] == :upgrade
-        answers.merge! agent_a
-      end
-
-      if host == master
-        answers.merge! master_console_a
-        unless options[:type] == :upgrade
-          answers.merge! master_a
-          answers.merge! master_database_a
-        end
-      end
-
-      if host == dashboard
-        answers.merge! master_console_a
-        answers.merge! console_database_a
-        answers[:q_pe_database] = answer_for(options, :q_pe_database, 'y')
-        unless options[:type] == :upgrade
-          answers.merge! console_a
-        else
-          answers[:q_database_export_dir] = answer_for(options, :q_database_export_dir, '/tmp')
-        end
-      end
-
-      if host == database
-        if database != master
-          if options[:type] == :upgrade
-            # This is kinda annoying - if we're upgrading to 3.0 and are
-            # puppetdb, we're actually doing a clean install. We thus
-            # need the core agent answers.
-            answers.merge! agent_a
-          end
-          answers.merge! master_database_a
-        end
-        answers.merge! database_a
-        answers.merge! console_database_a
-      end
-
-      if host == master and host == database and host == dashboard
-        answers[:q_all_in_one_install] = 'y'
-      end
-
-      if host['platform'].include? 'aix'
-        answers.merge! aix_a
-      end
-
-      return answers
-    end
-
-    # Return answer data for all hosts.
-    #
-    # @return [Hash] A hash (keyed from hosts) containing hashes of answer file
-    #   data.
-    def generate_answers
-      the_answers = {}
-      masterless  = @options[:masterless]
-      database    = masterless ? nil : only_host_with_role(@hosts, 'database')
-      dashboard   = masterless ? nil : only_host_with_role(@hosts, 'dashboard')
-      master      = masterless ? nil : only_host_with_role(@hosts, 'master')
-      @hosts.each do |h|
-        if @options[:type] == :upgrade and h[:pe_ver] =~ /\A3.0/
-          # 3.0.x to 3.0.x should require no answers
-          the_answers[h.name] = {
-            :q_install => answer_for(@options, :q_install, 'y'),
-            :q_install_vendor_packages => answer_for(@options, :q_install_vendor_packages, 'y'),
-          }
-        else
-          the_answers[h.name] = host_answers(h, master, database, dashboard, @options)
-        end
-        if the_answers[h.name] && h[:custom_answers]
-          the_answers[h.name] = the_answers[h.name].merge(h[:custom_answers])
-        end
-        h[:answers] = the_answers[h.name]
-      end
-      return the_answers
-    end
-  end
-end

data/lib/beaker/answers/version32.rb

@@ -1,44 +0,0 @@
-require 'beaker/answers/version30'
-
-module Beaker
-  # 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
-      masterless = @options[:masterless]
-      return super if masterless
-
-      dashboard = only_host_with_role(@hosts, 'dashboard')
-      database = only_host_with_role(@hosts, 'database')
-      master = only_host_with_role(@hosts, 'master')
-
-      the_answers = super
-      if dashboard != master
-        # in 3.2, dashboard needs the master certname
-        the_answers[dashboard.name][:q_puppetmaster_certname] = master.to_s
-      end
-
-      # do we want to check for updates?
-      pe_check_for_updates = answer_for(@options, :q_pe_check_for_updates, 'n')
-      the_answers[dashboard.name][:q_pe_check_for_updates] = pe_check_for_updates
-      the_answers[master.name][:q_pe_check_for_updates] = pe_check_for_updates
-
-      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,51 +0,0 @@
-require 'beaker/answers/version32'
-
-module Beaker
-  # This class provides answer file information for PE version 3.4
-  #
-  # @api private
-  class Version34 < Version32
-    def generate_answers
-      masterless = @options[:masterless]
-      return super if masterless
-
-      dashboard = only_host_with_role(@hosts, 'dashboard')
-      database = only_host_with_role(@hosts, 'database')
-
-      the_answers = super
-
-      classifier_database_user     = answer_for(@options, :q_classifier_database_user, 'DFGhjlkj')
-      classifier_database_name     = answer_for(@options, :q_database_name, 'pe-classifier')
-      classifier_database_password = "'#{answer_for(@options, :q_classifier_database_password)}'"
-      activity_database_user       = answer_for(@options, :q_activity_database_user, 'adsfglkj')
-      activity_database_name       = answer_for(@options, :q_activity_database_name, 'pe-activity')
-      activity_database_password   = "'#{answer_for(@options, :q_activity_database_password)}'"
-      rbac_database_user           = answer_for(@options, :q_rbac_database_user, 'RbhNBklm')
-      rbac_database_name           = answer_for(@options, :q_rbac_database_name, 'pe-rbac')
-      rbac_database_password       = "'#{answer_for(@options, :q_rbac_database_password)}'"
-
-      console_services_hash = {
-        :q_classifier_database_user     => classifier_database_user,
-        :q_classifier_database_name     => classifier_database_name,
-        :q_classifier_database_password => classifier_database_password,
-        :q_activity_database_user       => activity_database_user,
-        :q_activity_database_name       => activity_database_name,
-        :q_activity_database_password   => activity_database_password,
-        :q_rbac_database_user           => rbac_database_user,
-        :q_rbac_database_name           => rbac_database_name,
-        :q_rbac_database_password       => rbac_database_password,
-      }
-
-      # If we're installing or upgrading from a non-RBAC version, set the 'admin' password
-      if @options[:type] == :upgrade && @options[:set_console_password]
-        dashboard_password = "'#{answer_for(@options, :q_puppet_enterpriseconsole_auth_password)}'"
-        the_answers[dashboard.name][:q_puppet_enterpriseconsole_auth_password] = dashboard_password
-      end
-
-      the_answers[dashboard.name].merge!(console_services_hash)
-      the_answers[database.name].merge!(console_services_hash)
-
-      return the_answers
-    end
-  end
-end