testlab 0.4.16 → 0.5.0

data/bin/tl

@@ -341,10 +341,14 @@ command :container do |c|
   c.desc 'Open an SSH console to a container'
   c.command :ssh do |ssh|
 
-    ssh.desc 'Username'
+    ssh.desc 'Specify an SSH Username to use'
     ssh.arg_name 'username'
     ssh.flag [:u, :user]
 
+    ssh.desc 'Specify an SSH Identity Key to use'
+    ssh.arg_name 'key'
+    ssh.flag [:k, :key]
+
     ssh.action do |global_options, options, args|
       help_now!('id is required') if options[:id].nil?
 
@@ -353,6 +357,7 @@ command :container do |c|
 
       ssh_options = Hash.new
       ssh_options[:user] = options[:user]
+      ssh_options[:keys] = options[:key]
 
       container.ssh(ssh_options).console
     end

data/lib/testlab/container/actions.rb

@@ -20,24 +20,18 @@ class TestLab
 
           self.lxc.create(*create_args)
 
-          # TODO: This needs to really go somewhere else:
-          home_dir = ((self.node.user == "root") ? %(/root) : %(/home/#{self.node.user}))
-          container_home_dir = File.join(self.lxc.fs_root, "/home/ubuntu")
-
-          home_authkeys = File.join(home_dir, ".ssh", "authorized_keys")
-          container_authkeys = File.join(container_home_dir, ".ssh", "authorized_keys")
-          container_authkeys2 = File.join(container_home_dir, ".ssh", "authorized_keys2")
-
-          authkeys = {
-            home_authkeys => container_authkeys,
-            home_authkeys => container_authkeys2
-          }
-
-          self.node.ssh.exec(%(mkdir -pv #{File.join(container_home_dir, %(.ssh))}))
-          authkeys.each do |source, destination|
-            self.node.ssh.exec(%(sudo cp -v #{source} #{destination}))
-            self.node.ssh.exec(%(sudo chown -v 1000:1000 #{destination}))
-            self.node.ssh.exec(%(sudo chmod -v 644 #{destination}))
+          # Ensure the container APT calls use apt-cacher-ng on the node
+          gateway_ip = self.primary_interface.network.ip
+          apt_conf_d_proxy_file = File.join(self.lxc.fs_root, "etc", "apt", "apt.conf.d", "02proxy")
+          self.node.ssh.exec(%(sudo mkdir -pv #{File.dirname(apt_conf_d_proxy_file)}))
+          self.node.ssh.exec(%(echo 'Acquire::http { Proxy "http://#{gateway_ip}:3142"; };' | sudo tee #{apt_conf_d_proxy_file}))
+
+          # Fix the APT sources since LXC mudges them when using apt-cacher-ng
+          apt_conf_sources_file = File.join(self.lxc.fs_root, "etc", "apt", "sources.list")
+          self.node.ssh.exec(%(sudo sed -i 's/127.0.0.1:3142\\///g' #{apt_conf_sources_file}))
+
+          self.users.each do |u|
+            u.create
           end
 
         end
@@ -81,8 +75,10 @@ class TestLab
 
           (self.lxc.state != :running) and raise ContainerError, "The container failed to online!"
 
-          # TODO: This needs to really go somewhere else:
-          self.lxc.attach(%(-- /bin/bash -c 'grep "sudo\tALL=\(ALL:ALL\) ALL" /etc/sudoers && sed -i "s/sudo\tALL=\(ALL:ALL\) ALL/sudo\tALL=\(ALL:ALL\) NOPASSWD: ALL/" /etc/sudoers'))
+          self.users.each do |u|
+            u.up
+          end
+
         end
 
         true

data/lib/testlab/container/user.rb

@@ -0,0 +1,32 @@
+class TestLab
+  class Container
+
+    module User
+
+      # Container primary user
+      #
+      # Returns the primary user for the container.  If the container has
+      # multiple users, this is based on which ever user is marked
+      # with the primary flag.  If the container only has one user, then
+      # it is returned.
+      #
+      # @return [TestLab::User] The primary user for the container.
+      def primary_user
+        if self.users.count == 0
+          case self.distro.downcase
+          when 'ubuntu' then
+            TestLab::User.new "ubuntu" do
+              password 'ubuntu'
+            end
+          end
+        elsif self.users.any?{ |u| u.primary == true }
+          self.users.find{ |u| u.primary == true }
+        else
+          self.users.first
+        end
+      end
+
+    end
+
+  end
+end

data/lib/testlab/container.rb

@@ -70,6 +70,7 @@ class TestLab
     autoload :MethodMissing, 'testlab/container/method_missing'
     autoload :SSH,           'testlab/container/ssh'
     autoload :Status,        'testlab/container/status'
+    autoload :User,          'testlab/container/user'
 
     include TestLab::Container::Actions
     include TestLab::Container::Generators
@@ -79,6 +80,7 @@ class TestLab
     include TestLab::Container::MethodMissing
     include TestLab::Container::SSH
     include TestLab::Container::Status
+    include TestLab::Container::User
 
     extend  TestLab::Container::ClassMethods
 
@@ -87,16 +89,13 @@ class TestLab
     # Associations and Attributes
     belongs_to  :node,        :class_name => 'TestLab::Node'
     has_many    :interfaces,  :class_name => 'TestLab::Interface'
+    has_many    :users,       :class_name => 'TestLab::User'
 
     attribute   :provisioner
     attribute   :config,      :default => Hash.new
 
     attribute   :domain
 
-    attribute   :user,        :default => 'ubuntu'
-    attribute   :passwd,      :default => 'ubuntu'
-    attribute   :keys
-
     attribute   :distro,      :default => 'ubuntu'
     attribute   :release,     :default => 'precise'
     attribute   :arch

data/lib/testlab/node/ssh.rb

@@ -30,9 +30,10 @@ class TestLab
             c.proxy_keys      = @provider.identity
 
             c.host_name       = container.ip
-            c.user            = (options[:user]   || container.user)
-            c.password        = (options[:passwd] || container.passwd)
-            c.keys            = (options[:keys]   || container.keys || @provider.identity)
+
+            c.user            = (options[:user]   || container.primary_user.id)
+            c.password        = (options[:passwd] || container.primary_user.password)
+            c.keys            = (options[:keys]   || container.primary_user.keys || @provider.identity)
           end
         end
         @container_ssh[name]

data/lib/testlab/node/templates/node-setup.erb

@@ -2,11 +2,21 @@ set -x
 
 # 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
+apt-get -y install lxc bridge-utils debootstrap yum iptables ntpdate ntp apt-cacher-ng
+
+# Ensure APT Cache-NG is running
+service apt-cacher-ng restart || service apt-cacher-ng start
+cat <<EOF | tee /etc/apt/apt.conf.d/02proxy
+Acquire::http { Proxy "http://127.0.0.1:3142"; };
+EOF
 
 # Ensure the default lxc networking services are off
 service lxc-net stop
 
+# Ensure that we use APT Cacher-NG for building containers
+grep "^MIRROR" /etc/default/lxc || echo "MIRROR=\"http://127.0.0.1:3142/archive.ubuntu.com/ubuntu\"" | tee -a /etc/default/lxc
+service lxc restart || service lxc start
+
 # Ensure NTP services are enabled and running
 service ntp restart || service ntp start
 

data/lib/testlab/user/actions.rb

@@ -0,0 +1,69 @@
+class TestLab
+  class User
+
+    module Actions
+
+      # Create the user
+      #
+      # @return [Boolean] True if successful.
+      def create
+        @ui.logger.debug { "User Create: #{self.id} " }
+
+        node_home_dir = ((self.container.node.user == "root") ? %(/root) : %(/home/#{self.container.node.user}))
+        node_authkeys = File.join(node_home_dir, ".ssh", "authorized_keys")
+
+        user_home_dir = File.join(self.container.lxc.fs_root, ((self.id == "root") ? %(/root) : %(/home/#{self.id})))
+        user_authkeys = File.join(user_home_dir, ".ssh", "authorized_keys")
+        user_authkeys2 = File.join(user_home_dir, ".ssh", "authorized_keys2")
+
+        # ensure the container user exists
+        container_passwd_file = File.join(self.container.lxc.fs_root, "etc", "passwd")
+        if self.container.node.ssh.exec(%(sudo grep "#{self.id}" #{container_passwd_file}), :ignore_exit_status => true).exit_code != 0
+
+          if !self.gid.nil?
+            groupadd_command = %(groupadd --gid #{self.gid} #{self.id})
+            self.container.node.ssh.exec(%(sudo chroot #{self.container.lxc.fs_root} /bin/bash -c '#{groupadd_command}'))
+          end
+
+          useradd_command = %W(useradd --create-home --shell /bin/bash --groups sudo --password #{self.password})
+          useradd_command << "--uid #{self.uid}" if !self.uid.nil?
+          useradd_command << "--gid #{self.gid}" if !self.gid.nil?
+          useradd_command << self.id
+          useradd_command = useradd_command.flatten.compact.join(' ')
+
+          self.container.node.ssh.exec(%(sudo chroot #{self.container.lxc.fs_root} /bin/bash -c '#{useradd_command}'))
+        end
+
+        # ensure the user user gets our node user key
+        authkeys = {
+          node_authkeys => user_authkeys,
+          node_authkeys => user_authkeys2
+        }
+
+        authkeys.each do |source, destination|
+          self.container.node.ssh.exec(%(sudo mkdir -pv #{File.dirname(destination)}))
+          self.container.node.ssh.exec(%(sudo cp -v #{source} #{destination}))
+          self.container.node.ssh.exec(%(sudo chmod -v 644 #{destination}))
+        end
+
+        true
+      end
+
+      # Up the user
+      #
+      # @return [Boolean] True if successful.
+      def up
+        @ui.logger.debug { "User Up: #{self.id}" }
+
+        # ensure the container user home directory is owned by them
+        home_dir = self.container.lxc.attach(%(-- /bin/bash -c 'grep #{self.id} /etc/passwd | cut -d ":" -f6')).strip
+        self.container.lxc.attach(%(-- /bin/bash -c 'sudo chown -Rv $(id -u #{self.id}):$(id -g #{self.id}) #{home_dir}'))
+
+        # ensure the sudo user group can do passwordless sudo
+        self.container.lxc.attach(%(-- /bin/bash -c 'grep "sudo\tALL=\(ALL:ALL\) ALL" /etc/sudoers && sed -i "s/sudo\tALL=\(ALL:ALL\) ALL/sudo\tALL=\(ALL:ALL\) NOPASSWD: ALL/" /etc/sudoers'))
+      end
+
+    end
+
+  end
+end

data/lib/testlab/user.rb

@@ -0,0 +1,35 @@
+class TestLab
+
+  # User Error Class
+  class UserError < TestLabError; end
+
+  # User Class
+  #
+  # @author Zachary Patten <zachary AT jovelabs DOT com>
+  class User < ZTK::DSL::Base
+
+    # Sub-Modules
+    autoload :Actions,       'testlab/user/actions'
+
+    include TestLab::User::Actions
+
+    # Associations and Attributes
+    belongs_to  :container,  :class_name => 'TestLab::Container'
+
+    attribute   :user
+    attribute   :password
+    attribute   :keys
+    attribute   :uid
+    attribute   :gid
+
+    attribute   :primary,    :default => false
+
+    def initialize(*args)
+      super(*args)
+
+      @ui = TestLab.ui
+    end
+
+  end
+
+end

data/lib/testlab/version.rb

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

data/lib/testlab.rb

@@ -93,6 +93,7 @@ class TestLab
   autoload :Node,        'testlab/node'
   autoload :Provider,    'testlab/provider'
   autoload :Provisioner, 'testlab/provisioner'
+  autoload :User,        'testlab/user'
   autoload :Utility,     'testlab/utility'
 
   include TestLab::Utility::Misc

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -217,6 +217,7 @@ files:
 - lib/testlab/container/method_missing.rb
 - lib/testlab/container/ssh.rb
 - lib/testlab/container/status.rb
+- lib/testlab/container/user.rb
 - lib/testlab/interface.rb
 - lib/testlab/labfile.rb
 - lib/testlab/monkeys.rb
@@ -252,6 +253,8 @@ files:
 - lib/testlab/provisioners/shell.rb
 - lib/testlab/provisioners/templates/chef/omnibus.erb
 - lib/testlab/provisioners/templates/chef/omnitruck.erb
+- lib/testlab/user.rb
+- lib/testlab/user/actions.rb
 - lib/testlab/utility.rb
 - lib/testlab/utility/cidr.rb
 - lib/testlab/utility/misc.rb
@@ -282,7 +285,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1044264548674071638
+      hash: -532232323948453701
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -291,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1044264548674071638
+      hash: -532232323948453701
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25