testlab 1.2.3 → 1.3.0

data/README.md

@@ -280,7 +280,7 @@ For more information see the TestLab Documentation, `testlab-repo`, command-line
 
 # EXAMPLE USE
 
-* See the `testlab-repo` - https://github.com/zpatten/testlab-repo
+* See the `testlab-repo` - https://github.com/lookout/testlab-repo
 
 # RUBIES TESTED AGAINST
 
@@ -298,15 +298,15 @@ IRC:
 
 Documentation:
 
-* http://zpatten.github.io/testlab/
+* http://lookout.github.io/testlab/
 
 Source:
 
-* https://github.com/zpatten/testlab
+* https://github.com/lookout/testlab
 
 Issues:
 
-* https://github.com/zpatten/testlab/issues
+* https://github.com/lookout/testlab/issues
 
 # LICENSE
 

data/features/support/Labfile.vagrant

@@ -57,6 +57,13 @@ node 'vagrant' do
       address     '10.128.0.254/16'
       mac         '00:00:5e:63:b5:9f'
     end
+
+    interface do
+      network_id  'labnet'
+      name        'eth1'
+      address     '10.128.0.253/16'
+      mac         '00:00:5e:63:b5:9e'
+    end
   end
 
 end

data/lib/testlab/container/configuration.rb

@@ -53,7 +53,7 @@ class TestLab
             'lxc.network.hwaddr' => interface.mac,
             'lxc.network.ipv4'   => "#{interface.ip}/#{interface.cidr} #{interface.netmask}"
           ]
-          if (interface.primary == true) || (interfaces.count == 1)
+          if (self.primary_interface == interface)
             networks.last.merge!('lxc.network.ipv4.gateway' => :auto)
           end
         end

data/lib/testlab/provisioners/apt_cacher_ng.rb

@@ -43,6 +43,7 @@ class TestLab
           file.puts(ZTK::Template.render(apt_conf_d_proxy_file_template, context))
         end
 
+        node.exec(%(sudo mkdir -pv #{File.dirname(apt_cacher_ng_security_conf_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
@@ -52,16 +53,6 @@ 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
@@ -94,21 +85,17 @@ class TestLab
       end
 
       def apt_conf_d_proxy_file_template
-        File.join(TestLab::Provisioner.template_dir, "apt_cacher_ng", "00proxy.erb")
+        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")
+        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
 
   end

data/lib/testlab/provisioners/bind.rb

@@ -18,7 +18,6 @@ class TestLab
         @config[:bind][:domain]     ||= "tld.invalid"
         @config[:bind][:forwarders] ||= %w(8.8.8.8 8.8.4.4)
 
-
         @ui.logger.debug { "config(#{@config.inspect})" }
       end
 
@@ -34,18 +33,6 @@ 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)
-        @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::Container] container The container which just came online.

data/lib/testlab/provisioners/resolv.rb

@@ -17,10 +17,10 @@ class TestLab
         @config[:resolv] ||= Hash.new
 
         @config[:resolv][:servers] ||= Array.new
-        @config[:resolv][:servers].concat([TestLab::Network.ips])
+        @config[:resolv][:servers].unshift([TestLab::Network.ips]).flatten!
 
         @config[:resolv][:search] ||= Array.new
-        @config[:resolv][:search].concat([TestLab::Container.domains])
+        @config[:resolv][:search].unshift([TestLab::Container.domains]).flatten!
 
         @ui.logger.debug { "config(#{@config.inspect})" }
       end
@@ -32,9 +32,12 @@ class TestLab
       def on_node_provision(node)
         @ui.logger.debug { "RESOLV Provisioner: Node #{node.id}" }
 
-        @config[:resolv][:servers] = %w(127.0.0.1)
+        @config[:resolv].merge!(
+          :servers => %w(127.0.0.1),
+          :object => :node
+        )
 
-        render_resolv_conf(node)
+        node.bootstrap(ZTK::Template.render(provision_template, @config))
 
         true
       end
@@ -48,22 +51,19 @@ class TestLab
       def on_container_provision(container)
         @ui.logger.debug { "RESOLV Provisioner: Container #{container.id}" }
 
-        render_resolv_conf(container)
+        @config[:resolv].merge!(
+          :object => :container
+        )
 
-        true
-      end
+        container.bootstrap(ZTK::Template.render(provision_template, @config))
 
-      def render_resolv_conf(object)
-        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
+        true
       end
 
     private
 
-      def resolv_conf_template
-        File.join(TestLab::Provisioner.template_dir, 'resolv', 'resolv.conf.erb')
+      def provision_template
+        File.join(TestLab::Provisioner.template_dir, 'resolv', 'provision.erb')
       end
 
     end

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

@@ -1,19 +1,24 @@
 set -x
 set -e
 
-[[ -f /.testlab-apt-provision ]] && exit 0
-
 export DEBIAN_FRONTEND="noninteractive"
 
 apt-get -y update
+
 <% if !@apt[:install].nil? -%>
-apt-get -y install <%= @apt[:install].flatten.compact.join(' ') %>
+<% @apt[:install].flatten.compact.each do |package| -%>
+dpkg --status <%= package %> &> /dev/null || apt-get -y install <%= package %>
 <% end -%>
+<% end -%>
+
 <% if !@apt[:remove].nil? -%>
-apt-get -y remove <%= @apt[:remove].flatten.compact.join(' ') %>
+<% @apt[:remove].flatten.compact.each do |package| -%>
+dpkg --status <%= package %> &> /dev/null && apt-get -y remove <%= package %>
 <% end -%>
-<% if !@apt[:purge].nil? -%>
-apt-get -y purge <%= @apt[:purge].flatten.compact.join(' ') %>
 <% end -%>
 
-touch /.testlab-apt-provision
+<% if !@apt[:purge].nil? -%>
+<% @apt[:purge].flatten.compact.each do |package| -%>
+dpkg --status <%= package %> &> /dev/null && apt-get -y purge <%= package %>
+<% end -%>
+<% end -%>

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

@@ -1,12 +1,10 @@
 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
+if ! dpkg --status apt-cacher-ng &> /dev/null; then
+  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)
+fi

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

@@ -1,13 +1,13 @@
 set -x
 set -e
 
-[[ -f /.testlab-raring-provision ]] && exit 0
-
 export DEBIAN_FRONTEND="noninteractive"
 
 # 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
+<% %w(lxc bridge-utils debootstrap yum iptables iptables-persistent ntpdate ntp pbzip2).each do |package| -%>
+dpkg --status <%= package %> &> /dev/null || apt-get -y install <%= package %>
+<% end -%>
 
 # Ensure the default lxc networking services are off
 service lxc-net stop || (service lxc-net start ; service lxc-net stop)
@@ -21,7 +21,8 @@ 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 -A POSTROUTING -o eth0 -j MASQUERADE
-iptables-save | tee /etc/iptables/rules.v4
 
-touch /.testlab-raring-provision
+if ! iptables -t nat -v --list | grep "MASQUERADE"; then
+  iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
+  iptables-save | tee /etc/iptables/rules.v4
+fi

data/lib/testlab/provisioners/templates/resolv/{resolv.conf.erb → provision.erb}

@@ -1,3 +1,10 @@
+set -x
+
+dpkg --status bind9 &> /dev/null || <%= (@resolv[:object] == :container).inspect %>
+
+if [ $? -eq 0 ]; then
+  cat << EOF | tee /etc/resolv.conf
+<%= ZTK::Template.do_not_edit_notice(:message => "TestLab Resolv Provisioner") %>
 <% if !@resolv[:domain].nil? -%>
 domain <%= @resolv[:domain] %>
 <% end -%>
@@ -9,3 +16,5 @@ search <%= @resolv[:search].flatten.compact.uniq.join(' ') %>
 nameserver <%= server %>
 <% end -%>
 <% end -%>
+EOF
+fi

data/lib/testlab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -289,7 +289,6 @@ files:
 - lib/testlab/provisioners/shell.rb
 - lib/testlab/provisioners/templates/apt/provision.erb
 - lib/testlab/provisioners/templates/apt_cacher_ng/00proxy.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
@@ -300,7 +299,7 @@ files:
 - lib/testlab/provisioners/templates/chef/ruby_gem_client.erb
 - lib/testlab/provisioners/templates/chef/ruby_gem_server.erb
 - lib/testlab/provisioners/templates/raring/provision.erb
-- lib/testlab/provisioners/templates/resolv/resolv.conf.erb
+- lib/testlab/provisioners/templates/resolv/provision.erb
 - lib/testlab/support.rb
 - lib/testlab/support/execution.rb
 - lib/testlab/support/lifecycle.rb
@@ -339,7 +338,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -283213225295333817
+      hash: -2931685983354543503
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -348,7 +347,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -283213225295333817
+      hash: -2931685983354543503
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

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

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