toft 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    toft (0.0.3)
+    toft (0.0.4)
       net-ssh
 
 GEM

data/Rakefile

@@ -16,16 +16,16 @@ task :package_deb do
   src_dir = "#{PROJECT_ROOT}/scripts"
   content_dir = "#{PROJECT_ROOT}/pkg/#{LXC_PACKAGE_NAME}"
   mkdir_p content_dir
-  mkdir_p "#{content_dir}/usr/local/bin"
+  mkdir_p "#{content_dir}/usr/bin"
   mkdir_p "#{content_dir}/var/cache/lxc"
   mkdir_p "#{content_dir}/usr/lib/lxc/templates"
-  cp_r Dir.glob("#{src_dir}/bin/share/*"), "#{content_dir}/usr/local/bin"
-  cp_r Dir.glob("#{src_dir}/bin/ubuntu/*"), "#{content_dir}/usr/local/bin"
+  cp_r Dir.glob("#{src_dir}/bin/share/*"), "#{content_dir}/usr/bin"
+  cp_r Dir.glob("#{src_dir}/bin/ubuntu/*"), "#{content_dir}/usr/bin"
   cp_r Dir.glob("#{src_dir}/lxc-templates/*"), "#{content_dir}/usr/lib/lxc/templates"
   
   post_install_script = <<-eos
 #!/bin/sh -e
-/usr/local/bin/lxc-prepare-host
+/usr/bin/lxc-prepare-host
 eos
   File.open("#{PROJECT_ROOT}/pkg/toft-lxc-post-install.sh", 'w') { |f| f.write(post_install_script) }
   
@@ -60,17 +60,17 @@ task :package_rpm do
   src_dir = "#{PROJECT_ROOT}/scripts"
   content_dir = "#{PROJECT_ROOT}/pkg/#{LXC_PACKAGE_NAME}"
   mkdir_p content_dir
-  mkdir_p "#{content_dir}/usr/local/bin"
-  mkdir_p "#{content_dir}/usr/var/lib/lxc"
+  mkdir_p "#{content_dir}/usr/bin"
+  mkdir_p "#{content_dir}/var/lib/lxc"
   mkdir_p "#{content_dir}/var/cache/lxc"
   mkdir_p "#{content_dir}/usr/lib/lxc/templates"
-  cp_r Dir.glob("#{src_dir}/bin/share/*"), "#{content_dir}/usr/local/bin"
-  cp_r Dir.glob("#{src_dir}/bin/centos/*"), "#{content_dir}/usr/local/bin"
+  cp_r Dir.glob("#{src_dir}/bin/share/*"), "#{content_dir}/usr/bin"
+  cp_r Dir.glob("#{src_dir}/bin/centos/*"), "#{content_dir}/usr/bin"
   cp_r Dir.glob("#{src_dir}/lxc-templates/*"), "#{content_dir}/usr/lib/lxc/templates"
   
   post_install_script = <<-eos
 #!/bin/sh -e
-/usr/local/bin/lxc-prepare-host
+/usr/bin/lxc-prepare-host
 eos
   File.open("#{PROJECT_ROOT}/pkg/toft-lxc-post-install.sh", 'w') { |f| f.write(post_install_script) }
   

data/features/command.feature

@@ -16,5 +16,5 @@ Scenario: Test rm
 Scenario: Check ssh command result
 	Given I have a clean running node n1
 	Then the result of running ssh command "ps" on "n1" should contain "sshd"
-	Then the result of running ssh command "chef-solo" on "n1" should contain "No cookbook found"
+	Then the result of running ssh command "chef-solo" on "n1" should fail because of "No cookbook found"
 	

data/features/step_definitions/command.rb

@@ -15,5 +15,14 @@ Then /^Rm "([^"]*)" on "([^"]*)" should succeed$/ do |dir, node|
 end
 
 Then /^the result of running ssh command "([^"]*)" on "([^"]*)" should contain "([^"]*)"$/ do |cmd, node, s|
-  find(node).get_ssh_result(cmd).should include(s)
-end
+  r = find(node).run_ssh(cmd)
+  r.stdout.should include(s)
+end
+
+Then /^the result of running ssh command "([^"]*)" on "([^"]*)" should fail because of "([^"]*)"$/ do |cmd, node, s|
+  begin
+    r = find(node).run_ssh(cmd)
+  rescue CommandExecutionError => e
+    e.stdout.should include(s)
+  end
+end

data/features/step_definitions/node.rb

@@ -42,7 +42,7 @@ end
 
 Then /^Node "([^"]*)" should have ip address same with that obtained from inside it through ssh$/ do |node|
   n = find(node)
-  n.get_ssh_result("ifconfig eth0 | grep 'inet addr:'").should include(n.ip)
+  n.run_ssh("ifconfig eth0 | grep 'inet addr:'").stdout.should include(n.ip)
 end
 
 When /^I add cname "([^"]*)" to "([^"]*)"$/ do |cname, node|

data/features/support/env.rb

@@ -18,5 +18,5 @@ Before do
 end
 
 at_exit do
-  n1.destroy
+  # n1.destroy
 end

data/lib/toft/node.rb

@@ -90,28 +90,36 @@ CQWv13UgQjiHgQILXSb7xdzpWK1wpDoqIEWQugRyPQDeZhPWVbB4Lg==
 
     def run_ssh(command)
       raise ArgumentError, "Trying to run empty command on node #{@hostname}", caller if command.blank?
-      error = false
+      stdout = ""
+      stderr = ""
       Net::SSH.start(fqdn, "root", :key_data => [PRIVATE_KEY]) do |ssh|
-        ssh.exec! command do |ch, stream, data|
-          if stream == :stderr
-            error = true
+        ssh.open_channel do |channel|
+          channel.exec(command) do |ch, success|
+            raise RuntimeError, "Could not execute command: [#{command}]", caller unless success
+
+            channel.on_data do |c, data|
+              puts data
+              stdout << data
+              yield data if block_given?
+            end
+            channel.on_extended_data do |c, type, data|
+              puts data
+              stderr << data
+              yield data if block_given?
+            end
+            channel.on_request("exit-status") do |c, data|
+              exit_code = data.read_long
+              raise CommandExecutionError.new "Remote command [#{command}] exited with status #{exit_code}", stdout, stderr unless exit_code.zero?
+            end
+            channel.on_request("exit-signal") do |c, data|
+              raise CommandExecutionError.new "Remote command [#{command}] terminated with signal", stdout, stderr
+            end
           end
-          yield data if block_given?
-	        puts data
-        end
+        end.wait
       end
-      raise RuntimeError, "Error happened while executing command [#{command}]!", caller if error
-      return true
+      return CommandResult.new stdout, stderr
     end
     
-    def get_ssh_result(cmd)
-      output = ""
-      run_ssh(cmd) do |data|
-        output += data
-      end
-      return output
-    end
-
     def rm(dir)
       raise ArgumentError, "Illegal dir path: [#{dir}]", caller if dir.blank? || dir[0] != ?/
       system "rm -rf #{rootfs}#{dir}"
@@ -182,4 +190,23 @@ lxc.network.ipv4 = #{full_ip}
       "#{@hostname}.#{Toft::DOMAIN}"
     end
   end
+  
+  class CommandResult
+    attr_reader :stdout, :stderr
+    
+    def initialize(stdout, stderr)
+      @stdout = stdout
+      @stderr = stderr
+    end
+  end
+
+  class CommandExecutionError < RuntimeError
+    attr_reader :message, :stdout, :stderr
+    
+    def initialize(message, stdout, stderr)
+      @message = message
+      @stdout = stdout
+      @stderr = stderr
+    end
+  end
 end

data/lib/toft/version.rb

@@ -1,3 +1,3 @@
 module Toft
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/scripts/bin/centos/lxc-prepare-host

@@ -19,7 +19,7 @@ if [[ ! -f /usr/bin/lxc-ls ]]; then
 	wget http://lxc.sourceforge.net/download/lxc/lxc-0.7.4.tar.gz && \
 	tar zxf lxc-0.7.4.tar.gz && \
 	cd lxc-0.7.4 && \
-	./configure --prefix=/usr && \
+	./configure --prefix=/usr --with-config-path=/var/lib/lxc && \
 	make && \
 	make install)
 fi
@@ -38,14 +38,14 @@ BOOTPROTO=static
 DELAY=0
 TYPE=Bridge
 IPADDR=$gateway_ip
-NETWORK=$subnet
 NETMASK=$netmask
-GATEWAY=$gateway_ip
 MTU=1500
 IPV6INIT=no
 USERCTL=no
 EOF
 
+sudo sed -i "s/#*[ ^I]*net\.ipv4\.ip_forward[ ^I]*=[ ^I]*[01]/net\.ipv4\.ip_forward = 1/" /etc/sysctl.conf
+
 # reset iptables
 cat <<EOF > /etc/sysconfig/iptables
 *nat

data/scripts/bin/ubuntu/lxc-prepare-host

@@ -36,6 +36,8 @@ post-up /usr/sbin/brctl setfd br0 0
 EOF
 fi
 
+sudo sed -i "s/#*[ ^I]*net\.ipv4\.ip_forward[ ^I]*=[ ^I]*[01]/net\.ipv4\.ip_forward = 1/" /etc/sysctl.conf
+
 iptables-save > /etc/firewall.conf
 echo "#!/bin/sh" > /etc/network/if-up.d/iptables 
 echo "iptables-restore < /etc/firewall.conf" >> /etc/network/if-up.d/iptables 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: toft
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Huang Liang
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-19 00:00:00 Z
+date: 2011-10-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec