beaker 1.8.2 → 1.9.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmRhZWZiYzAyYjBlYWU1NjQ4ZTJiY2Q2YjY2MjIzZDQ3OTU2ODhjMQ==
+    NTkxODUzNWEzMjEwNjgxNjFhZWU2MDU5MGM4N2MzY2NhZjQ3ZjIzNg==
   data.tar.gz: !binary |-
-    MzY2M2M5M2UxM2U2NmQ3MmI0Y2UwNDk3ZmM0MDYxMjAzZWY2ZjM1Mg==
+    N2YxYzI4MzNiMzI1MDQwZWU5YWQ2Y2ZmZWY1NWE4NjBjZjJlZjBiOQ==
 SHA512:
   metadata.gz: !binary |-
-    OWZhMmJiMTE1NzJiOGQ0YWNhNTAwMDI2NzM2Njc0YTc4MDdhOWNkM2Y2MDRm
-    MjFjYmY3Y2NhZDU5YmZiODAxOWZhMzE2ZDJjMDVkZTAyZjc3YTdhMjZhYjNl
-    ZjcyMDJiNDE2NzBmYzUwYjM3OTY3YjFkODg4ZjM5MjVmNGNkOTk=
+    YTIwNGFkOTQyYmFmMTE4NzMyYzlmN2FiMGMxOTg2NGY5NWUwZmJjZDU3YmI4
+    OGZiYzhhYWI5OTBlMzkzMjg0MjkzMDhiMmRkYWZhNmE0M2I1NzNmNjcyNjYw
+    YTg1OWVhNmJmMjY5NDU5OTZmODk4MTIwMDM0OGJjZTk4MmU1YmM=
   data.tar.gz: !binary |-
-    M2Y3MWYwYTBkNWJkMmQ0ZjJiMGUwYWIzNmZiODVlYTFiYTliOTU1MDY5NzRl
-    NmNlMDZjMzNlNjQ1NzM2N2U1NGYxZGFlYTNjY2NkNjA1ODE3YmY3OTMxMWI0
-    NWZjNTBlZjE2ZWRiMGYxODkyNjUyZTUyODA5ZWJlMmZlYTZkNzc=
+    NjEzOGMzZmYwN2U1OGFjMDIwZDNjYThiNmE2N2M3YjBlZWVlMTIxNmRhN2U4
+    NTVmZDQ3MGU0MzYxNzAxYjc2ZTBhNTllN2Y4Mzc3NzUxZWJhYTZhZDBkNTI1
+    ZDA1MGJlZThiOTRhOTUwN2Y3YzU4MzdkZmUxZjFhNGE4ZTc3NDc=

data/README.md

@@ -19,6 +19,3 @@ See [LICENSE](LICENSE) file.
 
 Please log tickets and issues at our [Beaker Issue Tracker](https://github.com/puppetlabs/beaker/issues).  In addition there is an active #puppet-dev channel on Freenode.
 
-We use semantic version numbers for our releases, and recommend that users stay
-as up-to-date as possible by upgrading to patch releases and minor releases as
-they become available.

data/beaker.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   # Testing dependencies
   s.add_development_dependency 'rspec', '~> 2.14.0'
   s.add_development_dependency 'fakefs', '0.4'
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake', '~> 10.1.0'
   s.add_development_dependency 'simplecov' unless RUBY_VERSION < '1.9'
 
   # Documentation dependencies
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rbvmomi', '1.8.1'
   s.add_runtime_dependency 'blimpy', '~> 0.6'
   s.add_runtime_dependency 'fission', '~> 0.4'
+  s.add_runtime_dependency 'google-api-client', '~> 0.6.4'
 
   # These are transitive dependencies that we include or pin to because...
   # Ruby 1.8 compatibility

data/lib/beaker/cli.rb

@@ -1,6 +1,5 @@
 module Beaker
   class CLI
-    GEMSPEC = File.join(File.expand_path(File.dirname(__FILE__)), "../../beaker.gemspec")
     VERSION_STRING = 
 "      wWWWw
       |o o|

data/lib/beaker/dsl/helpers.rb

@@ -983,6 +983,23 @@ module Beaker
         fact_on(default, name, opts)
       end
 
+      #Run a curl command on the provided host(s)
+      #
+      # @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, Command]   cmd The curl command to execute on *host*.
+      # @param [Proc]              block   Additional actions or assertions.
+      # @!macro common_opts
+      #
+      def curl_on(host, cmd, opts = {}, &block)
+        if options.is_pe? #check global options hash
+          on host, "curl --sslv3 %s" % cmd, opts, &block
+        else
+          on host, "curl %s" % cmd, opts, &block
+        end
+      end
+
+
     end
   end
 end

data/lib/beaker/dsl/install_utils.rb

@@ -154,7 +154,7 @@ module Beaker
         end
       end
 
-      #Determine is a given URL is accessible 
+      #Determine is a given URL is accessible
       #@param [String] link The URL to examine
       #@return [Boolean] true if the URL has a '200' HTTP response code, false otherwise
       #@example
@@ -172,11 +172,77 @@ module Beaker
         end
       end
 
-      #Determine the PE package to download/upload per-host, download/upload that package onto the host 
+      #Determine the PE package to download/upload on a windows host, download/upload that package onto the host.
+      # @param [Host] host The windows host to download/upload and unpack PE onto
+      # @param  [Hash{Symbol=>Symbol, String}] options The options
+      # @option options [String] :pe_dir Default directory or URL to pull PE package from
+      #                  (Otherwise uses individual hosts pe_dir)
+      # @option options [String] :pe_ver Default PE version to install or upgrade to
+      #                  (Otherwise uses individual hosts pe_ver)
+      # @option options [String] :pe_ver_win Default PE version to install or upgrade to on Windows hosts
+      #                  (Otherwise uses individual Windows hosts pe_ver)
+      # @api private
+      def fetch_puppet_on_windows(host, options)
+        path = options[:pe_dir] || host['pe_dir']
+        local = File.directory?(path)
+        version = options[:pe_ver_win] || host['pe_ver']
+        filename = "puppet-enterprise-#{version}"
+        extension = ".msi"
+        if local
+          if not File.exists?("#{path}/#{filename}#{extension}")
+            raise "attempting installation on #{host}, #{path}/#{filename}#{extension} does not exist"
+          end
+          scp_to host, "#{path}/#{filename}#{extension}", "#{host['working_dir']}/#{filename}#{extension}"
+        else
+          if not link_exists?("#{path}/#{filename}#{extension}")
+            raise "attempting installation on #{host}, #{path}/#{filename}#{extension} does not exist"
+          end
+          on host, "cd #{host['working_dir']}; curl -O #{path}/#{filename}#{extension}"
+        end
+      end
+
+      #Determine the PE package to download/upload on a unix style host, download/upload that package onto the host
+      #and unpack it.
+      # @param [Host] host The unix style host to download/upload and unpack PE onto
+      # @param  [Hash{Symbol=>Symbol, String}] options The options
+      # @option options [String] :pe_dir Default directory or URL to pull PE package from
+      #                  (Otherwise uses individual hosts pe_dir)
+      # @option options [String] :pe_ver Default PE version to install or upgrade to
+      #                  (Otherwise uses individual hosts pe_ver)
+      # @api private
+      def fetch_puppet_on_unix(host, options)
+        path = options[:pe_dir] || host['pe_dir']
+        local = File.directory?(path)
+        filename = "#{host['dist']}"
+        if local
+          extension = File.exists?("#{path}/#{filename}.tar.gz") ? ".tar.gz" : ".tar"
+          if not File.exists?("#{path}/#{filename}#{extension}")
+            raise "attempting installation on #{host}, #{path}/#{filename}#{extension} does not exist"
+          end
+          scp_to host, "#{path}/#{filename}#{extension}", "#{host['working_dir']}/#{filename}#{extension}"
+          if extension =~ /gz/
+            on host, "cd #{host['working_dir']}; gunzip #{filename}#{extension}"
+          end
+          if extension =~ /tar/
+            on host, "cd #{host['working_dir']}; tar -xvf #{filename}.tar"
+          end
+        else
+          extension = link_exists?("#{path}/#{filename}.tar.gz") ? ".tar.gz" : ".tar"
+          if not link_exists?("#{path}/#{filename}#{extension}")
+            raise "attempting installation on #{host}, #{path}/#{filename}#{extension} does not exist"
+          end
+          unpack = 'tar -xvf -'
+          unpack = extension =~ /gz/ ? 'gunzip | ' + unpack  : unpack
+
+          on host, "cd #{host['working_dir']}; curl #{path}/#{filename}#{extension} | #{unpack}"
+        end
+      end
+
+      #Determine the PE package to download/upload per-host, download/upload that package onto the host
       #and unpack it.
-      # @param [Array<Host>] hosts The hosts to download/upload and unpack PE onto 
+      # @param [Array<Host>] hosts The hosts to download/upload and unpack PE onto
       # @param  [Hash{Symbol=>Symbol, String}] options The options
-      # @option options [String] :pe_dir Default directory or URL to pull PE package from 
+      # @option options [String] :pe_dir Default directory or URL to pull PE package from
       #                  (Otherwise uses individual hosts pe_dir)
       # @option options [String] :pe_ver Default PE version to install or upgrade to
       #                  (Otherwise uses individual hosts pe_ver)
@@ -189,51 +255,10 @@ module Beaker
           next if host['roles'].include? 'frictionless' and ! version_is_less(options[:pe_ver] || host['pe_ver'], '3.2.0')
 
           windows = host['platform'] =~ /windows/
-          path = options[:pe_dir] || host['pe_dir']
-          local = File.directory?(path)
-          filename = ""
-          extension = ""
           if windows
-            version = options[:pe_ver_win] || host['pe_ver']
-            filename = "puppet-enterprise-#{version}"
-            extension = ".msi"
+            fetch_puppet_on_windows(host, options)
           else
-            filename = "#{host['dist']}"
-            extension = ""
-            if local
-              extension = File.exists?("#{path}/#{filename}.tar.gz") ? ".tar.gz" : ".tar"
-            else
-              extension = link_exists?("#{path}/#{filename}.tar.gz") ? ".tar.gz" : ".tar"
-            end
-          end
-          if local
-            if not File.exists?("#{path}/#{filename}#{extension}")
-              raise "attempting installation on #{host}, #{path}/#{filename}#{extension} does not exist"
-            end
-            scp_to host, "#{path}/#{filename}#{extension}", "#{host['working_dir']}/#{filename}#{extension}"
-            if extension =~ /gz/
-              on host, "cd #{host['working_dir']}; gunzip #{filename}#{extension}"
-            end
-            if extension =~ /tar/
-              on host, "cd #{host['working_dir']}; tar -xvf #{filename}.tar"
-            end
-          else
-            if not link_exists?("#{path}/#{filename}#{extension}")
-              raise "attempting installation on #{host}, #{path}/#{filename}#{extension} does not exist"
-            end
-            gunzip = ""
-            untar = ""
-            save_locally = ""
-            if extension =~ /gz/
-              gunzip = "| gunzip"
-            end
-            if extension =~ /tar/
-              untar = "| tar -xvf -"
-            end
-            if extension =~ /msi/
-              save_locally = "-O"
-            end
-            on host, "cd #{host['working_dir']}; curl #{save_locally} #{path}/#{filename}#{extension} #{gunzip} #{untar}"
+            fetch_puppet_on_unix(host, options)
           end
         end
       end
@@ -250,9 +275,9 @@ module Beaker
       end
 
       #Perform a Puppet Enterprise upgrade or install
-      # @param [Array<Host>] hosts The hosts to install or upgrade PE on 
+      # @param [Array<Host>] hosts The hosts to install or upgrade PE on
       # @param  [Hash{Symbol=>Symbol, String}] options The options
-      # @option options [String] :pe_dir Default directory or URL to pull PE package from 
+      # @option options [String] :pe_dir Default directory or URL to pull PE package from
       #                  (Otherwise uses individual hosts pe_dir)
       # @option options [String] :pe_ver Default PE version to install or upgrade to
       #                  (Otherwise uses individual hosts pe_ver)
@@ -260,14 +285,13 @@ module Beaker
       #                  (Otherwise uses individual Windows hosts pe_ver)
       # @option options [Symbol] :type (:install) One of :upgrade or :install
       #
-      #                      
-      # @example 
+      # @example
       #  do_install(hosts, {:type => :upgrade, :pe_dir => path, :pe_ver => version, :pe_ver_win =>  version_win})
       #
       # @api private
       #
       def do_install hosts, options = {}
-        options[:type] = options[:type] || :install 
+        options[:type] = options[:type] || :install
         hostcert='uname | grep -i sunos > /dev/null && hostname || hostname -s'
         master_certname = on(master, hostcert).stdout.strip
         pre30database = version_is_less(options[:pe_ver] || database['pe_ver'], '3.0')
@@ -335,7 +359,7 @@ module Beaker
           if host['pe_ver'] == '3.0.0' and host == database
             sleep_until_puppetdb_started(database)
           end
-        end 
+        end
 
         install_hosts.each do |host|
           wait_for_host_in_dashboard(host)
@@ -365,7 +389,7 @@ module Beaker
         b_nums = b.split('-')[0].split('.')
         (0...a_nums.length).each do |i|
           if i < b_nums.length
-            if a_nums[i] < b_nums[i] 
+            if a_nums[i] < b_nums[i]
               return true
             elsif a_nums[i] > b_nums[i]
               return false
@@ -377,7 +401,7 @@ module Beaker
         #checks all dots, they are equal so examine the rest
         a_rest = a.split('-', 2)[1]
         b_rest = b.split('-', 2)[1]
-        if a_rest and b_rest and a_rest < b_rest 
+        if a_rest and b_rest and a_rest < b_rest
           return false
         elsif a_rest and not b_rest
           return false
@@ -388,7 +412,7 @@ module Beaker
       end
 
       #Sort array of hosts so that it has the correct order for PE installation based upon each host's role
-      # @example 
+      # @example
       #  h = sorted_hosts
       #
       # @note Order for installation should be
@@ -440,7 +464,7 @@ module Beaker
       end
 
       #Install PE based upon host configuration and options
-      # @example 
+      # @example
       #  install_pe
       #
       # @note Either pe_ver and pe_dir should be set in the ENV or each host should have pe_ver and pe_dir set individually.
@@ -448,23 +472,23 @@ module Beaker
       #       for Unix like systems and puppet-enterprise-VERSION.msi for Windows systems.
       #
       # @api dsl
-      def install_pe 
+      def install_pe
         #process the version files if necessary
         hosts.each do |host|
           host['pe_dir'] ||= options[:pe_dir]
           if host['platform'] =~ /windows/
             host['pe_ver'] = host['pe_ver'] || options['pe_ver'] ||
-              Beaker::Options::PEVersionScraper.load_pe_version(host[:pe_dir], options[:pe_version_file_win])
+              Beaker::Options::PEVersionScraper.load_pe_version(host[:pe_dir] || options[:pe_dir], options[:pe_version_file_win])
           else
             host['pe_ver'] = host['pe_ver'] || options['pe_ver'] ||
-              Beaker::Options::PEVersionScraper.load_pe_version(host[:pe_dir], options[:pe_version_file])
+              Beaker::Options::PEVersionScraper.load_pe_version(host[:pe_dir] || options[:pe_dir], options[:pe_version_file])
           end
         end
         do_install sorted_hosts
       end
 
       #Upgrade PE based upon host configuration and options
-      # @param [String] path A path (either local directory or a URL to a listing of PE builds). 
+      # @param [String] path A path (either local directory or a URL to a listing of PE builds).
       #                      Will contain a LATEST file indicating the latest build to install.
       #                      This is ignored if a pe_upgrade_ver and pe_upgrade_dir are specified
       #                      in the host configuration file.

data/lib/beaker/host_prebuilt_steps.rb

@@ -71,8 +71,9 @@ module Beaker
     end
 
     #Validate that hosts are prepared to be used as SUTs, if packages are missing attempt to
-    #install them.  Verifies the presence of {HostPrebuiltSteps::PACKAGES} on all hosts and 
-    #{HostPrebuiltSteps::UNIX_PACKAGES} on unix platform hosts.
+    #install them.  Verifies the presence of {HostPrebuiltSteps::PACKAGES} on all hosts, 
+    #{HostPrebuiltSteps::UNIX_PACKAGES} on unix platform hosts and {HostPrebuiltSteps::SLES_PACKAGES}
+    #on sles (SUSE, Enterprise Linux) hosts.
     # @param [Host, Array<Host>, String, Symbol] host One or more hosts to act upon
     # @param [Hash{Symbol=>String}] opts Options to alter execution.
     # @option opts [Beaker::Logger] :logger A {Beaker::Logger} object
@@ -93,7 +94,6 @@ module Beaker
                 host.install_package pkg
               end
             end
-
           when host['platform'] !~ /(windows)|(aix)|(solaris)/
             UNIX_PACKAGES.each do |pkg|
               if not host.check_for_package pkg
@@ -326,7 +326,81 @@ module Beaker
         if host['platform'] =~ /windows/
           host.exec(Command.new('sudo su -c "cp -r .ssh /home/Administrator/."'))
         else
-          host.exec(Command.new('sudo su -c "cp -r .ssh /root/."'))
+          host.exec(Command.new('sudo su -c "cp -r .ssh /root/."'), {:pty => true})
+        end
+      end
+    end
+
+    #Update /etc/hosts to make it possible for each provided host to reach each other host by name.
+    #Assumes that each provided host has host[:ip] set.
+    # @param [Host, Array<Host>, String, Symbol] hosts An array of hosts to act upon
+    # @param [Hash{Symbol=>String}] opts Options to alter execution.
+    # @option opts [Beaker::Logger] :logger A {Beaker::Logger} object
+    def hack_etc_hosts hosts, opts
+      etc_hosts = "127.0.0.1\tlocalhost localhost.localdomain\n"
+      hosts.each do |host|
+        etc_hosts += "#{host['ip'].to_s}\t#{host[:vmhostname] || host.name}\n"
+      end
+      hosts.each do |host|
+        set_etc_hosts(host, etc_hosts)
+      end
+    end
+
+    #Update sshd_config on debian, ubuntu, centos, el, redhat and fedora boxes to allow for root login, does nothing on other platfoms
+    # @param [Host, Array<Host>, String, Symbol] host One or more hosts to act upon
+    # @param [Hash{Symbol=>String}] opts Options to alter execution.
+    # @option opts [Beaker::Logger] :logger A {Beaker::Logger} object
+    def enable_root_login host, opts
+      logger = opts[:logger]
+      if host.is_a? Array
+        host.map { |h| copy_ssh_to_root(h, opts) }
+      else
+        logger.debug "Update /etc/ssh/sshd_config to allow root login"
+        host.exec(Command.new("sudo su -c \"sed -i 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config\""), {:pty => true}
+  )
+        #restart sshd
+        if host['platform'] =~ /debian|ubuntu/
+          host.exec(Command.new("sudo su -c \"service ssh restart\""), {:pty => true})
+        elsif host['platform'] =~ /centos|el-|redhat|fedora/
+          host.exec(Command.new("sudo su -c \"service sshd restart\""), {:pty => true})
+        else
+          @logger.warn("Attempting to update ssh on non-supported platform: #{host.name}: #{host['platform']}")
+        end
+      end
+    end
+
+    #Disable SELinux on centos, does nothing on other platforms
+    # @param [Host, Array<Host>, String, Symbol] host One or more hosts to act upon
+    # @param [Hash{Symbol=>String}] opts Options to alter execution.
+    # @option opts [Beaker::Logger] :logger A {Beaker::Logger} object
+    def disable_se_linux host, opts
+      logger = opts[:logger]
+      if host.is_a? Array
+        host.map { |h| copy_ssh_to_root(h, opts) }
+      else
+        if host['platform'] =~ /centos/
+          @logger.debug("Disabling se_linux on #{host.name}")
+          host.exec(Command.new("sudo su -c \"setenforce 0\""), {:pty => true})
+        else
+          @logger.warn("Attempting to disable SELinux on non-centos platform: #{host.name}: #{host['platform']}")
+        end
+      end
+    end
+
+    #Disable iptables on centos, does nothing on other platforms
+    # @param [Host, Array<Host>, String, Symbol] host One or more hosts to act upon
+    # @param [Hash{Symbol=>String}] opts Options to alter execution.
+    # @option opts [Beaker::Logger] :logger A {Beaker::Logger} object
+    def disable_iptables host, opts
+      logger = opts[:logger]
+      if host.is_a? Array
+        host.map { |h| copy_ssh_to_root(h, opts) }
+      else
+        if host['platform'] =~ /centos/
+          logger.debug("Disabling iptables on #{host.name}")
+          host.exec(Command.new("sudo su -c \"/etc/init.d/iptables stop\""), {:pty => true})
+        else
+          logger.warn("Attempting to disable iptables on non-centos platform: #{host.name}: #{host['platform']}")
         end
       end
     end

data/lib/beaker/hypervisor.rb

@@ -11,6 +11,9 @@ module Beaker
   class Hypervisor
     include HostPrebuiltSteps
 
+    #Generates an array with all letters a thru z and numbers 0 thru 9
+    CHARMAP = ('a'..'z').to_a + ('0'..'9').to_a
+
     #Hypervisor creator method.  Creates the appropriate hypervisor class object based upon
     #the provided hypervisor type selected, then provisions hosts with hypervisor.
     #@param [String] type The type of hypervisor to create - one of aix, solaris, vsphere, fusion,
@@ -39,6 +42,8 @@ module Beaker
           end
         when /vagrant/
           Beaker::Vagrant
+        when /google/
+          Beaker::GoogleCompute
         when /none/
           Beaker::Hypervisor
         else
@@ -80,17 +85,22 @@ module Beaker
       if @options[:add_master_entry]
         add_master_entry(@hosts, @options)
       end
-   end
+    end
 
-   #Default validation steps to be run for a given hypervisor
-   def validate
-     validate_host(@hosts, @options)
-   end
+    #Default validation steps to be run for a given hypervisor
+    def validate
+      validate_host(@hosts, @options)
+    end
+
+    #Generate a random straing composted of letter and numbers
+    def generate_host_name
+      CHARMAP[rand(25)] + (0...14).map{CHARMAP[rand(CHARMAP.length)]}.join
+    end
 
   end
 end
 
-%w( vsphere_helper vagrant fusion blimper vsphere vcloud vcloud_pooled aixer solaris).each do |lib|
+%w( vsphere_helper vagrant fusion blimper vsphere vcloud vcloud_pooled aixer solaris google_compute_helper google_compute).each do |lib|
   begin
     require "hypervisor/#{lib}"
   rescue LoadError