testlab 1.2.1 → 1.2.2

data/lib/commands/network.rb

@@ -54,7 +54,7 @@ EOF
       add.action do |global_options,options,args|
         iterate_objects_by_name(options[:name], TestLab::Network) do |network|
           p = TestLab::Provisioner::Route.new({}, @ui)
-          p.on_network_provision(network)
+          p.on_network_up(network)
           @testlab.ui.stdout.puts("Added routes successfully!".green.bold)
           @testlab.ui.stdout.puts %x(netstat -nr | grep '#{network.node.ip}').strip
         end
@@ -68,7 +68,7 @@ EOF
       del.action do |global_options,options,args|
         iterate_objects_by_name(options[:name], TestLab::Network) do |network|
           p = TestLab::Provisioner::Route.new({}, @ui)
-          p.on_network_deprovision(network)
+          p.on_network_down(network)
           @testlab.ui.stdout.puts("Deleted routes successfully!".red.bold)
           @testlab.ui.stdout.puts %x(netstat -nr | grep '#{network.node.ip}').strip
         end

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

@@ -14,14 +14,16 @@ class TestLab
           @config = (config || Hash.new)
           @ui     = (ui || TestLab.ui)
 
-          @chef_server = TestLab::Container.first('chef-server')
-
           @config[:chef] ||= Hash.new
           @config[:chef][:client] ||= Hash.new
-          @config[:chef][:client][:version]    ||= %(latest)
-          @config[:chef][:client][:log_level]  ||= :info
-          @config[:chef][:client][:server_url] ||= "https://#{@chef_server.ip}"
-          @config[:chef][:client][:attributes] ||= Hash.new
+          @config[:chef][:client][:attach_to_container] ||= %(chef-server)
+          @config[:chef][:client][:version]             ||= %(latest)
+          @config[:chef][:client][:log_level]           ||= :info
+          @config[:chef][:client][:attributes]          ||= Hash.new
+
+          @chef_server = TestLab::Container.first(@config[:chef][:client][:attach_to_container])
+
+          @config[:chef][:client][:server_url] ||= %(https://#{@chef_server.ip})
 
           @ui.logger.debug { "config(#{@config.inspect})" }
         end

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

@@ -9,20 +9,21 @@ class TestLab
       #
       # @author Zachary Patten <zachary AT jovelabs DOT com>
       class RubyGemClient
-        require 'json'
 
         def initialize(config={}, ui=nil)
           @config = (config || Hash.new)
           @ui     = (ui || TestLab.ui)
 
-          @chef_server = TestLab::Container.first('chef-server')
-
           @config[:chef] ||= Hash.new
           @config[:chef][:client] ||= Hash.new
-          @config[:chef][:client][:version]    ||= %(10.24.0)
-          @config[:chef][:client][:log_level]  ||= :info
-          @config[:chef][:client][:server_url] ||= "https://#{@chef_server.ip}"
-          @config[:chef][:client][:attributes] ||= Hash.new
+          @config[:chef][:client][:attach_to_container] ||= %(chef-server)
+          @config[:chef][:client][:version]             ||= %(10.24.0)
+          @config[:chef][:client][:log_level]           ||= :info
+          @config[:chef][:client][:attributes]          ||= Hash.new
+
+          @chef_server = TestLab::Container.first(@config[:chef][:client][:attach_to_container])
+
+          @config[:chef][:client][:server_url] ||= %(https://#{@chef_server.ip})
 
           @ui.logger.debug { "config(#{@config.inspect})" }
         end

data/lib/testlab/provisioners/resolv.rb

@@ -38,6 +38,7 @@ class TestLab
 
         true
       end
+      alias :on_node_up :on_node_provision
 
       # Resolv: Container Provision
       #

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

@@ -1,15 +1,6 @@
 options {
   directory "/var/cache/bind";
 
-  // If there is a firewall between you and nameservers you want
-  // to talk to, you may need to fix the firewall to allow multiple
-  // ports to talk.  See http://www.kb.cert.org/vuls/id/800113
-
-  // If your ISP provided one or more IP addresses for stable
-  // nameservers, you probably want to use them as forwarders.
-  // Uncomment the following block, and insert the addresses replacing
-  // the all-0's placeholder.
-
 <% if !@bind[:forwarders].nil? -%>
   forwarders {
 <% @bind[:forwarders].flatten.compact.uniq.each do |forwarder| -%>
@@ -18,13 +9,12 @@ options {
   };
 
 <% 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
-  //========================================================================
-  dnssec-validation auto;
+  lame-ttl 0;
+  max-cache-ttl 5;
+  max-ncache-ttl 5;
 
-  auth-nxdomain no;    # conform to RFC1035
+  dnssec-validation auto;
+  auth-nxdomain no;
   listen-on-v6 { any; };
 };
 

data/lib/testlab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-21 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -339,7 +339,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4032847501508074403
+      hash: -4250847310675666008
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -348,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4032847501508074403
+      hash: -4250847310675666008
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25