beaker 2.13.0 → 2.14.0

data/lib/beaker/host/windows.rb

@@ -15,58 +15,14 @@ module Windows
     include Windows::Exec
     include Windows::Pkg
 
-    def self.pe_defaults
+    def platform_defaults
       h = Beaker::Options::OptionsHash.new
       h.merge({
         'user'          => 'Administrator',
         'group'         => 'Administrators',
-        'puppetservice' => 'pe-httpd',
-        'puppetpath'    => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
-        'puppetconfdir' => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
-        'puppetcodedir' => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
-        'hieraconf'     => '`cygpath -smF 35`/Puppetlabs/puppet/etc/hiera.yaml',
-        'puppetvardir'  => '`cygpath -smF 35`/PuppetLabs/puppet/var',
-        'distmoduledir' => '`cygpath -smF 35`/PuppetLabs/puppet/etc/modules',
-        'sitemoduledir' => 'C:/usr/share/puppet/modules',
-        #let's just add both potential bin dirs to the path
-        'puppetbindir'  => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet Enterprise/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet Enterprise/bin',
-        'privatebindir' => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet Enterprise/sys/ruby/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet Enterprise/sys/ruby/bin',
         'pathseparator' => ';',
       })
     end
 
-    def self.foss_defaults
-      h = Beaker::Options::OptionsHash.new
-      h.merge({
-        'user'              => 'Administrator',
-        'group'             => 'Administrators',
-        'puppetpath'        => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
-        'puppetconfdir'     => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
-        'puppetcodedir'     => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
-        'hieraconf'         => '`cygpath -smF 35`/Puppetlabs/puppet/etc/hiera.yaml',
-        'puppetvardir'      => '`cygpath -smF 35`/PuppetLabs/puppet/var',
-        'distmoduledir'     => '`cygpath -smF 35`/PuppetLabs/puppet/etc/modules',
-        'sitemoduledir'     => 'C:/usr/share/puppet/modules',
-        'hieralibdir'       => '`cygpath -w /opt/puppet-git-repos/hiera/lib`',
-        'hierapuppetlibdir' => '`cygpath -w /opt/puppet-git-repos/hiera-puppet/lib`',
-        #let's just add both potential bin dirs to the path
-        'puppetbindir'      => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/bin',
-        'privatebindir'     => '/usr/bin',
-        'hierabindir'       => '/opt/puppet-git-repos/hiera/bin',
-        'pathseparator'     => ';',
-      })
-    end
-
-    def self.aio_defaults
-      h = Beaker::Options::OptionsHash.new
-      h.merge({
-        'user'              => 'Administrator',
-        'puppetbindir'      => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/bin',
-        'privatebindir'     => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/sys/ruby/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/sys/ruby/bin',
-        'distmoduledir'     => '`cygpath -smF 35`/PuppetLabs/code/modules',
-        # sitemoduledir not included (check PUP-4049 for more info)
-        'pathseparator'     => ';',
-        })
-    end
   end
 end

data/lib/beaker/host_prebuilt_steps.rb

@@ -1,6 +1,6 @@
 require 'pathname'
 
-[ 'command', "dsl/patterns" ].each do |lib|
+[ 'command', "dsl" ].each do |lib|
   require "beaker/#{lib}"
 end
 
@@ -456,18 +456,6 @@ module Beaker
       merged_hash
     end
 
-    # 'echo' the provided value on the given host
-    # @param [Host] host The host to execute the 'echo' on
-    # @param [String] val The string to 'echo' on the host
-    def echo_on_host host, val
-      #val = val.gsub(/"/, "\"").gsub(/\(/, "\(")
-      if host.is_powershell?
-        host.exec(Command.new("echo #{val}")).stdout.chomp
-      else
-        host.exec(Command.new("echo \"#{val}\"")).stdout.chomp
-      end
-    end
-
     # Create the hash of default environment from host (:host_env), global options hash (:host_env) and default PE/Foss puppet variables
     # @param [Host] host The host to construct the environment hash for, host specific environment should be in :host_env in a hash
     # @param [Hash] opts Hash of options, including optional global  host_env to be applied to each provided host
@@ -475,17 +463,6 @@ module Beaker
     def construct_env host, opts
       env = additive_hash_merge(host[:host_env], opts[:host_env])
 
-      #Add PATH
-
-      #prepend any PATH already set for this host
-
-      env['PATH'] = (%w(puppetbindir facterbindir hierabindir) << env['PATH']).compact.reject(&:empty?)
-      #get the PATH defaults
-      env['PATH'].map! { |val| host[val] }
-      env['PATH'] = env['PATH'].compact.reject(&:empty?)
-      #run the paths through echo to see if they have any subcommands that need processing
-      env['PATH'].map! { |val| echo_on_host(host, val) }
-
       env.each_key do |key|
         separator = host['pathseparator']
         if key == 'PATH' && (not host.is_powershell?)
@@ -560,6 +537,16 @@ module Beaker
         env.each_pair do |var, value|
           host.add_env_var(var, value)
         end
+        # REMOVE POST BEAKER 3: backwards compatability, do some setup based upon the global type
+        # this is the worst and i hate it
+        if host[:type]
+          case host[:type]
+          when /git|foss|aio/
+            Class.new.extend(Beaker::DSL).configure_foss_defaults_on(host)
+          when /pe/
+            Class.new.extend(Beaker::DSL).configure_pe_defaults_on(host)
+          end
+        end
 
         #close the host to re-establish the connection with the new sshd settings
         host.close

data/lib/beaker/hypervisor/aixer.rb

@@ -23,7 +23,7 @@ module Beaker
       }
 
       @logger.notify "Connecting to hypervisor at #{hypername}"
-      hypervisor = Beaker::Host.create( hypername, hyperopts )
+      hypervisor = Beaker::Host.create( hypername, hyperopts, @options )
       hypervisor[:user] = @fog_file[:default][:aix_hypervisor_username] || hypervisor[:user]
       hypervisor[:ssh][:keys] = [@fog_file[:default][:aix_hypervisor_keyfile]] || hypervisor[:ssh][:keys]
 

data/lib/beaker/hypervisor/docker.rb

@@ -1,6 +1,13 @@
 module Beaker
   class Docker < Beaker::Hypervisor
 
+    # Docker hypvervisor initializtion
+    # Env variables supported:
+    # DOCKER_REGISTRY: Docker registry URL
+    # DOCKER_HOST: Remote docker host
+    # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
+    #                            or a role (String or Symbol) that identifies one or more hosts.
+    # @param [Hash{Symbol=>String}] options Options to pass on to the hypervisor
     def initialize(hosts, options)
       require 'docker'
       @options = options
@@ -21,6 +28,19 @@ module Beaker
 
       # Pass on all the logging from docker-api to the beaker logger instance
       ::Docker.logger = @logger
+
+      # Find out what kind of remote instance we are talking against
+      if ::Docker.version['Version'] =~ /swarm/
+        @docker_type = 'swarm'
+        unless ENV['DOCKER_REGISTRY']
+          raise "Using Swarm with beaker requires a private registry. Please setup the private registry and set the 'DOCKER_REGISTRY' env var"
+        else
+          @registry = ENV['DOCKER_REGISTRY']
+        end
+      else
+        @docker_type = 'docker'
+      end
+
     end
 
     def provision
@@ -32,9 +52,21 @@ module Beaker
         @logger.debug("Creating image")
         image = ::Docker::Image.build(dockerfile_for(host), { :rm => true })
 
-        @logger.debug("Creating container from image #{image.id}")
+        if @docker_type == 'swarm'
+          image_name = "#{@registry}/beaker/#{image.id}"
+          ret = ::Docker::Image.search(:term => image_name)
+          if ret.first.nil?
+            @logger.debug("Image does not exist on registry. Pushing.")
+            image.tag({:repo => image_name, :force => true})
+            image.push
+          end
+        else
+          image_name = image.id
+        end
+
+        @logger.debug("Creating container from image #{image_name}")
         container = ::Docker::Container.create({
-          'Image' => image.id,
+          'Image' => image_name,
           'Hostname' => host.name,
         })
 
@@ -42,12 +74,19 @@ module Beaker
         container.start({"PublishAllPorts" => true, "Privileged" => true})
 
         # Find out where the ssh port is from the container
-        if ENV['DOCKER_HOST']
+        # When running on swarm DOCKER_HOST points to the swarm manager so we have to get the
+        # IP of the swarm slave via the container data
+        # When we are talking to a normal docker instance DOCKER_HOST can point to a remote docker instance.
+
+        # Talking against a remote docker host which is a normal docker host
+        if @docker_type == 'docker' && ENV['DOCKER_HOST']
           ip = URI.parse(ENV['DOCKER_HOST']).host
-          @logger.info("Using docker server at #{ip}")
         else
+          # Swarm or local docker host
           ip = container.json["NetworkSettings"]["Ports"]["22/tcp"][0]["HostIp"]
         end
+
+        @logger.info("Using docker server at #{ip}")
         port = container.json["NetworkSettings"]["Ports"]["22/tcp"][0]["HostPort"]
 
         forward_ssh_agent = @options[:forward_ssh_agent] || false

data/lib/beaker/hypervisor/openstack.rb

@@ -100,6 +100,7 @@ module Beaker
           :image_ref  => image(host[:image]).id,
           :nics       => [ {'net_id' => network(@options[:openstack_network]).id } ],
           :name       => host[:vmhostname],
+          :user_data  => "#cloud-config\nmanage_etc_hosts: true\n",
         }
         options[:key_name] = key_name(host)
         vm = @compute_client.servers.create(options)

data/lib/beaker/hypervisor/solaris.rb

@@ -24,7 +24,7 @@ module Beaker
       }
 
       @logger.notify "Connecting to hypervisor at #{hypername}"
-      hypervisor = Beaker::Host.create( hypername, hyperopts )
+      hypervisor = Beaker::Host.create( hypername, hyperopts, @options )
       hypervisor[:user] = @fog_file[:default][:solaris_hypervisor_username] || hypervisor[:user]
       hypervisor[:ssh][:keys] = [@fog_file[:default][:solaris_hypervisor_keyfile]] || hypervisor[:ssh][:keys]
 

data/lib/beaker/hypervisor/vmpooler.rb

@@ -15,6 +15,8 @@ module Beaker
       Errno::ENETUNREACH,
     ]
 
+    attr_reader :options, :logger, :hosts, :credentials
+
     def initialize(vmpooler_hosts, options)
       @options = options
       @logger = options[:logger]
@@ -25,16 +27,25 @@ module Beaker
     def load_credentials(dot_fog = '.fog')
       creds = {}
 
-      begin
-        fog = YAML.load_file(dot_fog)
-        default = fog[:default]
-
-        creds[:vmpooler_token] = default[:vmpooler_token]
-      rescue Errno::ENOENT
-        @logger.warn "Credentials file (#{@options[:dot_fog]}) not found; proceeding without authentication"
+      if fog = read_fog_file(dot_fog)
+        if fog[:default] && fog[:default][:vmpooler_token]
+          creds[:vmpooler_token] = fog[:default][:vmpooler_token]
+        else
+          @logger.warn "Credentials file (#{dot_fog}) is missing a :default section with a :vmpooler_token value; proceeding without authentication"
+        end
+      else
+        @logger.warn "Credentials file (#{dot_fog}) is empty; proceeding without authentication"
       end
 
       creds
+
+    rescue Errno::ENOENT
+      @logger.warn "Credentials file (#{dot_fog}) not found; proceeding without authentication"
+      creds
+    end
+
+    def read_fog_file(dot_fog = '.fog')
+      YAML.load_file(dot_fog)
     end
 
     def check_url url
@@ -149,7 +160,7 @@ module Beaker
           request.body = { 'tags' => tags }.to_json
 
           response = http.request(request)
-        rescue RuntimeError, Error::EINVAL, Errno::ECONNRESET, EOFError,
+        rescue RuntimeError, Errno::EINVAL, Errno::ECONNRESET, EOFError,
                Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, *SSH_EXCEPTIONS => e
           @logger.notify "Failed to connect to vmpooler for tagging!"
         end

data/lib/beaker/network_manager.rb

@@ -50,13 +50,14 @@ module Beaker
       end
       @hypervisors = {}
       #sort hosts by their hypervisor, use hypervisor 'none' if no hypervisor is specified
+      hostless_options = Beaker::Options::OptionsHash.new.merge(@options.select{ |k,v| k.to_s !~ /HOSTS/})
       @options['HOSTS'].each_key do |name|
-        host = @options['HOSTS'][name]
-        hypervisor = host['hypervisor']
-        hypervisor = provision?(@options, host) ? host['hypervisor'] : 'none'
+        host_hash = @options['HOSTS'][name]
+        hypervisor = host_hash['hypervisor']
+        hypervisor = provision?(@options, host_hash) ? host_hash['hypervisor'] : 'none'
         @logger.debug "Hypervisor for #{name} is #{hypervisor}"
         @machines[hypervisor] = [] unless @machines[hypervisor]
-        @machines[hypervisor] << Beaker::Host.create(name, @options)
+        @machines[hypervisor] << Beaker::Host.create(name, host_hash, hostless_options)
       end
 
       @machines.each_key do |type|

data/lib/beaker/options/command_line_parser.rb

@@ -27,13 +27,6 @@ module Beaker
             @cmd_options[:options_file] =  file
           end
 
-          opts.on '--type TYPE',
-                  'one of git, foss, or pe',
-                  'used to determine underlying path structure of puppet install',
-                  '(default pe)' do |type|
-            @cmd_options[:type] = type
-          end
-
           opts.on '--helper PATH/TO/SCRIPT',
                   'Ruby file evaluated prior to tests',
                   '(a la spec_helper)' do |script|
@@ -193,6 +186,10 @@ module Beaker
             @cmd_options[:validate] = bool
           end
 
+          opts.on '--collect-perf-data', 'Use sysstat on linux hosts to collect performance and load data' do
+            @cmd_options[:collect_perf_data] = true
+          end
+
           opts.on('--version', 'Report currently running version of beaker' ) do
             @cmd_options[:version] = true
           end
@@ -220,9 +217,12 @@ module Beaker
             #noop
           end
 
-          opts.on '--collect-perf-data', 'Use sysstat on linux hosts to collect performance and load data' do
-            @cmd_options[:collect_perf_data] = true
+          opts.on '--type TYPE',
+                  'DEPRECATED - pe/foss/aio determined during runtime' do |type|
+            #backwards compatability, oh how i hate you
+            @cmd_options[:type] = type
           end
+
         end
 
       end

data/lib/beaker/options/parser.rb

@@ -169,9 +169,9 @@ module Beaker
       #
       # Order of priority is as follows:
       #   1.  environment variables are given top priority
-      #   2.  host file options
-      #   3.  the 'CONFIG' section of the hosts file
-      #   4.  ARGV or provided arguments array
+      #   2.  ARGV or provided arguments array
+      #   3.  host file options
+      #   4.  the 'CONFIG' section of the hosts file
       #   5.  options file values
       #   6.  default or preset values are given the lowest priority
       #
@@ -184,6 +184,7 @@ module Beaker
 
         @options = @presets.presets
         cmd_line_options = @command_line_parser.parse(args)
+        cmd_line_options[:command_line] = ([$0] + args).join(' ')
         file_options = Beaker::Options::OptionsFileParser.parse_options_file(cmd_line_options[:options_file])
 
         # merge together command line and file_options
@@ -193,16 +194,19 @@ module Beaker
         # merge command line and file options with defaults
         #   overwrite defaults with command line and file options
         @options = @options.merge(cmd_line_and_file_options)
-        @options[:command_line] = ([$0] + args).join(' ')
 
         if not @options[:help] and not @options[:version]
           #read the hosts file that contains the node configuration and hypervisor info
           hosts_options = Beaker::Options::HostsFileParser.parse_hosts_file(@options[:hosts_file])
 
           # merge in host file vars
-          #   overwrite options (default, file options, command line, env) with host file options
+          #   overwrite options (default, file options, command line) with host file options
           @options = @options.merge(hosts_options)
 
+          # re-merge the command line options
+          #   overwrite options (default, file options, hosts file ) with command line arguments
+          @options = @options.merge(cmd_line_options)
+
           # merge in env vars
           #   overwrite options (default, file options, command line, hosts file) with env
           env_vars = @presets.env_vars
@@ -236,14 +240,13 @@ module Beaker
       #  - each host has a valid platform
       #  - if a keyfile is provided then use it
       #  - paths provided to --test, --pre-suite, --post-suite provided lists of .rb files for testing
-      #  - --type is one of 'pe' or 'git'
       #  - --fail-mode is one of 'fast', 'stop' or nil
       #  - if using blimpy hypervisor an EC2 YAML file exists
       #  - if using the aix, solaris, or vcloud hypervisors a .fog file exists
       #  - that one and only one master is defined per set of hosts
       #  - that solaris/windows/aix hosts are agent only for PE tests OR
-      #  - that windows/aix host are agent only if type is not 'pe'
       #  - sets the default host based upon machine definitions
+      #  - if an ssh user has been defined make it the host user
       #
       #@raise [ArgumentError] Raise if argument/options values are invalid
       def normalize_args
@@ -266,7 +269,7 @@ module Beaker
         LONG_OPTS.each do |opt|
           if @options.has_key?(opt)
             @options[opt] = split_arg(@options[opt])
-            if RB_FILE_OPTS.include?(opt)
+            if RB_FILE_OPTS.include?(opt) && (not @options[opt] == [])
               @options[opt] = file_list(@options[opt])
             end
             if opt == :install
@@ -277,11 +280,6 @@ module Beaker
           end
         end
 
-        #check for valid type
-        if @options[:type] !~ /pe|git|foss|aio/
-          parser_error "--type must be one of pe, git, foss, or aio not '#{@options[:type]}'"
-        end
-
         #check for valid fail mode
         if @options[:fail_mode] !~ /stop|fast|slow/
           parser_error "--fail-mode must be one of fast or slow, not '#{@options[:fail_mode]}'"
@@ -326,12 +324,10 @@ module Beaker
           parser_error "Only one host/node may have the role 'master', fix #{@options[:hosts_file]}"
         end
 
-        #check that solaris/windows/el-4 boxes are only agents
+        #check that windows/el-4 boxes are only agents (solaris can be a master in foss cases)
         @options[:HOSTS].each_key do |name|
           host = @options[:HOSTS][name]
-          if (host[:platform] =~ /windows|el-4/) ||
-             (@options.is_pe? && host[:platform] =~ /solaris/)
-
+          if host[:platform] =~ /windows|el-4/
             test_host_roles(name, host)
           end
         end
@@ -339,6 +335,14 @@ module Beaker
         #set the default role
         set_default_host!(@options[:HOSTS])
 
+        #check to see if a custom user account has been provided, if so use it
+        @options[:HOSTS].each_key do |name|
+          host = @options[:HOSTS][name]
+          if host[:ssh] && host[:ssh][:user]
+            host[:user] = host[:ssh][:user]
+          end
+        end
+
       end
 
       private

data/lib/beaker/options/presets.rb

@@ -165,39 +165,6 @@ module Beaker
           :host_env               => {},
           :ssh_env_file           => '~/.ssh/environment',
           :profile_d_env_file     => '/etc/profile.d/beaker_env.sh',
-          :answers                => {
-                                     :q_puppet_enterpriseconsole_auth_user_email    => 'admin@example.com',
-                                     :q_puppet_enterpriseconsole_auth_password      => '~!@#$%^*-/ aZ',
-                                     :q_puppet_enterpriseconsole_smtp_port          => 25,
-                                     :q_puppet_enterpriseconsole_smtp_use_tls       => 'n',
-                                     :q_verify_packages                             => 'y',
-                                     :q_puppetdb_password                           => '~!@#$%^*-/ aZ',
-                                     :q_puppetmaster_enterpriseconsole_port         => 443,
-                                     :q_puppet_enterpriseconsole_auth_database_name => 'console_auth',
-                                     :q_puppet_enterpriseconsole_auth_database_user => 'mYu7hu3r',
-                                     :q_puppet_enterpriseconsole_database_name      => 'console',
-                                     :q_puppet_enterpriseconsole_database_user      => 'mYc0nS03u3r',
-                                     :q_database_root_password                      => '=ZYdjiP3jCwV5eo9s1MBd',
-                                     :q_database_root_user                          => 'pe-postgres',
-                                     :q_database_export_dir                         => '/tmp',
-                                     :q_puppetdb_database_name                      => 'pe-puppetdb',
-                                     :q_puppetdb_database_user                      => 'mYpdBu3r',
-                                     :q_database_port                               => 5432,
-                                     :q_puppetdb_port                               => 8081,
-                                     :q_classifier_database_user                    => 'DFGhjlkj',
-                                     :q_database_name                               => 'pe-classifier',
-                                     :q_classifier_database_password                => '~!@#$%^*-/ aZ',
-                                     :q_activity_database_user                      => 'adsfglkj',
-                                     :q_activity_database_name                      => 'pe-activity',
-                                     :q_activity_database_password                  => '~!@#$%^*-/ aZ',
-                                     :q_rbac_database_user                          => 'RbhNBklm',
-                                     :q_rbac_database_name                          => 'pe-rbac',
-                                     :q_rbac_database_password                      => '~!@#$%^*-/ aZ',
-                                     :q_install_update_server                       => 'y',
-                                     :q_exit_for_nc_migrate                         => 'n',
-                                     :q_enable_future_parser                        => 'n',
-                                     :q_pe_check_for_updates                        => 'n',
-          },
           :dot_fog                => File.join(ENV['HOME'], '.fog'),
           :ec2_yaml               => 'config/image_templates/ec2.yaml',
           :help                   => false,