testlab 1.0.1 → 1.1.0

data/lib/testlab/network/actions.rb

@@ -11,7 +11,7 @@ class TestLab
         (self.state != :not_created) and return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Create', :green)) do
-          self.node.ssh.bootstrap(<<-EOF, :ignore_exit_status => true)
+          self.node.bootstrap(<<-EOF, :ignore_exit_status => true)
 set -x
 grep '#{def_tag}' /etc/network/interfaces && exit 0
 cat <<EOI | tee -a /etc/network/interfaces
@@ -45,7 +45,7 @@ brctl setfd #{self.bridge} 0
         (self.state == :not_created) and return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Destroy', :red)) do
-          self.node.ssh.bootstrap(<<-EOF, :ignore_exit_status => true)
+          self.node.bootstrap(<<-EOF, :ignore_exit_status => true)
 set -x
 sed -i '/#{def_tag}/,/#{end_tag}/d' /etc/network/interfaces
 brctl delbr #{self.bridge}
@@ -65,7 +65,7 @@ brctl delbr #{self.bridge}
         (self.state == :running) and return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Up', :green)) do
-          self.node.ssh.bootstrap(<<-EOF, :ignore_exit_status => true)
+          self.node.bootstrap(<<-EOF, :ignore_exit_status => true)
 set -x
 ifconfig #{self.bridge} #{self.ip} netmask #{self.netmask} broadcast #{self.broadcast} up
           EOF
@@ -84,7 +84,7 @@ ifconfig #{self.bridge} #{self.ip} netmask #{self.netmask} broadcast #{self.broa
         (self.state != :running) and return false
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Down', :red)) do
-          self.node.ssh.bootstrap(<<-EOF, :ignore_exit_status => true)
+          self.node.bootstrap(<<-EOF, :ignore_exit_status => true)
 set -x
 ifconfig #{self.bridge} down
           EOF

data/lib/testlab/network/lifecycle.rb

@@ -3,34 +3,6 @@ class TestLab
 
     module Lifecycle
 
-      # Network Provision
-      def provision
-        @ui.logger.debug { "Network Provision: #{self.id} " }
-
-        (self.node.state != :running) and return false
-        (self.state != :running) and return false
-
-        please_wait(:ui => @ui, :message => format_object_action(self, 'Provision', :green)) do
-          do_provisioner_callbacks(self, :provision, @ui)
-        end
-
-        true
-      end
-
-      # Network Deprovision
-      def deprovision
-        @ui.logger.debug { "Network Deprovision: #{self.id} " }
-
-        (self.node.state != :running) and return false
-        (self.state != :running) and return false
-
-        please_wait(:ui => @ui, :message => format_object_action(self, 'Deprovision', :red)) do
-          do_provisioner_callbacks(self, :deprovision, @ui)
-        end
-
-        true
-      end
-
       # Build the network
       def build
         self.create

data/lib/testlab/network/provision.rb

@@ -0,0 +1,37 @@
+class TestLab
+  class Network
+
+    module Provision
+
+      # Network Provision
+      def provision
+        @ui.logger.debug { "Network Provision: #{self.id} " }
+
+        (self.node.state != :running) and return false
+        (self.state != :running) and return false
+
+        please_wait(:ui => @ui, :message => format_object_action(self, 'Provision', :green)) do
+          do_provisioner_callbacks(self, :provision, @ui)
+        end
+
+        true
+      end
+
+      # Network Deprovision
+      def deprovision
+        @ui.logger.debug { "Network Deprovision: #{self.id} " }
+
+        (self.node.state != :running) and return false
+        (self.state != :running) and return false
+
+        please_wait(:ui => @ui, :message => format_object_action(self, 'Deprovision', :red)) do
+          do_provisioner_callbacks(self, :deprovision, @ui)
+        end
+
+        true
+      end
+
+    end
+
+  end
+end

data/lib/testlab/network/status.rb

@@ -63,11 +63,11 @@ class TestLab
 
       # Network Bridge State
       def state
-        exit_code = self.node.ssh.exec(%(sudo brctl show #{self.bridge} 2>&1 | grep -i 'No such device'), :ignore_exit_status => true).exit_code
+        exit_code = self.node.exec(%(sudo brctl show #{self.bridge} 2>&1 | grep -i 'No such device'), :ignore_exit_status => true).exit_code
         if (exit_code == 0)
           :not_created
         else
-          output = self.node.ssh.exec(%(sudo ifconfig #{self.bridge} 2>&1 | grep 'MTU'), :ignore_exit_status => true).output.strip
+          output = self.node.exec(%(sudo ifconfig #{self.bridge} 2>&1 | grep 'MTU'), :ignore_exit_status => true).output.strip
           if ((output =~ /UP/) || (output =~ /RUNNING/))
             :running
           else

data/lib/testlab/network.rb

@@ -14,11 +14,13 @@ class TestLab
     autoload :Bind,         'testlab/network/bind'
     autoload :ClassMethods, 'testlab/network/class_methods'
     autoload :Lifecycle,    'testlab/network/lifecycle'
+    autoload :Provision,    'testlab/network/provision'
     autoload :Status,       'testlab/network/status'
 
     include TestLab::Network::Actions
     include TestLab::Network::Bind
     include TestLab::Network::Lifecycle
+    include TestLab::Network::Provision
     include TestLab::Network::Status
 
     extend  TestLab::Network::ClassMethods

data/lib/testlab/node/lifecycle.rb

@@ -3,32 +3,6 @@ class TestLab
 
     module Lifecycle
 
-      # Provision the node.
-      def provision
-        @ui.logger.debug { "Node Provision: #{self.id} " }
-
-        (self.state != :running) and return false
-
-        please_wait(:ui => @ui, :message => format_object_action(self, 'Provision', :green)) do
-          do_provisioner_callbacks(self, :provision, @ui)
-        end
-
-        true
-      end
-
-      # Deprovision the node.
-      def deprovision
-        @ui.logger.debug { "Node Deprovision: #{self.id} " }
-
-        (self.state != :running) and return false
-
-        please_wait(:ui => @ui, :message => format_object_action(self, 'Deprovision', :red)) do
-          do_provisioner_callbacks(self, :deprovision, @ui)
-        end
-
-        true
-      end
-
       # Build the node
       def build
         self.create

data/lib/testlab/node/lxc.rb

@@ -4,18 +4,6 @@ class TestLab
     module LXC
       require 'lxc'
 
-      # Node Bootstrap
-      #
-      # Renders the supplied content into a file on the node and proceeds
-      # to execute it on the node as root.
-      #
-      # @param [String] content The content to render on the node and
-      #   execute.  This is generally a bash script of some sort for example.
-      # @return [String] The output of SSH bootstrap.
-      def bootstrap(content, options={})
-        self.ssh.bootstrap(content, options)
-      end
-
       # Returns the LXC object for this Node
       #
       # This object is used to control containers on the node via it's provider
@@ -33,7 +21,7 @@ class TestLab
       #
       # @return [String] The output of 'uname -m'.
       def arch
-        @arch ||= self.ssh.exec(%(uname -m)).output.strip
+        @arch ||= self.exec(%(uname -m)).output.strip
       end
 
     end

data/lib/testlab/node/provision.rb

@@ -0,0 +1,34 @@
+class TestLab
+  class Node
+
+    module Provision
+
+      # Provision the node.
+      def provision
+        @ui.logger.debug { "Node Provision: #{self.id} " }
+
+        (self.state != :running) and return false
+
+        please_wait(:ui => @ui, :message => format_object_action(self, 'Provision', :green)) do
+          do_provisioner_callbacks(self, :provision, @ui)
+        end
+
+        true
+      end
+
+      # Deprovision the node.
+      def deprovision
+        @ui.logger.debug { "Node Deprovision: #{self.id} " }
+
+        (self.state != :running) and return false
+
+        please_wait(:ui => @ui, :message => format_object_action(self, 'Deprovision', :red)) do
+          do_provisioner_callbacks(self, :deprovision, @ui)
+        end
+
+        true
+      end
+
+    end
+  end
+end

data/lib/testlab/node.rb

@@ -15,6 +15,7 @@ class TestLab
     autoload :Lifecycle,     'testlab/node/lifecycle'
     autoload :LXC,           'testlab/node/lxc'
     autoload :MethodMissing, 'testlab/node/method_missing'
+    autoload :Provision,     'testlab/node/provision'
     autoload :SSH,           'testlab/node/ssh'
     autoload :Status,        'testlab/node/status'
 
@@ -22,11 +23,14 @@ class TestLab
     include TestLab::Node::Lifecycle
     include TestLab::Node::LXC
     include TestLab::Node::MethodMissing
+    include TestLab::Node::Provision
     include TestLab::Node::SSH
     include TestLab::Node::Status
 
     extend  TestLab::Node::ClassMethods
 
+    include TestLab::Support::Execution
+
     include TestLab::Utility::Misc
 
     # Associations and Attributes

data/lib/testlab/provisioners/apt.rb

@@ -17,6 +17,7 @@ class TestLab
         @config[:apt] ||= Hash.new
         @config[:apt][:install] ||= Array.new
         @config[:apt][:remove]  ||= Array.new
+        @config[:apt][:purge]   ||= Array.new
 
         @ui.logger.debug { "config(#{@config.inspect})" }
       end

data/lib/testlab/provisioners/apt_cacher_ng.rb

@@ -39,15 +39,15 @@ class TestLab
           }
         }
 
-        node.ssh.file(:target => apt_conf_d_proxy_file, :chown => "root:root", :chmod => "0644") do |file|
+        node.file(:target => apt_conf_d_proxy_file, :chown => "root:root", :chmod => "0644") do |file|
           file.puts(ZTK::Template.render(apt_conf_d_proxy_file_template, context))
         end
 
-        node.ssh.file(:target => apt_cacher_ng_security_conf_file, :chown => "root:root", :chmod => "0644") do |file|
+        node.file(:target => apt_cacher_ng_security_conf_file, :chown => "root:root", :chmod => "0644") do |file|
           file.puts(ZTK::Template.render(apt_cacher_ng_security_conf_template, context))
         end
 
-        node.ssh.exec(%(sudo service apt-cacher-ng restart))
+        node.exec(%(sudo service apt-cacher-ng restart))
 
         true
       end
@@ -75,12 +75,12 @@ class TestLab
 
         @config[:apt][:cacher_ng] = { :proxy_url => "http://#{gateway_ip}:3142" }.merge(@config[:apt][:cacher_ng])
 
-        container.ssh.file(:target => apt_conf_d_proxy_file, :chown => "root:root", :chmod => "0644") do |file|
+        container.file(:target => apt_conf_d_proxy_file, :chown => "root:root", :chmod => "0644") do |file|
           file.puts(ZTK::Template.render(apt_conf_d_proxy_file_template, @config))
         end
 
         # Fix the APT sources since LXC mudges them when using apt-cacher-ng
-        container.ssh.exec(%(sudo sed -i 's/127.0.0.1:3142\\///g' /etc/apt/sources.list))
+        container.exec(%(sudo sed -i 's/127.0.0.1:3142\\///g' /etc/apt/sources.list))
       end
 
     private

data/lib/testlab/provisioners/bind.rb

@@ -15,7 +15,9 @@ class TestLab
         @ui     = (ui     || TestLab.ui)
 
         @config[:bind] ||= Hash.new
-        @config[:bind][:domain] ||= "default.zone"
+        @config[:bind][:domain]     ||= "tld.invalid"
+        @config[:bind][:forwarders] ||= %w(8.8.8.8 8.8.4.4)
+
 
         @ui.logger.debug { "config(#{@config.inspect})" }
       end
@@ -37,7 +39,21 @@ class TestLab
       # @param [TestLab::Node] node The node which we want to deprovision.
       # @return [Boolean] True if successful.
       def on_node_deprovision(node)
-        node.ssh.exec(%(DEBIAN_FRONTEND="noninteractive" sudo apt-get -y purge bind9))
+        @ui.logger.debug { "BIND Deprovisioner: Node #{node.id}" }
+
+        node.exec(%(sudo DEBIAN_FRONTEND="noninteractive" apt-get -y purge bind9))
+
+        true
+      end
+
+      # Bind: Container Up
+      #
+      # @param [TestLab::Node] node The container which just came online.
+      # @return [Boolean] True if successful.
+      def on_container_up(container)
+        @ui.logger.debug { "BIND Provisioner: Container #{container.id}" }
+
+        bind_reload(container.node)
 
         true
       end
@@ -53,13 +69,14 @@ class TestLab
 
         true
       end
+      alias :on_network_create :on_network_up
 
       # Builds the main bind configuration sections
       def build_bind_main_partial(file)
         bind_conf_template = File.join(TestLab::Provisioner.template_dir, "bind", "bind.erb")
 
         file.puts(ZTK::Template.do_not_edit_notice(:message => "TestLab v#{TestLab::VERSION} BIND Configuration", :char => '//'))
-        file.puts(ZTK::Template.render(bind_conf_template, {}))
+        file.puts(ZTK::Template.render(bind_conf_template, @config))
       end
 
       def build_bind_records
@@ -82,7 +99,7 @@ class TestLab
       end
 
       # Builds the bind configuration sections for our zones
-      def build_bind_zone_partial(ssh, file)
+      def build_bind_zone_partial(node, file)
         bind_zone_template = File.join(TestLab::Provisioner.template_dir, "bind", 'bind-zone.erb')
 
         bind_records = build_bind_records
@@ -97,7 +114,7 @@ class TestLab
           file.puts
           file.puts(ZTK::Template.render(bind_zone_template, context))
 
-          build_bind_db(ssh, network.arpa, reverse_records[network.id])
+          build_bind_db(node, network.arpa, reverse_records[network.id])
         end
 
         TestLab::Container.domains.each do |domain|
@@ -108,40 +125,40 @@ class TestLab
           file.puts
           file.puts(ZTK::Template.render(bind_zone_template, context))
 
-          build_bind_db(ssh, domain, forward_records[domain])
+          build_bind_db(node, domain, forward_records[domain])
         end
       end
 
-      def build_bind_db(ssh, zone, records)
+      def build_bind_db(node, zone, records)
         bind_db_template = File.join(TestLab::Provisioner.template_dir, "bind", 'bind-db.erb')
 
-        ssh.file(:target => %(/etc/bind/db.#{zone}), :chown => "bind:bind") do |file|
+        node.file(:target => %(/etc/bind/db.#{zone}), :chown => "bind:bind") do |file|
           file.puts(ZTK::Template.do_not_edit_notice(:message => "TestLab v#{TestLab::VERSION} BIND DB: #{zone}", :char => ';'))
           file.puts(ZTK::Template.render(bind_db_template, { :zone => zone, :records => records }))
         end
       end
 
       # Builds the BIND configuration
-      def build_bind_conf(ssh)
-        ssh.file(:target => %(/etc/bind/named.conf), :chown => "bind:bind") do |file|
+      def build_bind_conf(node)
+        node.file(:target => %(/etc/bind/named.conf), :chown => "bind:bind") do |file|
           build_bind_main_partial(file)
-          build_bind_zone_partial(ssh, file)
+          build_bind_zone_partial(node, file)
         end
       end
 
-      def bind_install(ssh)
-        ssh.exec(%(DEBIAN_FRONTEND="noninteractive" sudo apt-get -y install bind9))
-        ssh.exec(%(sudo rm -fv /etc/bind/{*.arpa,*.zone,*.conf*}))
+      def bind_install(node)
+        node.exec(%(sudo DEBIAN_FRONTEND="noninteractive" apt-get -y install bind9))
+        node.exec(%(sudo rm -fv /etc/bind/{*.arpa,*.zone,*.conf*}))
       end
 
       def bind_reload(node)
-        node.ssh.exec(%(sudo chown -Rv bind:bind /etc/bind))
-        node.ssh.exec(%(sudo rndc reload))
+        node.exec(%(sudo chown -Rv bind:bind /etc/bind))
+        node.exec(%(sudo rndc reload))
       end
 
       def bind_provision(node)
-        bind_install(node.ssh)
-        build_bind_conf(node.ssh)
+        bind_install(node)
+        build_bind_conf(node)
         bind_reload(node)
       end
 

data/lib/testlab/provisioners/chef/omni_bus.rb

@@ -59,8 +59,8 @@ class TestLab
         # @return [Boolean] True if successful.
         def on_container_deprovision(container)
           if @chef_server.state == :running
-            @chef_server.ssh.exec(%(knife node delete #{container.id} --yes), :ignore_exit_status => true)
-            @chef_server.ssh.exec(%(knife client delete #{container.id} --yes), :ignore_exit_status => true)
+            @chef_server.exec(%(knife node delete #{container.id} --yes), :ignore_exit_status => true)
+            @chef_server.exec(%(knife client delete #{container.id} --yes), :ignore_exit_status => true)
           end
 
           true
@@ -94,7 +94,7 @@ node_name               #{@config[:chef][:client][:node_name].inspect}
         end
 
         def validation_pem
-          @chef_server.ssh.exec(%((cat ~/.chef/validation.pem || cat ~/.chef/chef-validator.pem) 2> /dev/null)).output.strip
+          @chef_server.exec(%((cat ~/.chef/validation.pem || cat ~/.chef/chef-validator.pem) 2> /dev/null)).output.strip
         end
 
       end

data/lib/testlab/provisioners/chef/ruby_gem_client.rb

@@ -60,8 +60,8 @@ class TestLab
         # @return [Boolean] True if successful.
         def on_container_deprovision(container)
           if @chef_server.state == :running
-            @chef_server.ssh.exec(%(knife node delete #{container.id} --yes), :ignore_exit_status => true)
-            @chef_server.ssh.exec(%(knife client delete #{container.id} --yes), :ignore_exit_status => true)
+            @chef_server.exec(%(knife node delete #{container.id} --yes), :ignore_exit_status => true)
+            @chef_server.exec(%(knife client delete #{container.id} --yes), :ignore_exit_status => true)
           end
 
           true
@@ -95,7 +95,7 @@ node_name               #{@config[:chef][:client][:node_name].inspect}
         end
 
         def validation_pem
-          @chef_server.ssh.exec(%((cat ~/.chef/validation.pem || cat ~/.chef/chef-validator.pem) 2> /dev/null)).output.strip
+          @chef_server.exec(%((cat ~/.chef/validation.pem || cat ~/.chef/chef-validator.pem) 2> /dev/null)).output.strip
         end
 
       end

data/lib/testlab/provisioners/resolv.rb

@@ -15,8 +15,12 @@ class TestLab
         @ui     = (ui     || TestLab.ui)
 
         @config[:resolv] ||= Hash.new
-        @config[:resolv][:servers] ||= [TestLab::Network.ips, '8.8.8.8', '8.8.4.4'].flatten.compact.uniq
-        @config[:resolv][:search]  ||= TestLab::Container.domains.join(' ')
+
+        @config[:resolv][:servers] ||= Array.new
+        @config[:resolv][:servers].concat([TestLab::Network.ips])
+
+        @config[:resolv][:search] ||= Array.new
+        @config[:resolv][:search].concat([TestLab::Container.domains])
 
         @ui.logger.debug { "config(#{@config.inspect})" }
       end
@@ -28,7 +32,7 @@ class TestLab
       def on_node_provision(node)
         @ui.logger.debug { "RESOLV Provisioner: Node #{node.id}" }
 
-        @config[:resolv][:servers] = ['127.0.0.1', '8.8.8.8', '8.8.4.4']
+        @config[:resolv][:servers] = %w(127.0.0.1)
 
         render_resolv_conf(node)
 
@@ -49,14 +53,18 @@ class TestLab
       end
 
       def render_resolv_conf(object)
-        resolv_conf_template = File.join(TestLab::Provisioner.template_dir, "resolv", "resolv.conf.erb")
-
-        object.ssh.file(:target => %(/etc/resolv.conf), :chown => "root:root") do |file|
+        object.file(:target => %(/etc/resolv.conf), :chown => "root:root") do |file|
           file.puts(ZTK::Template.do_not_edit_notice(:message => "TestLab v#{TestLab::VERSION} RESOLVER Configuration"))
           file.puts(ZTK::Template.render(resolv_conf_template, @config))
         end
       end
 
+    private
+
+      def resolv_conf_template
+        File.join(TestLab::Provisioner.template_dir, 'resolv', 'resolv.conf.erb')
+      end
+
     end
 
   end

data/lib/testlab/provisioners/route.rb

@@ -9,6 +9,7 @@ class TestLab
     #
     # @author Zachary Patten <zachary AT jovelabs DOT com>
     class Route
+      include TestLab::Utility::Misc
 
       def initialize(config={}, ui=nil)
         @config = (config || Hash.new)
@@ -35,15 +36,17 @@ class TestLab
       end
       alias :on_network_down :on_network_deprovision
 
+    private
+
       def manage_route(action, network)
         command = ZTK::Command.new(:ui => @ui, :silence => true, :ignore_exit_status => true)
 
         case RUBY_PLATFORM
         when /darwin/ then
           action = ((action == :del) ? :delete : :add)
-          command.exec(%(sudo route #{action} -net #{TestLab::Utility.network(network.address)} #{network.node.ip} #{TestLab::Utility.netmask(network.address)}))
+          command.exec(%(#{sudo} route #{action} -net #{TestLab::Utility.network(network.address)} #{network.node.ip} #{TestLab::Utility.netmask(network.address)}))
         when /linux/ then
-          command.exec(%(sudo route #{action} -net #{TestLab::Utility.network(network.address)} netmask #{TestLab::Utility.netmask(network.address)} gw #{network.node.ip}))
+          command.exec(%(#{sudo} route #{action} -net #{TestLab::Utility.network(network.address)} netmask #{TestLab::Utility.netmask(network.address)} gw #{network.node.ip}))
         end
       end
 

data/lib/testlab/provisioners/templates/apt/provision.erb

@@ -12,5 +12,8 @@ apt-get -y install <%= @apt[:install].flatten.compact.join(' ') %>
 <% if !@apt[:remove].nil? -%>
 apt-get -y remove <%= @apt[:remove].flatten.compact.join(' ') %>
 <% end -%>
+<% if !@apt[:purge].nil? -%>
+apt-get -y purge <%= @apt[:purge].flatten.compact.join(' ') %>
+<% end -%>
 
 touch /.testlab-apt-provision

data/lib/testlab/provisioners/templates/bind/bind.erb

@@ -10,11 +10,14 @@ options {
   // Uncomment the following block, and insert the addresses replacing
   // the all-0's placeholder.
 
+<% if !@bind[:forwarders].nil? -%>
   forwarders {
-    8.8.8.8;
-    8.8.4.4;
+<% @bind[:forwarders].flatten.compact.uniq.each do |forwarder| -%>
+    <%= forwarder %>;
+<% end -%>
   };
 
+<% end -%>
   //========================================================================
   // If BIND logs error messages about the root key being expired,
   // you will need to update your keys.  See https://www.isc.org/bind-keys

data/lib/testlab/provisioners/templates/raring/provision.erb

@@ -1,24 +1,27 @@
 set -x
 set -e
 
-export DEBIAN_FRONTEND="noninteractive"
+[[ -f /.testlab-raring-provision ]] && exit 0
 
-if [ ! -f /.testlab-raring-provision ]; then
-  # Update APT and ensure our required packages are installed
-  apt-get -y update
-  apt-get -y install lxc bridge-utils debootstrap yum iptables ntpdate ntp pbzip2
+export DEBIAN_FRONTEND="noninteractive"
 
-  touch /.testlab-raring-provision
-fi
+# Update APT and ensure our required packages are installed
+apt-get -y update
+apt-get -y install lxc bridge-utils debootstrap yum iptables iptables-persistent ntpdate ntp pbzip2
 
 # Ensure the default lxc networking services are off
 service lxc-net stop || (service lxc-net start ; service lxc-net stop)
+echo "manual" | tee /etc/init/lxc-net.override
 
 # Ensure NTP services are enabled and running
 service ntp restart || service ntp start
 
-# Enable ipv4 forwarding
-(sysctl net.ipv4.ip_forward | grep "net.ipv4.ip_forward = 1") || sysctl -w net.ipv4.ip_forward=1
+# Enable IPv4 forwarding
+sed -i 's/#net.ipv4.ip_forward=1/net.ipv4.ip_forward=1/' /etc/sysctl.conf
+sysctl -w net.ipv4.ip_forward=1
 
 # Install an iptable NAT rule
-(iptables -t nat --list -v | grep "MASQUERADE  all  --  any    eth0    anywhere             anywhere") || iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
+iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
+iptables-save | tee /etc/iptables/rules.v4
+
+touch /.testlab-raring-provision

data/lib/testlab/provisioners/templates/resolv/resolv.conf.erb

@@ -2,8 +2,10 @@
 domain <%= @resolv[:domain] %>
 <% end -%>
 <% if !@resolv[:search].nil? -%>
-search <%= @resolv[:search] %>
+search <%= @resolv[:search].flatten.compact.uniq.join(' ') %>
 <% end -%>
-<% @resolv[:servers].each do |server| -%>
+<% if !@resolv[:servers].nil? -%>
+<% @resolv[:servers].flatten.compact.uniq.each do |server| -%>
 nameserver <%= server %>
 <% end -%>
+<% end -%>

data/lib/testlab/support/execution.rb

@@ -0,0 +1,46 @@
+class TestLab
+  module Support
+
+    # Execution Support Module
+    #
+    # @author Zachary Patten <zachary AT jovelabs DOT com>
+    module Execution
+
+      # Bootstrap
+      #
+      # Renders the supplied content into a file over the SSH connection and
+      # executes it as the 'root' user.
+      def bootstrap(content, options={})
+        ssh.bootstrap(content, options)
+      end
+
+      # Execute
+      #
+      # Executes the supplied command over the SSH connection.
+      def exec(command, options={})
+        ssh.exec(command, options)
+      end
+
+      # File
+      #
+      # Renders the supplied file over the SSH connection.
+      def file(options={}, &block)
+        ssh.file(options, &block)
+      end
+
+      # Uploads
+      #
+      # Uploads the supplied file over the SSH connection.
+      def upload(local, remote, options={})
+        ssh.upload(local, remote, options)
+      end
+
+      # Download
+      def download(remote, local, options={})
+        ssh.download(remote, local, options)
+      end
+
+    end
+
+  end
+end