beaker 2.2.0 → 2.3.0

data/lib/beaker/answers/version32.rb

@@ -10,6 +10,9 @@ module Beaker
     # @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')

data/lib/beaker/answers/version34.rb

@@ -6,6 +6,9 @@ module Beaker
   # @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')
 
@@ -35,7 +38,7 @@ module Beaker
 
       # If we're installing or upgrading from a non-RBAC version, set the 'admin' password
       if @options[:type] == :upgrade && @options[:HOSTS][dashboard.name][:pe_ver] < "3.4.0"
-        dashboard_password = "'#{options[:answers][:q_puppet_enterpriseconsole_auth_password]}'"
+        dashboard_password = "'#{@options[:answers][:q_puppet_enterpriseconsole_auth_password]}'"
         the_answers[dashboard.name][:q_puppet_enterpriseconsole_auth_password] = dashboard_password
       end
 

data/lib/beaker/dsl/helpers.rb

@@ -1256,7 +1256,8 @@ module Beaker
           avoid_puppet_at_all_costs ||= agent['pe_ver'] && version_is_less(agent['pe_ver'], '3.2') && agent['platform'] =~ /sles/
 
           if avoid_puppet_at_all_costs
-            on agent, "/etc/init.d/#{agent_service} stop"
+            # When upgrading, puppet is already stopped. On EL4, this causes an exit code of '1'
+            on agent, "/etc/init.d/#{agent_service} stop", :acceptable_exit_codes => [0, 1]
           else
             on agent, puppet_resource('service', agent_service, 'ensure=stopped')
           end
@@ -1354,6 +1355,46 @@ module Beaker
           on host, "curl %s" % cmd, opts, &block
         end
       end
+
+      # Write hiera config file on one or more provided hosts
+      #
+      # @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.
+      # @param[Array] One or more hierarchy paths
+      def write_hiera_config_on(host, hierarchy)
+
+        block_on host do |host|
+          hiera_config=Hash.new
+          hiera_config[:backends] = 'yaml'
+          hiera_config[:yaml] = {}
+          hiera_config[:yaml][:datadir] = host[:hieradatadir]
+          hiera_config[:hierarchy] = hierarchy
+          hiera_config[:logger] = 'console'
+          create_remote_file host, host[:hieraconf], hiera_config.to_yaml
+        end
+      end
+
+      # Write hiera config file for the default host
+      # @see #write_hiera_config_on
+      def write_hiera_config(hierarchy)
+        write_hiera_config_on(default, hierarchy)
+      end
+
+      # Copy hiera data files to one or more provided hosts
+      #
+      # @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.
+      # @param[String]            Directory containing the hiera data files.
+      def copy_hiera_data_to(host, source)
+        scp_to host, File.expand_path(source), host[:hieradatadir]
+      end
+
+      # Copy hiera data files to the default host
+      # @see #copy_hiera_data_to
+      def copy_hiera_data(source)
+        copy_hiera_data_to(default, source)
+      end
+
     end
   end
 end

data/lib/beaker/dsl/install_utils.rb

@@ -453,12 +453,16 @@ module Beaker
       # @api private
       #
       def do_install hosts, opts = {}
+        masterless = (defined? options) ? options[:masterless] : false
+        opts[:masterless] = masterless # has to pass masterless down for answer generation awareness
         opts[:type] = opts[:type] || :install
-        pre30database = version_is_less(opts[:pe_ver] || database['pe_ver'], '3.0')
-        pre30master = version_is_less(opts[:pe_ver] || master['pe_ver'], '3.0')
+        unless masterless
+          pre30database = version_is_less(opts[:pe_ver] || database['pe_ver'], '3.0')
+          pre30master = version_is_less(opts[:pe_ver] || master['pe_ver'], '3.0')
 
-        unless version_is_less(opts[:pe_ver] || master['pe_ver'], '3.4')
-          master['puppetservice'] = 'pe-puppetserver'
+          unless version_is_less(opts[:pe_ver] || master['pe_ver'], '3.4')
+            master['puppetservice'] = 'pe-puppetserver'
+          end
         end
 
         # Set PE distribution for all the hosts, create working dir
@@ -489,9 +493,11 @@ module Beaker
 
         fetch_puppet(hosts, opts)
 
-        # If we're installing a database version less than 3.0, ignore the database host
         install_hosts = hosts.dup
-        install_hosts.delete(database) if pre30database and database != master and database != dashboard
+        unless masterless
+          # If we're installing a database version less than 3.0, ignore the database host
+          install_hosts.delete(database) if pre30database and database != master and database != dashboard
+        end
 
         install_hosts.each do |host|
           if host['platform'] =~ /windows/
@@ -511,7 +517,8 @@ module Beaker
               on host, puppet("config set server #{master}")
               on host, puppet("config set certname #{host}")
               #run once to request cert
-              on host, puppet_agent('-t'), :acceptable_exit_codes => [1]
+              acceptable_codes = host['platform'] =~ /osx/ ? [1] : [0, 1]
+              on host, puppet_agent('-t'), :acceptable_exit_codes => acceptable_codes
             else
               answers = Beaker::Answers.create(opts[:pe_ver] || host['pe_ver'], hosts, opts)
               create_remote_file host, "#{host['working_dir']}/answers", answers.answer_string(host)
@@ -520,41 +527,43 @@ module Beaker
           end
 
           # On each agent, we ensure the certificate is signed then shut down the agent
-          sign_certificate_for(host)
+          sign_certificate_for(host) unless masterless
           stop_agent_on(host)
         end
 
-        # Wait for PuppetDB to be totally up and running (post 3.0 version of pe only)
-        sleep_until_puppetdb_started(database) unless pre30database
+        unless masterless
+          # Wait for PuppetDB to be totally up and running (post 3.0 version of pe only)
+          sleep_until_puppetdb_started(database) unless pre30database
+
+          # Run the agent once to ensure everything is in the dashboard
+          install_hosts.each do |host|
+            on host, puppet_agent('-t'), :acceptable_exit_codes => [0,2]
+
+            # Workaround for PE-1105 when deploying 3.0.0
+            # The installer did not respect our database host answers in 3.0.0,
+            # and would cause puppetdb to be bounced by the agent run. By sleeping
+            # again here, we ensure that if that bounce happens during an upgrade
+            # test we won't fail early in the install process.
+            if host['pe_ver'] == '3.0.0' and host == database
+              sleep_until_puppetdb_started(database)
+            end
+          end
 
-        # Run the agent once to ensure everything is in the dashboard
-        install_hosts.each do |host|
-          on host, puppet_agent('-t'), :acceptable_exit_codes => [0,2]
-
-          # Workaround for PE-1105 when deploying 3.0.0
-          # The installer did not respect our database host answers in 3.0.0,
-          # and would cause puppetdb to be bounced by the agent run. By sleeping
-          # again here, we ensure that if that bounce happens during an upgrade
-          # test we won't fail early in the install process.
-          if host['pe_ver'] == '3.0.0' and host == database
-            sleep_until_puppetdb_started(database)
+          install_hosts.each do |host|
+            wait_for_host_in_dashboard(host)
           end
-        end
 
-        install_hosts.each do |host|
-          wait_for_host_in_dashboard(host)
-        end
+          if pre30master
+            task = 'nodegroup:add_all_nodes group=default'
+          else
+            task = 'defaultgroup:ensure_default_group'
+          end
+          on dashboard, "/opt/puppet/bin/rake -sf /opt/puppet/share/puppet-dashboard/Rakefile #{task} RAILS_ENV=production"
 
-        if pre30master
-          task = 'nodegroup:add_all_nodes group=default'
-        else
-          task = 'defaultgroup:ensure_default_group'
+          # Now that all hosts are in the dashbaord, run puppet one more
+          # time to configure mcollective
+          on install_hosts, puppet_agent('-t'), :acceptable_exit_codes => [0,2]
         end
-        on dashboard, "/opt/puppet/bin/rake -sf /opt/puppet/share/puppet-dashboard/Rakefile #{task} RAILS_ENV=production"
-
-        # Now that all hosts are in the dashbaord, run puppet one more
-        # time to configure mcollective
-        on install_hosts, puppet_agent('-t'), :acceptable_exit_codes => [0,2]
       end
 
       #Perform a Puppet Enterprise Higgs install up until web browser interaction is required, runs on linux hosts only.
@@ -620,7 +629,10 @@ module Beaker
       #
       # @!visibility private
       def sorted_hosts
-        special_nodes = [master, database, dashboard].uniq
+        special_nodes = []
+        [master, database, dashboard].uniq.each do |host|
+          special_nodes << host if host != nil
+        end
         real_agents = agents - special_nodes
         special_nodes + real_agents
       end
@@ -815,10 +827,15 @@ module Beaker
       # @return nil
       # @api private
       def install_puppet_from_dmg( host, opts )
+
         puppet_ver = opts[:version]
         facter_ver = opts[:facter_version]
         hiera_ver = opts[:hiera_version]
 
+        if [puppet_ver, facter_ver, hiera_ver].include?(nil)
+          raise "You need to specify versions for OSX host\n eg. install_puppet({:version => '3.6.2',:facter_version => '2.1.0',:hiera_version  => '1.3.4',})"
+        end
+
         on host, "curl -O #{opts[:mac_download_url]}/puppet-#{puppet_ver}.dmg"
         on host, "curl -O #{opts[:mac_download_url]}/facter-#{facter_ver}.dmg"
         on host, "curl -O #{opts[:mac_download_url]}/hiera-#{hiera_ver}.dmg"
@@ -1113,6 +1130,30 @@ module Beaker
         end
       end
 
+      # Installs packages from the local development repository on the given host
+      #
+      # @param [Host] host An object implementing {Beaker::Hosts}'s
+      #                    interface.
+      # @param [Regexp] package_name The name of the package whose repository is
+      #                              being installed.
+      #
+      # @note This method only works on redhat-like and debian-like hosts.
+      # @note This method is paired to be run directly after {#install_puppetlabs_dev_repo}
+      #
+      def install_packages_from_local_dev_repo( host, package_name )
+        if host['platform'] =~ /debian|ubuntu|cumulus/
+          find_filename = '*.deb'
+          find_command  = 'dpkg -i'
+        elsif host['platform'] =~ /fedora|el|centos/
+          find_filename = '*.rpm'
+          find_command  = 'rpm -ivh'
+        else
+          raise "No repository installation step for #{host['platform']} yet..."
+        end
+        find_command = "find /root/#{package_name} -type f -name '#{find_filename}' -exec #{find_command} {} \\;"
+        on host, find_command
+      end
+
       # Install development repo of the puppet-agent on the given host
       #
       # @param [Host] host An object implementing {Beaker::Hosts}'s interface

data/lib/beaker/dsl/roles.rb

@@ -31,10 +31,11 @@ module Beaker
 
       # The host for which ['roles'] include 'master'.
       # If no host has the 'master' role, then use the host defined as 'default'.
-      # If no host is defined as a 'master' and there is no 'default' host defined then
-      # raise an error.
+      # If no host is defined as a 'master' and there is no 'default' host defined
+      # then it either raises an error (has a master),
+      # or it returns nil (masterless)
       #
-      # @return [Array<Host>]
+      # @return [Host] Returns the host, or nil if not found & masterless
       # @raise [Beaker::DSL::Outcomes::FailTest] if there are less
       #   or more than 1 master is found.
       #
@@ -42,33 +43,33 @@ module Beaker
       #     on, master, 'cat /etc/puppet/puppet.conf'
       #
       def master
-        find_only_one :master
+        find_host_with_role :master
       end
 
       # The host for which ['roles'] include 'database'
       #
-      # @return [Array<Host>]
-      # @raise [Beaker::DSL::Outcomes::FailTest] if there are less
-      #   or more than 1 database is found.
+      # @return [Host] Returns the host, or nil if not found & masterless
+      # @raise [Beaker::DSL::Outcomes::FailTest] if there are an inappropriate
+      #   number of hosts found (depends on masterless option)
       #
       # @example Basic usage
       #     on, agent, "curl -k http://#{database}:8080"
       #
       def database
-        find_only_one :database
+        find_host_with_role :database
       end
 
       # The host for which ['roles'] include 'dashboard'
       #
-      # @return [Array<Host>]
-      # @raise [Beaker::DSL::Outcomes::FailTest] if there are less
-      #   or more than 1 dashboard is found.
+      # @return [Host] Returns the host, or nil if not found & masterless
+      # @raise [Beaker::DSL::Outcomes::FailTest] if there are an inappropriate
+      #   number of hosts found (depends on masterless option)
       #
       # @example Basic usage
       #     on, agent, "curl https://#{database}/nodes/#{agent}"
       #
       def dashboard
-        find_only_one :dashboard
+        find_host_with_role :dashboard
       end
 
       # The default host
@@ -78,14 +79,15 @@ module Beaker
       #   OR
       #   - host with 'master' as a role
       #
-      # @return [Array<Host>]
-      # @raise [Beaker::DSL::Outcomes::FailTest] if no default host is found
+      # @return [Host] Returns the host, or nil if not found & masterless
+      # @raise [Beaker::DSL::Outcomes::FailTest] if there are an inappropriate
+      #   number of hosts found (depends on masterless option)
       #
       # @example Basic usage
       #     on, default, "curl https://#{database}/nodes/#{agent}"
       #
       def default
-        find_only_one :default
+        find_host_with_role :default
       end
 
       #Create a new role method for a given arbitrary role name.  Makes it possible to be able to run
@@ -147,6 +149,22 @@ module Beaker
         hosts_with_role(hosts, desired_role)
       end
 
+      # finds the appropriate number of hosts for a given role
+      # determines whether to allow no server using the masterless option
+      #
+      # @param [Symbol, String] role The role to find a host for
+      # @return [Host] Returns the host, or nil if masterless and none are found
+      #   for that role
+      # @raise Throws an exception if an inappropriate number of hosts are found
+      #   for that role
+      def find_host_with_role role
+        if (defined? options) && options[:masterless]
+          find_at_most_one role
+        else
+          find_only_one role
+        end
+      end
+
       # @param [Symbol, String] role The role to find a host for
       # @return [Host] Returns the host, if one and only one is found
       # @raise Raises a failure exception if one and only one host that matches
@@ -156,6 +174,16 @@ module Beaker
       rescue ArgumentError => e
         raise DSL::Outcomes::FailTest, e.to_s
       end
+
+      # @param [Symbol, String] role The role to find a host for
+      # @return [Host] Returns the host, or nil if not found
+      # @raise Raises a failure exception if more than one host that matches
+      #   the specified role is found.
+      def find_at_most_one role
+        find_at_most_one_host_with_role(hosts, role)
+      rescue ArgumentError => e
+        raise DSL::Outcomes::FailTest, e.to_s
+      end
     end
   end
 end

data/lib/beaker/host.rb

@@ -49,6 +49,7 @@ module Beaker
       # related through 'type' and the differences between the assumption of our two
       # configurations we have for many of our products
       type = @options.get_type
+      type = :foss if type == :aio && !@options['HOSTS'][@name]['roles'].include?('agent')
       @defaults = merge_defaults_for_type @options, type
       pkg_initialize
     end

data/lib/beaker/host_prebuilt_steps.rb

@@ -227,7 +227,7 @@ module Beaker
     # @param [Hash{Symbol=>String}] opts Options to alter execution.
     # @option opts [Boolean] :debug If true, print verbose rpm information when installing EPEL
     # @option opts [Beaker::Logger] :logger A {Beaker::Logger} object
-    # @option opts [String] :epel_url Link to download from 
+    # @option opts [String] :epel_url Link to download from
     # @option opts [String] :epel_arch Architecture of epel to download (i386, x86_64, etc)
     # @option opts [String] :epel_6_pkg Package to download from provided link for el-6
     # @option opts [String] :epel_5_pkg Package to download from provided link for el-5
@@ -299,6 +299,8 @@ module Beaker
         if host['platform'] =~ /windows/
           host.exec(Command.new('cp -r .ssh /cygdrive/c/Users/Administrator/.'))
           host.exec(Command.new('chown -R Administrator /cygdrive/c/Users/Administrator/.ssh'))
+        elsif host['platform'] =~ /osx/
+          host.exec(Command.new('sudo cp -r .ssh /var/root/.'), {:pty => true})
         else
           host.exec(Command.new('sudo su -c "cp -r .ssh /root/."'), {:pty => true})
         end
@@ -332,13 +334,17 @@ module Beaker
       block_on host do |host|
         logger.debug "Update /etc/ssh/sshd_config to allow root login"
         # note: this sed command only works on gnu sed
-        host.exec(Command.new("sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\""), {:pty => true}
-        )
+        if host['platform'] =~ /osx/
+          host.exec(Command.new("sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' /etc/sshd_config"))
+          host.exec(Command.new("sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' /etc/sshd_config"))
+        else
+          host.exec(Command.new("sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\""), {:pty => true})
+        end
         #restart sshd
         if host['platform'] =~ /debian|ubuntu|cumulus/
           host.exec(Command.new("sudo su -c \"service ssh restart\""), {:pty => true})
         elsif host['platform'] =~ /centos|el-|redhat|fedora|eos/
-          host.exec(Command.new("sudo -E /sbin/service sshd restart"))
+          host.exec(Command.new("sudo -E /sbin/service sshd restart"), {:pty => true})
         else
           @logger.warn("Attempting to update ssh on non-supported platform: #{host.name}: #{host['platform']}")
         end

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -238,8 +238,8 @@ module Beaker
       @hosts.each do |host|
         amitype = host['vmname'] || host['platform']
         amisize = host['amisize'] || 'm1.small'
-        subnet_id = host['subnet_id'] || nil
-        vpc_id = host['vpc_id'] || nil
+        subnet_id = host['subnet_id'] || @options['subnet_id'] || nil
+        vpc_id = host['vpc_id'] || @options['vpc_id'] || nil
 
         if vpc_id and !subnet_id
           raise RuntimeError, "A subnet_id must be provided with a vpc_id"
@@ -256,7 +256,18 @@ module Beaker
         # Main region object for ec2 operations
         region = @ec2.regions[ami_region]
 
-        # Obtain the VPC object if it exists
+        # If we haven't defined a vpc_id then we use the default vpc for the provided region
+        if !vpc_id
+          @logger.notify("aws-sdk: filtering available vpcs in region by 'isDefault")
+          filtered_vpcs = region.client.describe_vpcs(:filters => [{:name => 'isDefault', :values => ['true']}])
+          if !filtered_vpcs[:vpc_set].empty?
+            vpc_id = filtered_vpcs[:vpc_set].first[:vpc_id]
+          else #there's no default vpc, use nil
+            vpc_id = nil
+          end
+        end
+
+        # Grab the vpc object based upon provided id
         vpc = vpc_id ? region.vpcs[vpc_id] : nil
 
         # Grab image object
@@ -276,6 +287,8 @@ module Beaker
           block_device_mappings << {
             :device_name => device_name,
             :ebs => {
+              # Change the default size of the root volume.
+              :volume_size => host['volume_size'] || rest[:volume_size],
               # This is required to override the images default for
               # delete_on_termination, forcing all volumes to be deleted once the
               # instance is terminated.
@@ -284,6 +297,8 @@ module Beaker
           }
         end
 
+        security_group = ensure_group(vpc || region, Beaker::EC2Helper.amiports(host))
+
         # Launch the node, filling in the blanks from previous work.
         @logger.notify("aws-sdk: Launch instance")
         config = {
@@ -291,7 +306,7 @@ module Beaker
           :image_id => image_id,
           :monitoring_enabled => true,
           :key_pair => ensure_key_pair(region),
-          :security_groups => [ensure_group(vpc || region, Beaker::EC2Helper.amiports(host))],
+          :security_groups => [security_group],
           :instance_type => amisize,
           :disable_api_termination => false,
           :instance_initiated_shutdown_behavior => "terminate",
@@ -527,20 +542,20 @@ module Beaker
 
     # Return an existing group, or create new one
     #
-    # Accepts a region or VPC as input for checking & creation.
+    # Accepts a VPC as input for checking & creation.
     #
-    # @param rv [AWS::EC2::Region, AWS::EC2::VPC] the AWS region or vpc control object
+    # @param vpc [AWS::EC2::VPC] the AWS vpc control object
     # @param ports [Array<Number>] an array of port numbers
     # @return [AWS::EC2::SecurityGroup] created security group
     # @api private
-    def ensure_group(rv, ports)
+    def ensure_group(vpc, ports)
       @logger.notify("aws-sdk: Ensure security group exists for ports #{ports.to_s}, create if not")
       name = group_id(ports)
 
-      group = rv.security_groups.filter('group-name', name).first
+      group = vpc.security_groups.filter('group-name', name).first
 
       if group.nil?
-        group = create_group(rv, ports)
+        group = create_group(vpc, ports)
       end
 
       group