testlab 1.6.6 → 1.7.0

data/bin/tl-knife

@@ -32,7 +32,7 @@ logger = ZTK::Logger.new(%(/tmp/tl-knife.log))
 ui = ZTK::UI.new(:logger => logger) # ui interface class
 l = TestLab.new(:ui => ui)          # lab
 l.boot                              # boot lab
-chef_server   = l.containers.find('chef-server').first
+chef_server   = l.containers.select{ |c| c.id == 'chef-server' }.first
 
 verbose_flags = %w(-V -VV --verbose)
 verbose       = ARGV.any?{ |arg| verbose_flags.include?(arg) } || (!ENV['LOG_LEVEL'].nil? && (ENV['LOG_LEVEL'].upcase == 'DEBUG'))

data/lib/testlab/container.rb

@@ -125,6 +125,8 @@ class TestLab
     attribute   :release,       :default => 'precise'
     attribute   :arch
 
+    attribute   :mounts,        :default => Array.new
+
     attribute   :aa_profile
     attribute   :cap_drop
 

data/lib/testlab/container/configuration.rb

@@ -28,6 +28,10 @@ class TestLab
         lxc_config['lxc.arch']    = self.arch
         lxc_config['lxc.utsname'] = self.fqdn
 
+        self.mounts.nil? or self.mounts.flatten.compact.each do |mount|
+          lxc_config['lxc.mount.entry'] = mount
+        end
+
         unless self.aa_profile.nil?
           lxc_config['lxc.aa_profile'] = self.aa_profile
         end
@@ -36,7 +40,7 @@ class TestLab
           lxc_config['lxc.cap.drop'] = [self.cap_drop].flatten.compact.map(&:downcase).join(' ')
         end
 
-        lxc_config.networks       = build_lxc_network_conf(self.interfaces)
+        lxc_config.networks = build_lxc_network_conf(self.interfaces)
 
         lxc_config.save
 

data/lib/testlab/container/support.rb

@@ -30,7 +30,7 @@ class TestLab
           arguments << %W(-s lxc.cap.drop="#{cap_drop}")
         end
 
-        arguments << %W(-d)
+        arguments << %W(-d -l DEBUG)
 
         arguments.flatten.compact
       end

data/lib/testlab/providers/templates/vagrant/Vagrantfile.erb

@@ -11,6 +11,9 @@ Vagrant.configure("2") do |config|
     testlab.vm.box = <%= @box.inspect %>
     testlab.vm.box_url = <%= @box_url.inspect %>
     testlab.vm.network(:private_network, :ip => <%= @ip.inspect %>)
+<% @synced_folders.nil? or @synced_folders.each do |synced_folder| -%>
+    testlab.vm.synced_folder *<%= synced_folder.inspect %>
+<% end -%>
 
     testlab.vm.provider :virtualbox do |vb|
       vb.name = <%= @hostname.inspect %>

data/lib/testlab/providers/vagrant.rb

@@ -171,6 +171,10 @@ class TestLab
         (@config[:vagrant][:resize] || (1024 * 16))
       end
 
+      def synced_folders
+        (@config[:vagrant][:synced_folders] || nil)
+      end
+
 ################################################################################
 
       def vagrant_cli(*args)
@@ -204,7 +208,8 @@ class TestLab
           :memory => self.memory,
           :resize => self.resize,
           :box => self.box,
-          :box_url => self.box_url
+          :box_url => self.box_url,
+          :synced_folders => self.synced_folders
         }
 
         vagrantfile_template = File.join(TestLab::Provider.template_dir, "vagrant", "Vagrantfile.erb")

data/lib/testlab/provisioner.rb

@@ -11,6 +11,7 @@ class TestLab
     autoload :AptCacherNG,  'testlab/provisioners/apt_cacher_ng'
     autoload :Bind,         'testlab/provisioners/bind'
     autoload :Chef,         'testlab/provisioners/chef'
+    autoload :NFSMount,     'testlab/provisioners/nfs_mount'
     autoload :Raring,       'testlab/provisioners/raring'
     autoload :Resolv,       'testlab/provisioners/resolv'
     autoload :Route,        'testlab/provisioners/route'

data/lib/testlab/provisioners/nfs_mount.rb

@@ -0,0 +1,135 @@
+class TestLab
+
+  class Provisioner
+
+    # NFSMount Provisioner Error Class
+    class NFSMountError < ProvisionerError; end
+
+    # NFSMount Provisioner Class
+    #
+    # @author Zachary Patten <zachary AT jovelabs DOT com>
+    class NFSMount
+      require 'base64'
+      require 'digest/sha1'
+
+      include TestLab::Utility::Misc
+
+      def initialize(config={}, ui=nil)
+        @config  = (config || Hash.new)
+        @ui      = (ui     || TestLab.ui)
+        @command = ZTK::Command.new(:ui => @ui, :silence => true, :ignore_exit_status => true)
+
+        @config[:nfs_mounts] ||= Array.new
+
+        @ui.logger.debug { "config(#{@config.inspect})" }
+      end
+
+      # NFSMount: Container Provision
+      def on_container_provision(container)
+        container.exec(%(sudo dpkg --status nfs-common || sudo apt-get -y install nfs-common))
+
+        add_nfs_mounts(container)
+        container_mount(container)
+
+        true
+      end
+
+      # NFSMount: Container Up
+      def on_container_up(container)
+        (container.exec(%(sudo dpkg --status nfs-common), :ignore_exit_status => true).exit_code == 0) or return false
+
+        add_nfs_mounts(container)
+        container_mount(container)
+
+        true
+      end
+
+      def on_container_deprovision(container)
+        remove_nfs_mounts(container)
+
+        true
+      end
+      alias :on_container_down :on_container_deprovision
+      alias :on_container_destroy :on_container_deprovision
+
+    private
+
+      def add_nfs_mounts(container)
+        @command.exec(<<-EOF)
+set -x
+#{service_check}
+grep '#{def_tag(container)}' /etc/exports && exit 0
+cat <<EOI | #{sudo} tee -a /etc/exports
+#{def_tag(container)}
+#{mount_blob(container)}
+#{end_tag(container)}
+EOI
+#{restart_service_command}
+        EOF
+      end
+
+      def remove_nfs_mounts(container)
+        @command.exec(sed_exports(container))
+      end
+
+      def mount_blob(container)
+        mount_entries = Array.new
+        @config[:nfs_mounts].each do |nfs_mount|
+          mount_entries << case RUBY_PLATFORM
+          when /darwin/ then
+            %(#{nfs_mount[1]})
+          when /linux/ then
+            %(#{nfs_mount[1]} *(rw,sync,no_subtree_check))
+          end
+        end
+        mount_entries.join("\n")
+      end
+
+      def sed_exports(container)
+        case RUBY_PLATFORM
+        when /darwin/ then
+          %(#{sudo} sed -i '' '/#{def_tag(container)}/,/#{end_tag(container)}/d' /etc/exports)
+        when /linux/ then
+          %(#{sudo} sed -i '/#{def_tag(container)}/,/#{end_tag(container)}/d' /etc/exports)
+        end
+      end
+
+      def container_mount(container)
+        @config[:nfs_mounts].each do |nfs_mount|
+          container.exec(%(sudo mkdir -p #{nfs_mount[2]}))
+          container.exec(%(sudo mount -vt nfs -o 'nfsvers=3' #{nfs_mount[0]}:#{nfs_mount[1]} #{nfs_mount[2]}), :ignore_exit_status => true)
+        end
+      end
+
+      def restart_service_command
+        case RUBY_PLATFORM
+        when /darwin/ then
+          %(#{sudo} nfsd restart ; sleep 10)
+        when /linux/ then
+          %(#{sudo} service nfs-kernel-server reload || #{sudo} service nfs-kernel-server restart)
+        end
+      end
+
+      def service_check
+        case RUBY_PLATFORM
+        when /darwin/ then
+          %(#{sudo} nfsd enable)
+        when /linux/ then
+          %((#{sudo} dpkg --status nfs-kernel-server || #{sudo} apt-get -y install nfs-kernel-server) && #{sudo} service nfs-kernel-server start)
+        end
+      end
+
+      # NFS Exports Start Definition Tag
+      def def_tag(container)
+        "#TESTLAB-NFS-EXPORTS-DEF-#{container.id.to_s.upcase}"
+      end
+
+      # NFS Exports End Definition Tag
+      def end_tag(container)
+        "#TESTLAB-NFS-EXPORTS-END-#{container.id.to_s.upcase}"
+      end
+
+    end
+
+  end
+end

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

@@ -5,7 +5,7 @@ export DEBIAN_FRONTEND="noninteractive"
 
 # Update APT and ensure our required packages are installed
 apt-get -y update
-<% %w(lxc bridge-utils debootstrap yum iptables iptables-persistent ntpdate ntp pbzip2).each do |package| -%>
+<% %w(lxc apparmor bridge-utils debootstrap yum iptables iptables-persistent ntpdate ntp pbzip2).each do |package| -%>
 dpkg --status <%= package %> &> /dev/null || apt-get -y install <%= package %>
 <% end -%>
 
@@ -26,3 +26,11 @@ 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
+
+grep 'mount fstype=nfs,' /etc/apparmor.d/abstractions/lxc/container-base || cat <<EOF | tee -a /etc/apparmor.d/abstractions/lxc/container-base
+  mount fstype=nfs,
+EOF
+
+grep 'mount fstype=rpc_pipefs,' /etc/apparmor.d/abstractions/lxc/container-base || cat <<EOF | tee -a /etc/apparmor.d/abstractions/lxc/container-base
+  mount fstype=rpc_pipefs,
+EOF

data/lib/testlab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -286,6 +286,7 @@ files:
 - lib/testlab/provisioners/chef/omni_truck.rb
 - lib/testlab/provisioners/chef/ruby_gem_client.rb
 - lib/testlab/provisioners/chef/ruby_gem_server.rb
+- lib/testlab/provisioners/nfs_mount.rb
 - lib/testlab/provisioners/raring.rb
 - lib/testlab/provisioners/resolv.rb
 - lib/testlab/provisioners/route.rb
@@ -342,7 +343,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -673687854564395917
+      hash: -571229206992494918
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -351,7 +352,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -673687854564395917
+      hash: -571229206992494918
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25