beaker 1.21.0 → 2.0.0

data/lib/beaker/host_prebuilt_steps.rb

@@ -14,10 +14,11 @@ module Beaker
     WINDOWS_PACKAGES = ['curl']
     SLES_PACKAGES = ['curl', 'ntp']
     DEBIAN_PACKAGES = ['curl', 'ntpdate', 'lsb-release']
+    CUMULUS_PACKAGES = ['addons', 'ntpdate', 'lsb-release']
     ETC_HOSTS_PATH = "/etc/hosts"
     ETC_HOSTS_PATH_SOLARIS = "/etc/inet/hosts"
     ROOT_KEYS_SCRIPT = "https://raw.githubusercontent.com/puppetlabs/puppetlabs-sshkeys/master/templates/scripts/manage_root_authorized_keys"
-    ROOT_KEYS_SYNC_CMD = "curl -k -o - -L #{ROOT_KEYS_SCRIPT} | %s"
+    ROOT_KEYS_SYNC_CMD = "curl -k -o - -L #{ROOT_KEYS_SCRIPT} %s"
     APT_CFG = %q{ Acquire::http::Proxy "http://proxy.puppetlabs.net:3128/"; }
     IPS_PKG_REPO="http://solaris-11-internal-repo.delivery.puppetlabs.net"
 
@@ -66,11 +67,15 @@ module Beaker
       report_and_raise(logger, e, "timesync (--ntp)")
     end
 
-    #Validate that hosts are prepared to be used as SUTs, if packages are missing attempt to
-    #install them.  Verifies the presence of #{HostPrebuiltSteps::UNIX_PACKAGES} on unix platform hosts,
-    #{HostPrebuiltSteps::SLES_PACKAGES} on SUSE platform hosts, #{HostPrebuiltSteps::DEBIAN_PACKAGES on debian platform
-    #hosts and {HostPrebuiltSteps::WINDOWS_PACKAGES} on windows
-    #platforms.
+    # Validate that hosts are prepared to be used as SUTs, if packages are missing attempt to
+    # install them.
+    #
+    # Verifies the presence of #{HostPrebuiltSteps::UNIX_PACKAGES} on unix platform hosts,
+    # {HostPrebuiltSteps::SLES_PACKAGES} on SUSE platform hosts,
+    # {HostPrebuiltSteps::DEBIAN_PACKAGES} on debian platform hosts,
+    # {HostPrebuiltSteps::CUMULUS_PACKAGES} on cumulus platform hosts,
+    # and {HostPrebuiltSteps::WINDOWS_PACKAGES} on windows platform 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
@@ -79,35 +84,33 @@ module Beaker
       block_on host do |host|
         case
         when host['platform'] =~ /sles-/
-          SLES_PACKAGES.each do |pkg|
-            if not host.check_for_package pkg
-              host.install_package pkg
-            end
-          end
+          check_and_install_packages_if_needed(host, SLES_PACKAGES)
         when host['platform'] =~ /debian/
-          DEBIAN_PACKAGES.each do |pkg|
-            if not host.check_for_package pkg
-              host.install_package pkg
-            end
-          end
+          check_and_install_packages_if_needed(host, DEBIAN_PACKAGES)
+        when host['platform'] =~ /cumulus/
+          check_and_install_packages_if_needed(host, CUMULUS_PACKAGES)
         when host['platform'] =~ /windows/
-          WINDOWS_PACKAGES.each do |pkg|
-            if not host.check_for_package pkg
-              host.install_package pkg
-            end
-          end
-        when host['platform'] !~ /debian|aix|solaris|windows|sles-|osx-/
-          UNIX_PACKAGES.each do |pkg|
-            if not host.check_for_package pkg
-              host.install_package pkg
-            end
-          end
+          check_and_install_packages_if_needed(host, WINDOWS_PACKAGES)
+        when host['platform'] !~ /debian|aix|solaris|windows|sles-|osx-|cumulus/
+          check_and_install_packages_if_needed(host, UNIX_PACKAGES)
         end
       end
     rescue => e
       report_and_raise(logger, e, "validate")
     end
 
+    # Installs the given packages if they aren't already on a host
+    #
+    # @param [Host] host Host to act on
+    # @param [Array<String>] package_list List of package names to install
+    def check_and_install_packages_if_needed host, package_list
+      package_list.each do |pkg|
+        if not host.check_for_package pkg
+          host.install_package pkg
+        end
+      end
+    end
+
     #Install a set of authorized keys using {HostPrebuiltSteps::ROOT_KEYS_SCRIPT}.  This is a
     #convenience method to allow for easy login to hosts after they have been provisioned with
     #Beaker.
@@ -124,9 +127,17 @@ module Beaker
       logger.notify "Sync root authorized_keys from github on #{host.name}"
         # Allow all exit code, as this operation is unlikely to cause problems if it fails.
         if host['platform'].include? 'solaris'
-          host.exec(Command.new(ROOT_KEYS_SYNC_CMD % "bash"), :acceptable_exit_codes => (0..255))
+          host.exec(Command.new(ROOT_KEYS_SYNC_CMD % "| bash"), :acceptable_exit_codes => (0..255))
+        elsif host['platform'].include? 'eos'
+          # this is a terrible terrible thing that I'm already in the process of fixing
+          # the only reason that I include this terrible implementation is that the
+          # fix relies on changes in another repo, so I'm not sure how long it'll take
+          # to get those in
+          host.exec(Command.new(ROOT_KEYS_SYNC_CMD % "> manage_root_authorized_keys"), :acceptable_exit_codes => (0..255))
+          host.exec(Command.new("sed -i 's|mv -f $SSH_HOME/authorized_keys.tmp $SSH_HOME/authorized_keys|cp -f $SSH_HOME/authorized_keys.tmp $SSH_HOME/authorized_keys|' manage_root_authorized_keys"), :acceptable_exit_codes => (0..255))
+          host.exec(Command.new("bash manage_root_authorized_keys"), :acceptable_exit_codes => (0..255))
         else
-          host.exec(Command.new(ROOT_KEYS_SYNC_CMD % "env PATH=/usr/gnu/bin:$PATH bash"), :acceptable_exit_codes => (0..255))
+          host.exec(Command.new(ROOT_KEYS_SYNC_CMD % "| env PATH=/usr/gnu/bin:$PATH bash"), :acceptable_exit_codes => (0..255))
         end
       end
     rescue => e
@@ -144,10 +155,11 @@ module Beaker
     # @option opts [String] :epel_5_pkg Package to download from provided link for el-5
     # @raise [Exception] Raises an error if the host provided's platform != /el-(5|6)/
     def epel_info_for host, opts
-      version = host['platform'].version
-      if not version
-        raise "epel_info_for not available for #{host.name} on platform #{host['platform']}"
+      if !el_based?(host)
+        raise "epel_info_for! not available for #{host.name} on platform #{host['platform']}"
       end
+
+      version = host['platform'].version
       if version == '6'
         url = "#{host[:epel_url] || opts[:epel_url]}/#{version}"
         pkg = host[:epel_pkg] || opts[:epel_6_pkg]
@@ -160,12 +172,13 @@ module Beaker
       return url, host[:epel_arch] || opts[:epel_arch] || 'i386', pkg
     end
 
-    #Run 'apt-get update' on the provided host or hosts.  If the platform of the provided host is not
-    #ubuntu or debian do nothing.
+    # Run 'apt-get update' on the provided host or hosts.
+    # If the platform of the provided host is not ubuntu, debian or cumulus: do nothing.
+    #
     # @param [Host, Array<Host>] hosts One or more hosts to act upon
     def apt_get_update hosts
       block_on hosts do |host|
-        if host[:platform] =~ /(ubuntu)|(debian)/
+        if host[:platform] =~ /ubuntu|debian|cumulus/
           host.exec(Command.new("apt-get update"))
         end
       end
@@ -185,24 +198,21 @@ module Beaker
       end
     end
 
-    #Alter apt configuration on ubuntu and debian host or hosts to internal Puppet Labs
-    # proxy {HostPrebuiltSteps::APT_CFG} proxy, alter pkg on solaris-11 host or hosts
-    # to point to interal Puppetlabs proxy {HostPrebuiltSteps::IPS_PKG_REPO}. Do nothing
-    # on non-ubuntu, debian or solaris-11 platform host or hosts.
+    # On ubuntu, debian, or cumulus host or hosts: alter apt configuration to use
+    # the internal Puppet Labs proxy {HostPrebuiltSteps::APT_CFG} proxy.
+    # On solaris-11 host or hosts: alter pkg to point to
+    # the internal Puppet Labs proxy {HostPrebuiltSteps::IPS_PKG_REPO}.
+    #
+    # Do nothing for other platform host or hosts.
+    #
     # @param [Host, Array<Host>] 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 proxy_config( host, opts )
-      # repo_proxy
-      # supports ubuntu, debian and solaris platforms
       logger = opts[:logger]
       block_on host do |host|
         case
-        when host['platform'] =~ /ubuntu/
-          host.exec(Command.new("if test -f /etc/apt/apt.conf; then mv /etc/apt/apt.conf /etc/apt/apt.conf.bk; fi"))
-          copy_file_to_remote(host, '/etc/apt/apt.conf', APT_CFG)
-          apt_get_update(host)
-        when host['platform'] =~ /debian/
+        when host['platform'] =~ /ubuntu|debian|cumulus/
           host.exec(Command.new("if test -f /etc/apt/apt.conf; then mv /etc/apt/apt.conf /etc/apt/apt.conf.bk; fi"))
           copy_file_to_remote(host, '/etc/apt/apt.conf', APT_CFG)
           apt_get_update(host)
@@ -234,7 +244,7 @@ module Beaker
       debug_opt = opts[:debug] ? 'vh' : ''
       block_on host do |host|
         case
-        when host['platform'] =~ /el-(5|6)/
+        when el_based?(host) && ['5','6'].include?(host['platform'].version)
           result = host.exec(Command.new('rpm -qa | grep epel-release'), :acceptable_exit_codes => [0,1])
           if result.exit_code == 1
             url, arch, pkg = epel_info_for host, opts
@@ -316,7 +326,10 @@ module Beaker
       end
     end
 
-    #Update sshd_config on debian, ubuntu, centos, el, redhat and fedora boxes to allow for root login, does nothing on other platfoms
+    # Update sshd_config on debian, ubuntu, centos, el, redhat, cumulus, and fedora boxes to allow for root login
+    #
+    # Does nothing on other platfoms.
+    #
     # @param [Host, Array<Host>] 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
@@ -324,13 +337,14 @@ module Beaker
       logger = opts[:logger]
       block_on host do |host|
         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}
-  )
+        # 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}
+        )
         #restart sshd
-        if host['platform'] =~ /debian|ubuntu/
+        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/
-          host.exec(Command.new("sudo su -c \"service sshd restart\""), {:pty => true})
+        elsif host['platform'] =~ /centos|el-|redhat|fedora|eos/
+          host.exec(Command.new("sudo -E service sshd restart"))
         else
           @logger.warn("Attempting to update ssh on non-supported platform: #{host.name}: #{host['platform']}")
         end
@@ -344,7 +358,7 @@ module Beaker
     def disable_se_linux host, opts
       logger = opts[:logger]
       block_on host do |host|
-        if host['platform'] =~ /centos|el-|redhat|fedora/
+        if host['platform'] =~ /centos|el-|redhat|fedora|eos/
           @logger.debug("Disabling se_linux on #{host.name}")
           host.exec(Command.new("sudo su -c \"setenforce 0\""), {:pty => true})
         else
@@ -360,7 +374,7 @@ module Beaker
     def disable_iptables host, opts
       logger = opts[:logger]
       block_on host do |host|
-        if host['platform'] =~ /centos|el-|redhat|fedora/
+        if host['platform'] =~ /centos|el-|redhat|fedora|eos/
           logger.debug("Disabling iptables on #{host.name}")
           host.exec(Command.new("sudo su -c \"/etc/init.d/iptables stop\""), {:pty => true})
         else
@@ -370,7 +384,7 @@ module Beaker
     end
 
     # Setup files for enabling requests to pass to a proxy server
-    # This works for the APT package manager on debian and ubuntu
+    # This works for the APT package manager on debian, ubuntu, and cumulus
     # and YUM package manager on el, centos, fedora and redhat.
     # @param [Host, Array<Host>, String, Symbol] host One or more hosts to act upon
     # @param [Hash{Symbol=>String}] opts Options to alter execution.
@@ -381,9 +395,9 @@ module Beaker
       block_on host do |host|
         logger.debug("enabling proxy support on #{host.name}")
         case host['platform']
-          when /ubuntu/, /debian/
+          when /ubuntu/, /debian/, /cumulus/
             host.exec(Command.new("echo 'Acquire::http::Proxy \"#{opts[:package_proxy]}/\";' >> /etc/apt/apt.conf.d/10proxy"))
-          when /^el-/, /centos/, /fedora/, /redhat/
+          when /^el-/, /centos/, /fedora/, /redhat/, /eos/
             host.exec(Command.new("echo 'proxy=#{opts[:package_proxy]}/' >> /etc/yum.conf"))
         else
           logger.debug("Attempting to enable package manager proxy support on non-supported platform: #{host.name}: #{host['platform']}")
@@ -391,6 +405,128 @@ module Beaker
       end
     end
 
+
+    # Merge the two provided hashes so that an array of values is created from collisions
+    # @param [Hash] h1 The first hash
+    # @param [Hash] h2 The second hash
+    # @return [Hash] A merged hash with arrays of values where collisions between the two hashes occured.
+    # @example
+    #   > h1 = {:PATH=>"/1st/path"}
+    #   > h2 = {:PATH=>"/2nd/path"}
+    #   > additive_hash_merge(h1, h2)
+    #   => {:PATH=>["/1st/path", "/2nd/path"]}
+    def additive_hash_merge h1, h2
+      merged_hash = {}
+      normalized_h2 = h2.inject({}) { |h, (k, v)| h[k.to_s.upcase] = v; h }
+      h1.each_pair do |key, val|
+        normalized_key = key.to_s.upcase
+        if normalized_h2.has_key?(normalized_key)
+          merged_hash[key] = [h1[key], normalized_h2[normalized_key]]
+          merged_hash[key] = merged_hash[key].uniq #remove dupes
+        end
+      end
+      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(/\(/, "\(")
+      host.exec(Command.new("echo \"#{val}\"")).stdout.chomp
+    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
+    # @return [Hash] A hash of environment variables for provided host
+    def construct_env host, opts
+      env = additive_hash_merge(host[:host_env], opts[:host_env])
+
+      #Add PATH and RUBYLIB
+
+      #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) }
+
+      #prepend any RUBYLIB already set for this host
+      env['RUBYLIB'] =  (%w(hieralibdir hierapuppetlibdir pluginlibpath puppetlibdir facterlibdir) << env['RUBYLIB']).compact.reject(&:empty?)
+      #get the RUBYLIB defaults
+      env['RUBYLIB'].map! { |val| host[val] }
+      env['RUBYLIB'] = env['RUBYLIB'].compact.reject(&:empty?)
+      #run the paths through echo to see if they have any subcommands that need processing
+      env['RUBYLIB'].map! { |val| echo_on_host(host, val) }
+
+      env.each_key do |key|
+        env[key] = env[key].join(':')
+      end
+      env
+    end
+
+    # Add a host specific set of env vars to each provided host's ~/.ssh/environment
+    # @param [Host, Array<Host>] host One or more hosts to act upon
+    # @param [Hash{Symbol=>String}] opts Options to alter execution.
+    def set_env host, opts
+      logger = opts[:logger]
+
+      block_on host do |host|
+        env = construct_env(host, opts)
+        logger.debug("setting local environment on #{host.name}")
+        case host['platform']
+        when /windows/
+          host.exec(Command.new("echo 'PermitUserEnvironment yes' >> /etc/sshd_config"))
+          host.exec(Command.new("cygrunsrv -E sshd"))
+          host.exec(Command.new("cygrunsrv -S sshd"))
+          env['CYGWIN'] = 'nodosfilewarning'
+        when /osx/
+          host.exec(Command.new("echo 'PermitUserEnvironment yes' >> /etc/sshd_config"))
+          host.exec(Command.new("launchctl unload /System/Library/LaunchDaemons/ssh.plist"))
+          host.exec(Command.new("launchctl load /System/Library/LaunchDaemons/ssh.plist"))
+        when /debian|ubuntu|cumulus/
+          host.exec(Command.new("echo 'PermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
+          host.exec(Command.new("service ssh restart"))
+        when /el-|centos|fedora|redhat|oracle|scientific|eos/
+          host.exec(Command.new("echo 'PermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
+          host.exec(Command.new("service sshd restart"))
+        when /sles/
+          host.exec(Command.new("echo 'PermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
+          host.exec(Command.new("rcsshd restart"))
+        when /solaris/
+          host.exec(Command.new("echo 'PermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
+          host.exec(Command.new("svcadm restart svc:/network/ssh:default"))
+        when /aix/
+          host.exec(Command.new("echo 'PermitUserEnvironment yes' >> /etc/ssh/sshd_config"))
+          host.exec(Command.new("stopsrc -g ssh"))
+          host.exec(Command.new("startsrc -g ssh"))
+        end
+        #ensure that ~/.ssh/environment exists
+        host.exec(Command.new("touch #{host[:ssh_env_file]}"))
+        #add the constructed env vars to this host
+        host.add_env_var('RUBYLIB', '$RUBYLIB')
+        host.add_env_var('PATH', '$PATH')
+        env.each_pair do |var, value|
+          host.add_env_var(var, value)
+        end
+        #close the host to re-establish the connection with the new sshd settings
+        host.close
+      end
+    end
+
+    private
+
+    # A helper to tell whether a host is el-based
+    # @param [Host] host the host to act upon
+    #
+    # @return [Boolean] if the host is el_based
+    def el_based? host
+      ['centos','redhat','scientific','el','oracle'].include?(host['platform'].variant)
+    end
+
   end
 
 end

data/lib/beaker/hypervisor.rb

@@ -28,8 +28,6 @@ module Beaker
           Beaker::Vsphere
         when /^fusion$/
           Beaker::Fusion
-        when /^blimpy$/
-          Beaker::Blimper
         when /^ec2$/
           Beaker::AwsSdk
         when /^vcloud$/
@@ -40,6 +38,8 @@ module Beaker
           end
         when /^vagrant$/
           Beaker::Vagrant
+        when /^vagrant_libvirt$/
+          Beaker::VagrantLibvirt
         when /^vagrant_virtualbox$/
           Beaker::VagrantVirtualbox
         when /^vagrant_fusion$/
@@ -61,7 +61,7 @@ module Beaker
           rescue LoadError
             raise "Invalid hypervisor: #{type}"
           end
-          const_get("Beaker::#{type.capitalize}")
+          Beaker.const_get(type.capitalize)
         end
 
       hypervisor = hyper_class.new(hosts_to_provision, options)
@@ -85,7 +85,15 @@ module Beaker
       nil
     end
 
-    #Default configuration steps to be run for a given hypervisor
+    #Proxy package managers on tests hosts created by this hypervisor, runs before validation and configuration.
+    def proxy_package_manager
+      if @options[:package_proxy]
+        package_proxy(@hosts, @options)
+      end
+    end
+
+    #Default configuration steps to be run for a given hypervisor.  Any additional configuration to be done
+    #to the provided SUT for test execution to be successful.
     def configure
       if @options[:timesync]
         timesync(@hosts, @options)
@@ -96,15 +104,14 @@ module Beaker
       if @options[:add_el_extras]
         add_el_extras(@hosts, @options)
       end
-      if @options[:package_proxy]
-        package_proxy(@hosts, @options)
-      end
       if @options[:disable_iptables]
         disable_iptables @hosts, @options
       end
+      set_env(@hosts, @options)
     end
 
-    #Default validation steps to be run for a given hypervisor
+    #Default validation steps to be run for a given hypervisor.  Ensures that SUTs meet requirements to be
+    #beaker test nodes.
     def validate
       if @options[:validate]
         validate_host(@hosts, @options)
@@ -119,6 +126,6 @@ module Beaker
   end
 end
 
-[ 'vsphere_helper', 'vagrant', 'vagrant_virtualbox', 'vagrant_fusion', 'vagrant_workstation', 'fusion', 'blimper', 'aws_sdk', 'vsphere', 'vcloud', 'vcloud_pooled', 'aixer', 'solaris', 'docker', 'google_compute', 'openstack' ].each do |lib|
+[ 'vsphere_helper', 'vagrant', 'vagrant_virtualbox', 'vagrant_libvirt', 'vagrant_fusion', 'vagrant_workstation', 'fusion', 'aws_sdk', 'vsphere', 'vcloud', 'vcloud_pooled', 'aixer', 'solaris', 'docker', 'google_compute', 'openstack' ].each do |lib|
     require "beaker/hypervisor/#{lib}"
 end

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -55,6 +55,9 @@ module Beaker
       # Grab the ip addresses and dns from EC2 for each instance to use for ssh
       populate_dns()
 
+      #enable root if user is not root
+      enable_root_on_hosts()
+
       # Set the hostname for each box
       set_hostnames()
 
@@ -88,10 +91,12 @@ module Beaker
       nil #void
     end
 
-    #Print instances to the logger.  Instances will be from all regions associated with provided key name and
-    #limited by regex compared to instance status.  Defaults to running instances.
-    #@param [String] key The key_name to match for
-    #@param [Regex] status The regular expression to match against the instance's status
+    # Print instances to the logger. Instances will be from all regions
+    # associated with provided key name and limited by regex compared to
+    # instance status. Defaults to running instances.
+    #
+    # @param [String] key The key_name to match for
+    # @param [Regex] status The regular expression to match against the instance's status
     def log_instances(key = key_name, status = /running/)
       instances = []
       @ec2.regions.each do |region|
@@ -110,9 +115,11 @@ module Beaker
       @logger.notify("#{output}")
     end
 
-    #Shutdown and destroy ec2 instances idenfitied by key that have been alive longer than ZOMBIE hours.
-    #@param [Integer] max_age The age in hours that a machine needs to be older than to be considered a zombie
-    #@param [String] key The key_name to match for
+    # Shutdown and destroy ec2 instances idenfitied by key that have been alive
+    # longer than ZOMBIE hours.
+    #
+    # @param [Integer] max_age The age in hours that a machine needs to be older than to be considered a zombie
+    # @param [String] key The key_name to match for
     def kill_zombies(max_age = ZOMBIE, key = key_name)
       @logger.notify("aws-sdk: Kill Zombies! (keyname: #{key}, age: #{max_age} hrs)")
       #examine all available regions
@@ -176,6 +183,12 @@ 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
+
+        if vpc_id and !subnet_id
+          raise RuntimeError, "A subnet_id must be provided with a vpc_id"
+        end
 
         # Use snapshot provided for this host
         image_type = host['snapshot']
@@ -188,6 +201,9 @@ module Beaker
         # Main region object for ec2 operations
         region = @ec2.regions[ami_region]
 
+        # Obtain the VPC object if it exists
+        vpc = vpc_id ? region.vpcs[vpc_id] : nil
+
         # Grab image object
         image_id = ami[:image][image_type.to_sym]
         @logger.notify("aws-sdk: Checking image #{image_id} exists and getting its root device")
@@ -220,11 +236,12 @@ module Beaker
           :image_id => image_id,
           :monitoring_enabled => true,
           :key_pair => ensure_key_pair(region),
-          :security_groups => [ensure_group(region, Beaker::EC2Helper.amiports(host['roles']))],
+          :security_groups => [ensure_group(vpc || region, Beaker::EC2Helper.amiports(host))],
           :instance_type => amisize,
           :disable_api_termination => false,
           :instance_initiated_shutdown_behavior => "terminate",
           :block_device_mappings => block_device_mappings,
+          :subnet => subnet_id,
         }
         instance = region.instances.create(config)
 
@@ -273,7 +290,7 @@ module Beaker
       end
     end
 
-    #Add metadata tags to all instances
+    # Add metadata tags to all instances
     #
     # @return [void]
     # @api private
@@ -334,6 +351,29 @@ module Beaker
       end
     end
 
+    # Enables root for instances with custom username like ubuntu-amis
+    #
+    # @return [void]
+    # @api private
+    def enable_root_on_hosts
+      @hosts.each do |host|
+        enable_root(host)
+      end
+    end
+
+    # Enables root access for a host when username is not root
+    #
+    # @return [void]
+    # @api private
+    def enable_root(host)
+      if host['user'] != 'root'
+        copy_ssh_to_root(host, @options)
+        enable_root_login(host, @options)
+        host['user'] = 'root'
+        host.close
+      end
+    end
+
     # Set the hostname of all instances to be the hostname defined in the
     # beaker configuration.
     #
@@ -431,18 +471,20 @@ module Beaker
 
     # Return an existing group, or create new one
     #
-    # @param region [AWS::EC2::Region] the AWS region control object
+    # Accepts a region or VPC as input for checking & creation.
+    #
+    # @param rv [AWS::EC2::Region, AWS::EC2::VPC] the AWS region or vpc control object
     # @param ports [Array<Number>] an array of port numbers
     # @return [AWS::EC2::SecurityGroup] created security group
     # @api private
-    def ensure_group(region, ports)
+    def ensure_group(rv, ports)
       @logger.notify("aws-sdk: Ensure security group exists for ports #{ports.to_s}, create if not")
       name = group_id(ports)
 
-      group = region.security_groups.filter('group-name', name).first
+      group = rv.security_groups.filter('group-name', name).first
 
       if group.nil?
-        group = create_group(region, ports)
+        group = create_group(rv, ports)
       end
 
       group
@@ -450,15 +492,17 @@ module Beaker
 
     # Create a new security group
     #
-    # @param region [AWS::EC2::Region] the AWS region control object
+    # Accepts a region or VPC for group creation.
+    #
+    # @param rv [AWS::EC2::Region, AWS::EC2::VPC] the AWS region or vpc control object
     # @param ports [Array<Number>] an array of port numbers
     # @return [AWS::EC2::SecurityGroup] created security group
     # @api private
-    def create_group(region, ports)
+    def create_group(rv, ports)
       name = group_id(ports)
       @logger.notify("aws-sdk: Creating group #{name} for ports #{ports.to_s}")
-      group = region.security_groups.create(name,
-                                            :description => "Custom Beaker security group for #{ports.to_a}")
+      group = rv.security_groups.create(name,
+                                        :description => "Custom Beaker security group for #{ports.to_a}")
 
       unless ports.is_a? Set
         ports = Set.new(ports)