testlab 0.4.2 → 0.4.3

data/bin/tl

@@ -244,13 +244,21 @@ command :container do |c|
   ################
   c.desc 'Open an SSH console to a container'
   c.command :ssh do |ssh|
+
+    ssh.desc 'Username'
+    ssh.arg_name 'username'
+    ssh.flag [:u, :user]
+
     ssh.action do |global_options, options, args|
       help_now!('id is required') if options[:id].nil?
 
       container = @testlab.containers.select{ |n| n.id.to_sym == options[:id].to_sym }.first
       container.nil? and raise TestLab::TestLabError, "We could not find the container you supplied!"
 
-      container.ssh.console
+      ssh_options = Hash.new
+      ssh_options[:user] = options[:user]
+
+      container.ssh(ssh_options).console
     end
   end
 

data/lib/testlab/container/actions.rb

@@ -20,7 +20,7 @@ class TestLab
           self.arch    ||= detect_arch
 
           self.lxc.config.clear
-          self.lxc.config['lxc.utsname'] = self.id
+          self.lxc.config['lxc.utsname'] = self.fqdn
           self.lxc.config['lxc.arch'] = self.arch
           self.lxc.config.networks = build_lxc_network_conf(self.interfaces)
           self.lxc.config.save
@@ -31,13 +31,22 @@ class TestLab
           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))
+          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))}))
-          self.node.ssh.exec(%(sudo cp -v #{home_authkeys} #{container_authkeys}))
-          self.node.ssh.exec(%(sudo chown -v 1000:1000 #{container_authkeys}))
-          self.node.ssh.exec(%(sudo chmod -v 644 #{container_authkeys}))
+          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}))
+          end
+
         end
 
         true
@@ -75,7 +84,7 @@ 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.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
 
         true

data/lib/testlab/container/lxc.rb

@@ -20,7 +20,7 @@ class TestLab
           self.node.ssh.file(:target => File.join(self.lxc.fs_root, remote_tempfile), :chmod => '0777', :chown => 'root:root') do |file|
             file.puts(content)
           end
-          output = self.lxc.attach(%(/bin/bash), remote_tempfile)
+          output = self.lxc.attach(%(--), %(/bin/bash), remote_tempfile)
           if output =~ /No such file or directory/
             raise ContainerError, "We could not find the bootstrap file!"
           end

data/lib/testlab/node/ssh.rb

@@ -30,11 +30,11 @@ class TestLab
             c.proxy_keys      = @provider.identity
 
             c.host_name       = container.ip
-            c.user            = container.user
+            c.user            = (options[:user] || container.user)
             if container.keys.nil?
-              c.password      = container.passwd
+              c.password      = (options[:passwd] || container.passwd)
             else
-              c.keys          = container.keys
+              c.keys          = (options[:keys] || container.keys)
             end
           end
         end

data/lib/testlab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testlab
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -281,7 +281,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3482118721192015302
+      hash: -4535491562100824154
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3482118721192015302
+      hash: -4535491562100824154
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25