beaker 2.18.3 → 2.19.0

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

data/lib/beaker/answers/version38.rb

@@ -1,29 +0,0 @@
-require 'beaker/answers/version34'
-
-module Beaker
-  # This class provides answer file information for PE version 4.0
-  #
-  # @api private
-  class Version38 < Version34
-    def generate_answers
-      masterless = @options[:masterless]
-      return super if masterless
-
-      the_answers = super
-
-      # add new answers
-      exit_for_nc_migrate = answer_for(@options, :q_exit_for_nc_migrate, 'n')
-      enable_future_parser = answer_for(@options, :q_enable_future_parser, 'n')
-
-      the_answers.map do |key, value|
-        # there may not be answers in the case of a windows host
-        if the_answers[key]
-          the_answers[key][:q_exit_for_nc_migrate] = exit_for_nc_migrate
-          the_answers[key][:q_enable_future_parser] = enable_future_parser
-        end
-      end
-
-      return the_answers
-    end
-  end
-end

data/lib/beaker/answers/version40.rb

@@ -1,44 +0,0 @@
-require 'beaker/answers/version38'
-
-module Beaker
-  # This class provides answer file information for PE version 4.0
-  #
-  # @api private
-  class Version40 < Version38
-    def generate_answers
-      masterless = @options[:masterless]
-      return super if masterless
-
-      master = only_host_with_role(@hosts, 'master')
-
-      the_answers = super
-
-      # remove some old answers
-      # - q_puppet_cloud_install
-      # - q_puppet_enterpriseconsole_database_name 
-      # - q_puppet_enterpriseconsole_database_password 
-      # - q_puppet_enterpriseconsole_database_user
-
-      the_answers.map do |vm, as|
-        if as
-          as.delete_if do |key, value|
-            key =~ /q_puppet_cloud_install/
-            #to be deleted in the future
-            #|q_puppet_enterpriseconsole_database_name|q_puppet_enterpriseconsole_database_password|q_puppet_enterpriseconsole_database_user/
-          end
-        end
-      end
-
-      # add some new answers
-      update_server_host    = answer_for(@options, :q_update_server_host, master.to_s)
-      install_update_server = answer_for(@options, :q_install_update_server, 'y')
-
-      the_answers.map do |key, value|
-        the_answers[key][:q_update_server_host] = update_server_host if the_answers[key]
-      end
-      the_answers[master.name][:q_install_update_server] = install_update_server
-
-      return the_answers
-    end
-  end
-end

data/spec/beaker/answers_spec.rb

@@ -1,547 +0,0 @@
-require 'spec_helper'
-
-module Beaker
-  describe Answers do
-    let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
-    let( :options )     { @options || Beaker::Options::Presets.new.presets }
-    let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
-                          basic_hosts[1]['platform'] = 'windows'
-                          basic_hosts }
-    let( :answers )     { Beaker::Answers.create(@ver, hosts, options) }
-
-    after :each do
-      ENV.delete('q_puppet_cloud_install')
-    end
-
-    it 'uses options[:answers] if they are set (override q_puppet_cloud_install for 3.8' do
-      @ver = '3.8'
-      options[:answers] = Beaker::Options::OptionsHash.new
-      options[:answers]['q_puppet_cloud_install'] = 'n'
-      opts = answers.instance_variable_get(:@options)
-      @answers = answers.answers
-      # confirm that the answers were correctly added to the answers object
-      expect(opts).to be_a_kind_of Beaker::Options::OptionsHash
-      expect(opts[:answers]['q_puppet_cloud_install']).to be == 'n'
-      expect(opts[:answers][:q_puppet_cloud_install]).to be == 'n'
-      hosts.each do |host|
-        if @answers[host.name]
-          expect( @answers[host.name][:q_puppet_cloud_install] ).to be == 'n'
-        end
-      end
-    end
-
-    it 'uses ENV[:q_*] if they are set (override q_puppet_cloud_install for 3.8' do
-      @ver = '3.8'
-      ENV['q_puppet_cloud_install'] = 'n'
-      @options = Beaker::Options::Parser.new.parse_args([])
-
-      opts = answers.instance_variable_get(:@options)
-      @answers = answers.answers
-      # confirm that the answers were correctly added to the answers object
-      expect(opts).to be_a_kind_of Beaker::Options::OptionsHash
-      expect(opts[:answers]['q_puppet_cloud_install']).to be == 'n'
-      expect(opts[:answers][:q_puppet_cloud_install]).to be == 'n'
-      hosts.each do |host|
-        if @answers[host.name]
-          expect( @answers[host.name][:q_puppet_cloud_install] ).to be == 'n'
-        end
-      end
-    end
-
-    it 'generates 3.4 answers for 4.0 hosts' do
-      @ver = '4.0'
-      expect( answers ).to be_a_kind_of Version34
-    end
-
-    it 'generates 4.0 answers for 3.99 hosts' do
-      @ver = '3.99'
-      expect( answers ).to be_a_kind_of Version40
-    end
-
-    it 'generates 3.8 answers for 3.8 hosts' do
-      @ver = '3.8'
-      expect( answers ).to be_a_kind_of Version38
-    end
-
-    it 'generates 3.4 answers for 3.4 hosts' do
-      @ver = '3.4'
-      expect( answers ).to be_a_kind_of Version34
-    end
-
-    it 'generates 3.2 answers for 3.3 hosts' do
-      @ver = '3.3'
-      expect( answers ).to be_a_kind_of Version32
-    end
-
-    it 'generates 3.2 answers for 3.2 hosts' do
-      @ver = '3.2'
-      expect( answers ).to be_a_kind_of Version32
-    end
-
-    it 'generates 3.0 answers for 3.1 hosts' do
-      @ver = '3.1'
-      expect( answers ).to be_a_kind_of Version30
-    end
-
-    it 'generates 3.0 answers for 3.0 hosts' do
-      @ver = '3.0'
-      expect( answers ).to be_a_kind_of Version30
-    end
-
-    it 'generates 2.8 answers for 2.8 hosts' do
-      @ver = '2.8'
-      expect( answers ).to be_a_kind_of Version28
-    end
-
-    it 'generates 2.0 answers for 2.0 hosts' do
-      @ver = '2.0'
-      expect( answers ).to be_a_kind_of Version20
-    end
-
-    it 'raises an error for an unknown version' do
-      @ver = 'x.x'
-      expect{ answers }.to raise_error( NotImplementedError )
-    end
-  end
-
-  describe "Masterless Setup" do
-    let( :ver ) { @ver || '3.0' }
-    let( :options )     { options = Beaker::Options::Presets.new.presets
-                          options[:masterless] = true
-                          options }
-    let( :hosts ) { make_hosts({}, 1) }
-    let( :host ) { hosts[0] }
-    let( :answers ) { Beaker::Answers.create(ver, hosts, options) }
-    let( :host_answers ) { answers.answers[host.name] }
-
-
-    it 'adds the correct answers' do
-      expect( host_answers[:q_puppetagent_server] ).to be === host_answers[:q_puppetagent_certname]
-      expect( host_answers[:q_continue_or_reenter_master_hostname]).to be === 'c'
-    end
-
-    it 'skips the correct answers' do
-      expect( host_answers[:q_puppetmaster_install]).to be === 'n'
-      expect( host_answers[:q_puppet_enterpriseconsole_install] ).to be === 'n'
-      expect( host_answers[:q_puppetdb_install] ).to be === 'n'
-    end
-
-    it '3.0: never calls #only_host_with_role in #generate_answers' do
-      expect( answers.generate_answers ).to_not receive( :only_host_with_role )
-    end
-
-    it '3.2: never calls #only_host_with_role in #generate_answers' do
-      @ver = '3.2'
-      expect( answers.generate_answers ).to_not receive( :only_host_with_role )
-    end
-
-    it '3.4: never calls #only_host_with_role in #generate_answers' do
-      @ver = '3.4'
-      expect( answers.generate_answers ).to_not receive( :only_host_with_role )
-    end
-
-  end
-
-  describe Version34 do
-    let( :options )     { Beaker::Options::Presets.new.presets }
-    let( :basic_hosts ) { make_hosts( {'pe_ver' => @ver } ) }
-    let( :hosts ) { basic_hosts[0]['roles'] = ['master', 'agent']
-                    basic_hosts[0][:custom_answers] = { :q_custom => 'LOOKYHERE' }
-                    basic_hosts[1]['roles'] = ['dashboard', 'agent']
-                    basic_hosts[2]['roles'] = ['database', 'agent']
-                    basic_hosts }
-    let( :answers )     { Beaker::Answers.create(@ver, hosts, options) }
-
-    before :each do
-      @ver = '3.4'
-      @answers = answers.answers
-    end
-
-    it 'should add console services answers to dashboard answers' do
-      @ver = '3.4'
-      answers = @answers
-      expect( @answers['vm2'] ).to include :q_classifier_database_user => 'DFGhjlkj'
-      expect( @answers['vm2'] ).to include :q_classifier_database_name => 'pe-classifier'
-      expect( @answers['vm2'] ).to include :q_classifier_database_password => "'~!@\#$%^*-/ aZ'"
-      expect( @answers['vm2'] ).to include :q_activity_database_user => 'adsfglkj'
-      expect( @answers['vm2'] ).to include :q_activity_database_name => 'pe-activity'
-      expect( @answers['vm2'] ).to include :q_activity_database_password => "'~!@\#$%^*-/ aZ'"
-      expect( @answers['vm2'] ).to include :q_rbac_database_user => 'RbhNBklm'
-      expect( @answers['vm2'] ).to include :q_rbac_database_name => 'pe-rbac'
-      expect( @answers['vm2'] ).to include :q_rbac_database_password => "'~!@\#$%^*-/ aZ'"
-    end
-
-    it 'should add console services answers to database answers' do
-      @ver = '3.4'
-      answers = @answers
-      expect( @answers['vm3'] ).to include :q_classifier_database_user => 'DFGhjlkj'
-      expect( @answers['vm3'] ).to include :q_classifier_database_name => 'pe-classifier'
-      expect( @answers['vm3'] ).to include :q_classifier_database_password => "'~!@\#$%^*-/ aZ'"
-      expect( @answers['vm3'] ).to include :q_activity_database_user => 'adsfglkj'
-      expect( @answers['vm3'] ).to include :q_activity_database_name => 'pe-activity'
-      expect( @answers['vm3'] ).to include :q_activity_database_password => "'~!@\#$%^*-/ aZ'"
-      expect( @answers['vm3'] ).to include :q_rbac_database_user => 'RbhNBklm'
-      expect( @answers['vm3'] ).to include :q_rbac_database_name => 'pe-rbac'
-      expect( @answers['vm3'] ).to include :q_rbac_database_password => "'~!@\#$%^*-/ aZ'"
-    end
-
-    it 'should add answers to the host objects' do
-      @ver = '3.4'
-      answers = @answers
-      hosts.each do |host|
-        puts "checking #{host.name}"
-        expect( host[:answers] ).to be === answers[host.name]
-      end
-    end
-
-    it 'should add answers to the host objects' do
-      hosts.each do |host|
-        expect( host[:answers] ).to be === @answers[host.name]
-      end
-    end
-
-    it 'appends custom answers to generated answers' do
-      expect( hosts[0][:custom_answers] ).to be == { :q_custom => 'LOOKYHERE' }
-      expect( @answers['vm1'] ).to include :q_custom
-      expect( hosts[0][:answers] ).to include :q_custom
-    end
-
-  end
-
-  describe Version38 do
-    let( :options )     { Beaker::Options::Presets.new.presets }
-    let( :basic_hosts ) { make_hosts( {'pe_ver' => @ver } ) }
-    let( :hosts ) { basic_hosts[0]['roles'] = ['master', 'agent']
-                    basic_hosts[1]['roles'] = ['dashboard', 'database', 'agent']
-                    basic_hosts[2]['roles'] = ['agent']
-                    basic_hosts[2]['platform'] = 'windows2008r2'
-                    basic_hosts }
-    let( :answers )     { Beaker::Answers.create(@ver, hosts, options) }
-    let( :upgrade_answers )     { Beaker::Answers.create(@ver, hosts, options.merge( {:type => :upgrade}) ) }
-
-    before :each do
-      @ver = '3.8'
-      @answers = answers.answers
-    end
-
-    it 'should add q_pe_check_for_updates to master' do
-      expect( @answers['vm1'][:q_pe_check_for_updates] ).to be === 'n'
-    end
-
-    it 'should add q_pe_check_for_updates to dashboard' do
-      expect( @answers['vm2'][:q_pe_check_for_updates] ).to be === 'n'
-    end
-
-    it 'adds :q_enable_future_parser to all hosts, default to "n"' do
-      hosts.each do |host|
-        expect( basic_hosts[0][:answers][:q_enable_future_parser] ).to be == 'n'
-        expect( basic_hosts[1][:answers][:q_enable_future_parser] ).to be == 'n'
-      end
-    end
-
-    it 'adds :q_exit_for_nc_migrate to all hosts, default to "n"' do
-      expect( basic_hosts[0][:answers][:q_exit_for_nc_migrate] ).to be == 'n'
-      expect( basic_hosts[1][:answers][:q_exit_for_nc_migrate] ).to be == 'n'
-    end
-
-    it 'should add answers to the host objects' do
-      answers = @answers
-      hosts.each do |host|
-        expect( host[:answers] ).to be === @answers[host.name]
-      end
-    end
-  end
-
-  describe Version40 do
-    let( :options )     { Beaker::Options::Presets.new.presets }
-    let( :basic_hosts ) { make_hosts( {'pe_ver' => @ver } ) }
-    let( :hosts ) { basic_hosts[0]['roles'] = ['master', 'agent']
-                    basic_hosts[1]['roles'] = ['dashboard', 'agent']
-                    basic_hosts[2]['roles'] = ['database', 'agent']
-                    basic_hosts }
-    let( :answers )     { Beaker::Answers.create(@ver, hosts, options) }
-    let( :upgrade_answers )     { Beaker::Answers.create(@ver, hosts, options.merge( {:type => :upgrade}) ) }
-
-    before :each do
-      @ver = '3.99'
-      @answers = answers.answers
-    end
-
-    it 'should not have q_puppet_cloud_install key' do
-      hosts.each do |host|
-        expect( host[:answers] ).to_not include :q_puppet_cloud_install
-      end
-    end
-
-    it 'should add q_pe_check_for_updates to master' do
-      expect( @answers['vm1'][:q_pe_check_for_updates] ).to be === 'n'
-    end
-
-    it 'should add q_pe_check_for_updates to dashboard' do
-      expect( @answers['vm2'][:q_pe_check_for_updates] ).to be === 'n'
-    end
-
-    it 'should not add q_pe_check_for_updates to agent/database' do
-      expect( @answers['vm3']).to_not include :q_pe_check_for_updates
-    end
-
-# re-enable these tests once these keys are eliminated
-#
-#    it 'should not have q_puppet_enterpriseconsole_database_name key' do
-#      hosts.each do |host|
-#        expect( host[:answers] ).to_not include :q_puppet_enterpriseconsole_database_name
-#      end
-#    end
-#
-#    it 'should not have q_puppet_enterpriseconsole_database_password key' do
-#      hosts.each do |host|
-#        expect( host[:answers] ).to_not include :q_puppet_enterpriseconsole_database_password
-#      end
-#    end
-#
-#    it 'should not have q_puppet_enterpriseconsole_database_user key' do
-#      hosts.each do |host|
-#        expect( host[:answers] ).to_not include :q_puppet_enterpriseconsole_database_user
-#      end
-#    end
-
-    it ':q_update_server_host should default to the master' do
-      hosts.each do |host|
-        expect( host[:answers][:q_update_server_host] ).to be == hosts[0].to_s
-      end
-    end
-
-    it 'only the master should have :q_install_update_server' do
-      hosts.each do |host|
-        if host[:roles].include? 'master'
-          expect( host[:answers][:q_install_update_server] ).to be == 'y'
-        else
-          expect( host[:answers] ).to_not include :q_install_update_server
-        end
-      end
-    end
-
-    it 'should add answers to the host objects' do
-      hosts.each do |host|
-        expect( host[:answers] ).to be === @answers[host.name]
-      end
-    end
-  end
-
-  describe Version32 do
-    let( :options )     { Beaker::Options::Presets.new.presets }
-    let( :basic_hosts ) { make_hosts( {'pe_ver' => @ver } ) }
-    let( :hosts ) { basic_hosts[0]['roles'] = ['master', 'agent']
-                    basic_hosts[1]['roles'] = ['dashboard', 'agent']
-                    basic_hosts[2]['roles'] = ['database', 'agent']
-                    basic_hosts }
-    let( :answers )     { Beaker::Answers.create(@ver, hosts, options) }
-    let( :upgrade_answers )     { Beaker::Answers.create(@ver, hosts, options.merge( {:type => :upgrade}) ) }
-
-    before :each do
-      @ver = '3.2'
-      @answers = answers.answers
-    end
-
-    it 'should add q_pe_check_for_updates to master' do
-      expect( @answers['vm1'][:q_pe_check_for_updates] ).to be === 'n'
-    end
-
-    it 'should add q_pe_check_for_updates to dashboard' do
-      expect( @answers['vm2'][:q_pe_check_for_updates] ).to be === 'n'
-    end
-
-    it 'should not add q_pe_check_for_updates to agent/database' do
-      expect( @answers['vm3']).to_not include :q_pe_check_for_updates
-    end
-
-    # The only difference between 3.2 and 3.0 is the addition of the
-    # master certname to the dashboard answers
-    it 'should add q_puppetmaster_certname to the dashboard answers' do
-      expect( @answers['vm2']).to include :q_puppetmaster_certname
-    end
-
-    it 'should add q_upgrade_with_unknown_disk_space to the dashboard on upgrade' do
-      @upgrade_answers = upgrade_answers.answers
-      expect( @upgrade_answers['vm2']).to include :q_upgrade_with_unknown_disk_space
-    end
-
-    it 'should add answers to the host objects' do
-      hosts.each do |host|
-        expect( host[:answers] ).to be === @answers[host.name]
-      end
-    end
-  end
-
-  describe Version30 do
-    let( :options )     { Beaker::Options::Presets.new.presets }
-    let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
-    let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
-                          basic_hosts[1]['platform'] = 'windows'
-                          basic_hosts[2][:custom_answers] = { :q_custom => 'LOOKLOOKLOOK' }
-                          basic_hosts }
-    let( :answers )     { Beaker::Answers.create(@ver, hosts, options) }
-    let( :upgrade_answers )     { Beaker::Answers.create(@ver, hosts, options.merge( {:type => :upgrade}) ) }
-
-    before :each do
-      @ver = '3.0'
-      @answers = answers.answers
-    end
-
-    it 'uses simple answers for upgrade from 3.0.x to 3.0.x' do
-      @upgrade_answers = upgrade_answers.answers
-      expect( @upgrade_answers ).to be === { "vm2"=>{ :q_install=>"y", :q_install_vendor_packages=>"y" }, "vm1"=>{ :q_install=>"y", :q_install_vendor_packages=>"y" }, "vm3"=>{ :q_install=>"y", :q_install_vendor_packages=>"y", :q_custom=>"LOOKLOOKLOOK" } }
-    end
-
-    it 'sets correct answers for an agent' do
-      @ver = '3.0'
-      expect( @answers['vm3'] ).to be === { :q_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_verify_packages=>"y", :q_puppet_symlinks_install=>"y", :q_puppetagent_certname=>hosts[2].to_s, :q_puppetagent_server=>hosts[0].to_s, :q_puppetmaster_install=>"n", :q_all_in_one_install=>"n", :q_puppet_enterpriseconsole_install=>"n", :q_puppetdb_install=>"n", :q_database_install=>"n", :q_custom=>"LOOKLOOKLOOK" }
-    end
-
-    it 'sets correct answers for a master' do
-      @ver = '3.0'
-      expect( @answers['vm1'] ).to be === { :q_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_verify_packages=>"y", :q_puppet_symlinks_install=>"y", :q_puppetagent_certname=>hosts[0].to_s, :q_puppetagent_server=>hosts[0].to_s, :q_puppetmaster_install=>"y", :q_all_in_one_install=>"y", :q_puppet_enterpriseconsole_install=>"y", :q_puppetdb_install=>"y", :q_database_install=>"y", :q_puppetdb_hostname=>hosts[0].to_s, :q_puppetdb_port=>8081, :q_puppetmaster_dnsaltnames=>"#{hosts[0].to_s},#{hosts[0][:ip]},puppet", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0].to_s, :q_puppetmaster_enterpriseconsole_port=>443, :q_puppetmaster_certname=>hosts[0].to_s, :q_puppetdb_database_name=>"pe-puppetdb", :q_puppetdb_database_user=>"mYpdBu3r", :q_puppetdb_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_auth_database_name=>"console_auth", :q_puppet_enterpriseconsole_auth_database_user=>"mYu7hu3r", :q_puppet_enterpriseconsole_auth_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_name=>"console", :q_puppet_enterpriseconsole_database_user=>"mYc0nS03u3r", :q_puppet_enterpriseconsole_database_password=>"'~!@\#$%^*-/ aZ'", :q_database_host=>hosts[0].to_s, :q_database_port=>5432, :q_pe_database=>"y", :q_puppet_enterpriseconsole_inventory_hostname=>hosts[0].to_s, :q_puppet_enterpriseconsole_inventory_certname=>hosts[0].to_s, :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0].to_s, :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0].to_s, :q_puppet_enterpriseconsole_auth_user_email=>"'admin@example.com'", :q_puppet_enterpriseconsole_auth_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_httpd_port=>443, :q_puppet_enterpriseconsole_smtp_host=>"'vm1'", :q_puppet_enterpriseconsole_smtp_use_tls=>"'n'", :q_puppet_enterpriseconsole_smtp_port=>"'25'", :q_database_root_password=>"'=ZYdjiP3jCwV5eo9s1MBd'", :q_database_root_user=>"pe-postgres" }
-    end
-
-    it 'generates nil answers for a windows host' do
-      @ver = '3.0'
-      expect( @answers['vm2'] ).to be === nil
-    end
-
-    it 'should add answers to the host objects' do
-      @ver = '3.0'
-      a = answers.answers
-      hosts.each do |host|
-        expect( host[:answers] ).to be === @answers[host.name]
-      end
-    end
-
-    it 'appends custom answers to generated answers' do
-      expect( hosts[2][:custom_answers] ).to be == { :q_custom => 'LOOKLOOKLOOK' }
-      expect( @answers['vm3'] ).to include :q_custom
-      expect( hosts[2][:answers] ).to include :q_custom
-    end
-  end
-
-  describe Version28 do
-    let( :options )     { Beaker::Options::Presets.new.presets }
-    let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
-    let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
-                          basic_hosts[1]['platform'] = 'windows'
-                          basic_hosts }
-    let( :answers )     { Beaker::Answers.create(@ver, hosts, options) }
-
-    before :each do
-      @ver = '2.8'
-      @answers = answers.answers
-    end
-
-    it 'sets correct answers for an agent' do
-      expect( @answers['vm3'] ).to be === { :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=>hosts[2].to_s, :q_puppetagent_server=>hosts[0].to_s, :q_puppetmaster_install=>"n", :q_puppet_enterpriseconsole_install=>"n" }
-    end
-
-    it 'sets correct answers for a master' do
-      expect( @answers['vm1'] ).to be === { :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=>hosts[0].to_s, :q_puppetagent_server=>hosts[0].to_s, :q_puppetmaster_install=>"y", :q_puppet_enterpriseconsole_install=>"y", :q_puppetmaster_certname=>hosts[0].to_s, :q_puppetmaster_dnsaltnames=>"#{hosts[0].to_s},#{hosts[0][:ip]},puppet", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0].to_s, :q_puppetmaster_enterpriseconsole_port=>443, :q_puppetmaster_forward_facts=>"y", :q_puppet_enterpriseconsole_database_install=>"y", :q_puppet_enterpriseconsole_auth_database_name=>"console_auth", :q_puppet_enterpriseconsole_auth_database_user=>"mYu7hu3r", :q_puppet_enterpriseconsole_auth_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_name=>"console", :q_puppet_enterpriseconsole_database_user=>"mYc0nS03u3r", :q_puppet_enterpriseconsole_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_inventory_hostname=>hosts[0].to_s, :q_puppet_enterpriseconsole_inventory_certname=>hosts[0].to_s, :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0].to_s, :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0].to_s, :q_puppet_enterpriseconsole_auth_user_email=>"'admin@example.com'", :q_puppet_enterpriseconsole_auth_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_httpd_port=>443, :q_puppet_enterpriseconsole_smtp_host=>"'vm1'", :q_puppet_enterpriseconsole_smtp_use_tls=>"'n'", :q_puppet_enterpriseconsole_smtp_port=>"'25'", :q_puppet_enterpriseconsole_auth_user=>"'admin@example.com'" }
-    end
-
-    it 'generates nil answers for a windows host' do
-      expect( @answers['vm2'] ).to be === nil
-    end
-
-    it 'should add answers to the host objects' do
-      hosts.each do |host|
-        expect( host[:answers] ).to be === @answers[host.name]
-      end
-    end
-
-  end
-  describe Version20 do
-    let( :options )     { Beaker::Options::Presets.new.presets }
-    let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
-    let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
-                          basic_hosts[1]['platform'] = 'windows'
-                          basic_hosts }
-
-    let( :answers )     { Beaker::Answers.create(@ver, hosts, options) }
-
-    before :each do
-      @ver = '2.0'
-      @answers = answers.answers
-    end
-
-    it 'sets correct answers for an agent' do
-      expect( @answers['vm3'] ).to be === { :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=>hosts[2].to_s, :q_puppetagent_server=>hosts[0].to_s, :q_puppetmaster_install=>"n", :q_puppet_enterpriseconsole_install=>"n" }
-    end
-
-    it 'sets correct answers for a master' do
-      expect( @answers['vm1'] ).to be === { :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=>hosts[0].to_s, :q_puppetagent_server=>hosts[0].to_s, :q_puppetmaster_install=>"y", :q_puppet_enterpriseconsole_install=>"y", :q_puppetmaster_certname=>hosts[0].to_s, :q_puppetmaster_dnsaltnames=>"#{hosts[0].to_s},#{hosts[0][:ip]},puppet", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0].to_s, :q_puppetmaster_enterpriseconsole_port=>443, :q_puppetmaster_forward_facts=>"y", :q_puppet_enterpriseconsole_database_install=>"y", :q_puppet_enterpriseconsole_auth_database_name=>"console_auth", :q_puppet_enterpriseconsole_auth_database_user=>"mYu7hu3r", :q_puppet_enterpriseconsole_auth_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_name=>"console", :q_puppet_enterpriseconsole_database_user=>"mYc0nS03u3r", :q_puppet_enterpriseconsole_database_root_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_inventory_hostname=>hosts[0].to_s, :q_puppet_enterpriseconsole_inventory_certname=>hosts[0].to_s, :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0].to_s, :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0].to_s, :q_puppet_enterpriseconsole_auth_user_email=>"'admin@example.com'", :q_puppet_enterpriseconsole_auth_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_httpd_port=>443, :q_puppet_enterpriseconsole_smtp_host=>"'vm1'", :q_puppet_enterpriseconsole_smtp_use_tls=>"'n'", :q_puppet_enterpriseconsole_smtp_port=>"'25'", :q_puppet_enterpriseconsole_auth_user=>"'admin@example.com'" }
-    end
-
-    it 'generates nil answers for a windows host' do
-      expect( @answers['vm2'] ).to be === nil
-    end
-
-    it 'should add answers to the host objects' do
-      hosts.each do |host|
-        expect( host[:answers] ).to be === @answers[host.name]
-      end
-    end
-  end
-
-  describe 'Customization' do
-    let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
-    let( :options )     { Beaker::Options::Presets.new.presets }
-    let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
-                          basic_hosts[1]['platform'] = 'windows'
-                          basic_hosts }
-    let( :answers )     { Beaker::Answers.create(@ver, hosts, options) }
-
-    def test_answer_customization(answer_key, value_to_set)
-      @ver = '3.0'
-      options[:answers] ||= Beaker::Options::OptionsHash.new
-      options[:answers][answer_key] = value_to_set
-      host_answers = answers.answers['vm1']
-      expect( host_answers[answer_key] ).to be === value_to_set
-    end
-
-    it 'sets :q_puppetdb_hostname' do
-      test_answer_customization(:q_puppetdb_hostname, 'q_puppetdb_hostname_custom01')
-    end
-
-    it 'sets :q_puppetdb_database_user' do
-      test_answer_customization(:q_puppetdb_database_user, 'q_puppetdb_database_user_custom02')
-    end
-
-    it 'sets :q_puppetdb_database_password' do
-      test_answer_customization(:q_puppetdb_database_password, 'q_puppetdb_database_password_custom03')
-    end
-
-    it 'sets :q_puppet_enterpriseconsole_auth_database_password' do
-      answer = 'q_puppet_enterpriseconsole_auth_database_password_custom04'
-      test_answer_customization(:q_puppet_enterpriseconsole_auth_database_password, answer)
-    end
-
-    it 'sets :q_puppet_enterpriseconsole_database_user' do
-      answer = 'q_puppet_enterpriseconsole_database_user_custom05'
-      test_answer_customization(:q_puppet_enterpriseconsole_database_user, answer)
-    end
-
-    it 'sets :q_puppet_enterpriseconsole_database_password' do
-      answer = 'q_puppet_enterpriseconsole_database_password_custom06'
-      test_answer_customization(:q_puppet_enterpriseconsole_database_password, answer)
-    end
-
-    it 'sets :q_database_host' do
-      test_answer_customization(:q_database_host, 'q_database_host_custom07')
-    end
-
-    it 'sets :q_database_install' do
-      test_answer_customization(:q_database_install, 'q_database_install_custom08')
-    end
-
-    it 'sets :q_pe_database' do
-      test_answer_customization(:q_pe_database, 'q_pe_database_custom08')
-    end
-
-  end
-end