testlab 1.0.0 → 1.0.1

data/lib/testlab/container/lxc.rb

@@ -8,15 +8,9 @@ class TestLab
       # Renders the supplied content into a file on the container and proceeds
       # to execute it on the container as root.
       #
-      # On rare occasion it appears that the container will wipe '/tmp' after
-      # the bootstrap script is seeded but before it is executed via lxc-attach.
-      # This results in a 'No such file or directory' bash error when attempting
-      # to execute the script.  We allow 5 retries to seed the bootstrap script
-      # after which time the exception will be thrown and execution halted.
-      #
       # @param [String] content The content to render on the container and
       #   execute.  This is generally a bash script of some sort for example.
-      # @return [String] The output of *lxc-attach*.
+      # @return [String] The output of respective SSH/LXC bootstrap.
       def bootstrap(content, options={})
         if self.lxc_clone.exists?
           self.ssh.bootstrap(content, options)

data/lib/testlab/node/lxc.rb

@@ -4,6 +4,18 @@ 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

data/lib/testlab/provisioners/apt.rb

@@ -29,8 +29,13 @@ class TestLab
       def on_container_provision(container)
         @ui.logger.debug { "APT Provisioner: Container #{container.id}" }
 
-        bootstrap_template = File.join(TestLab::Provisioner.template_dir, "apt", "bootstrap.erb")
-        container.ssh.bootstrap(ZTK::Template.render(bootstrap_template, @config))
+        container.bootstrap(ZTK::Template.render(provision_template, @config))
+      end
+
+    private
+
+      def provision_template
+        File.join(TestLab::Provisioner.template_dir, 'apt', 'provision.erb')
       end
 
     end

data/lib/testlab/provisioners/apt_cacher_ng.rb

@@ -18,9 +18,6 @@ class TestLab
         @config[:apt][:cacher_ng] ||= Hash.new
         @config[:apt][:cacher_ng][:exclude_hosts] ||= Array.new
 
-        @apt_conf_d_proxy_file_template = File.join(TestLab::Provisioner.template_dir, "apt_cacher_ng", "00proxy.erb")
-        @apt_cacher_ng_security_conf_template = File.join(TestLab::Provisioner.template_dir, "apt_cacher_ng", "security.conf.erb")
-
         @ui.logger.debug { "config(#{@config.inspect})" }
       end
 
@@ -31,8 +28,7 @@ class TestLab
       def on_node_provision(node)
         @ui.logger.debug { "APT-CacherNG Provisioner: Node #{node.id}" }
 
-        bootstrap_template = File.join(TestLab::Provisioner.template_dir, "apt_cacher_ng", "bootstrap.erb")
-        node.ssh.bootstrap(ZTK::Template.render(bootstrap_template, @config))
+        node.bootstrap(ZTK::Template.render(provision_template, @config))
 
         context = {
           :apt => {
@@ -43,14 +39,12 @@ class TestLab
           }
         }
 
-        apt_conf_d_proxy_file = %(/etc/apt/apt.conf.d/00proxy)
         node.ssh.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))
+          file.puts(ZTK::Template.render(apt_conf_d_proxy_file_template, context))
         end
 
-        apt_cacher_ng_security_conf_file = %(/etc/apt-cacher-ng/security.conf)
         node.ssh.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))
+          file.puts(ZTK::Template.render(apt_cacher_ng_security_conf_template, context))
         end
 
         node.ssh.exec(%(sudo service apt-cacher-ng restart))
@@ -58,6 +52,16 @@ class TestLab
         true
       end
 
+      # APT-CacherNG: Node Deprovision
+      #
+      # @param [TestLab::Node] node The node which we want to deprovision.
+      # @return [Boolean] True if successful.
+      def on_node_deprovision(node)
+        node.bootstrap(ZTK::Template.render(deprovision_template, @config))
+
+        true
+      end
+
       # APT-CacherNG: Container Provision
       #
       # @param [TestLab::Container] container The container which we want to
@@ -68,17 +72,41 @@ class TestLab
 
         # Ensure the container APT calls use apt-cacher-ng on the node
         gateway_ip                     = container.primary_interface.network.ip
-        apt_conf_d_proxy_file          = %(/etc/apt/apt.conf.d/00proxy)
 
         @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|
-          file.puts(ZTK::Template.render(@apt_conf_d_proxy_file_template, @config))
+          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
-        apt_conf_sources_file = %(/etc/apt/sources.list)
-        container.ssh.exec(%(sudo sed -i 's/127.0.0.1:3142\\///g' #{apt_conf_sources_file}))
+        container.ssh.exec(%(sudo sed -i 's/127.0.0.1:3142\\///g' /etc/apt/sources.list))
+      end
+
+    private
+
+      def apt_conf_d_proxy_file
+        %(/etc/apt/apt.conf.d/00proxy)
+      end
+
+      def apt_cacher_ng_security_conf_file
+        %(/etc/apt-cacher-ng/security.conf)
+      end
+
+      def apt_conf_d_proxy_file_template
+        File.join(TestLab::Provisioner.template_dir, "apt_cacher_ng", "00proxy.erb")
+      end
+
+      def apt_cacher_ng_security_conf_template
+        File.join(TestLab::Provisioner.template_dir, "apt_cacher_ng", "security.conf.erb")
+      end
+
+      def provision_template
+        File.join(TestLab::Provisioner.template_dir, 'apt_cacher_ng', 'provision.erb')
+      end
+
+      def deprovision_template
+        File.join(TestLab::Provisioner.template_dir, 'apt_cacher_ng', 'deprovision.erb')
       end
 
     end

data/lib/testlab/provisioners/bind.rb

@@ -32,6 +32,16 @@ class TestLab
         true
       end
 
+      # Bind: Node Deprovision
+      #
+      # @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))
+
+        true
+      end
+
       # Bind: Network Up
       #
       # @param [TestLab::Network] network The network that is being onlined.
@@ -120,7 +130,7 @@ class TestLab
       end
 
       def bind_install(ssh)
-        ssh.exec(%(sudo apt-get -y install bind9))
+        ssh.exec(%(DEBIAN_FRONTEND="noninteractive" sudo apt-get -y install bind9))
         ssh.exec(%(sudo rm -fv /etc/bind/{*.arpa,*.zone,*.conf*}))
       end
 

data/lib/testlab/provisioners/raring.rb

@@ -27,8 +27,14 @@ class TestLab
       def on_node_provision(node)
         @ui.logger.debug { "Ubuntu Raring Provisioner: Node #{node.id}" }
 
-        bootstrap_template = File.join(TestLab::Provisioner.template_dir, "raring", "bootstrap.erb")
-        node.ssh.bootstrap(ZTK::Template.render(bootstrap_template, @config))
+        node.bootstrap(ZTK::Template.render(provision_template, @config))
+      end
+      alias :on_node_up :on_node_provision
+
+    private
+
+      def provision_template
+        File.join(TestLab::Provisioner.template_dir, 'raring', 'provision.erb')
       end
 
     end

data/lib/testlab/provisioners/route.rb

@@ -25,6 +25,7 @@ class TestLab
 
         true
       end
+      alias :on_network_up :on_network_provision
 
       # Route: Network Deprovision
       def on_network_deprovision(network)
@@ -32,6 +33,7 @@ class TestLab
 
         true
       end
+      alias :on_network_down :on_network_deprovision
 
       def manage_route(action, network)
         command = ZTK::Command.new(:ui => @ui, :silence => true, :ignore_exit_status => true)

data/lib/testlab/provisioners/templates/apt_cacher_ng/deprovision.erb

@@ -0,0 +1,6 @@
+set -x
+set -e
+
+export DEBIAN_FRONTEND="noninteractive"
+
+apt-get -y purge apt-cacher-ng

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

@@ -0,0 +1,12 @@
+set -x
+set -e
+
+[[ -f /.testlab-apt-cacher-ng-provision ]] && exit 0
+
+export DEBIAN_FRONTEND="noninteractive"
+
+apt-get -y install apt-cacher-ng
+service apt-cacher-ng restart || service apt-cacher-ng start
+grep "^MIRROR" /etc/default/lxc || (echo 'MIRROR="http://127.0.0.1:3142/archive.ubuntu.com/ubuntu"' | tee -a /etc/default/lxc)
+
+touch /.testlab-apt-cacher-ng-provision

data/lib/testlab/provisioners/templates/raring/{bootstrap.erb → provision.erb}

@@ -18,7 +18,7 @@ service lxc-net stop || (service lxc-net start ; service lxc-net stop)
 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
+(sysctl net.ipv4.ip_forward | grep "net.ipv4.ip_forward = 1") || 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 --list -v | grep "MASQUERADE  all  --  any    eth0    anywhere             anywhere") || iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE

data/lib/testlab/version.rb

@@ -1,6 +1,6 @@
 class TestLab
   unless const_defined?(:VERSION)
     # TestLab Gem Version
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -284,9 +284,10 @@ files:
 - lib/testlab/provisioners/resolv.rb
 - lib/testlab/provisioners/route.rb
 - lib/testlab/provisioners/shell.rb
-- lib/testlab/provisioners/templates/apt/bootstrap.erb
+- lib/testlab/provisioners/templates/apt/provision.erb
 - lib/testlab/provisioners/templates/apt_cacher_ng/00proxy.erb
-- lib/testlab/provisioners/templates/apt_cacher_ng/bootstrap.erb
+- lib/testlab/provisioners/templates/apt_cacher_ng/deprovision.erb
+- lib/testlab/provisioners/templates/apt_cacher_ng/provision.erb
 - lib/testlab/provisioners/templates/apt_cacher_ng/security.conf.erb
 - lib/testlab/provisioners/templates/bind/bind-db.erb
 - lib/testlab/provisioners/templates/bind/bind-zone.erb
@@ -295,7 +296,7 @@ files:
 - lib/testlab/provisioners/templates/chef/omni_truck.erb
 - lib/testlab/provisioners/templates/chef/ruby_gem_client.erb
 - lib/testlab/provisioners/templates/chef/ruby_gem_server.erb
-- lib/testlab/provisioners/templates/raring/bootstrap.erb
+- lib/testlab/provisioners/templates/raring/provision.erb
 - lib/testlab/provisioners/templates/resolv/resolv.conf.erb
 - lib/testlab/user.rb
 - lib/testlab/user/lifecycle.rb
@@ -332,7 +333,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4468279295087134630
+      hash: 2056415191929520166
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -341,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4468279295087134630
+      hash: 2056415191929520166
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/lib/testlab/provisioners/templates/apt_cacher_ng/bootstrap.erb

@@ -1,8 +0,0 @@
-set -x
-set -e
-
-export DEBIAN_FRONTEND="noninteractive"
-
-apt-get -y install apt-cacher-ng
-service apt-cacher-ng restart || service apt-cacher-ng start
-grep "^MIRROR" /etc/default/lxc || echo 'MIRROR="http://127.0.0.1:3142/archive.ubuntu.com/ubuntu"' | tee -a /etc/default/lxc