toft 0.0.5 → 0.0.6

data/Gemfile.lock

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

data/Rakefile

@@ -39,6 +39,7 @@ eos
     -v #{Toft::VERSION} \
     -m "Huang Liang<exceedhl@gmail.com>" \
     --description "lxc templates and helper provided by toft" \
+    -d sudo \
     -d rpm \
     -d dnsutils \
     -d lxc \
@@ -68,10 +69,25 @@ task :package_rpm do
   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"
   
+  pre_install_script = <<-eos
+#!/bin/sh -e
+# intsall lxc if not exist
+if [[ ! -f /usr/bin/lxc-ls ]]; then
+	(cd /tmp && \
+	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 --with-config-path=/var/lib/lxc && \
+	make && \
+	make install)
+fi
+eos
+  
   post_install_script = <<-eos
 #!/bin/sh -e
 /usr/bin/lxc-prepare-host
 eos
+  File.open("#{PROJECT_ROOT}/pkg/toft-lxc-pre-install.sh", 'w') { |f| f.write(pre_install_script) }
   File.open("#{PROJECT_ROOT}/pkg/toft-lxc-post-install.sh", 'w') { |f| f.write(post_install_script) }
   
   Dir.chdir("pkg") do
@@ -84,6 +100,7 @@ eos
     -v #{Toft::VERSION} \
     -m "Huang Liang<exceedhl@gmail.com>" \
     --description "lxc templates and helper provided by toft" \
+    -d sudo \
     -d bind-utils \
     -d bridge-utils \
     -d dhcp \
@@ -91,6 +108,7 @@ eos
     -d ntp \
     -d libcap-devel \
     --post-install "#{PROJECT_ROOT}/pkg/toft-lxc-post-install.sh" \
+    --pre-install "#{PROJECT_ROOT}/pkg/toft-lxc-pre-install.sh" \
     .
     EOF
   end

data/features/node.feature

@@ -24,6 +24,7 @@ Scenario: Create node only by name and fetch their info
 	And Running ssh command "ping -c 1 n3" on "n1" should succeed
 	And Node "n1" should have ip address same with that obtained from inside it through ssh
 	And Node "n3" should have ip address same with that obtained from inside it through ssh
+	And Hostname of Node "n1" should match its name
 	And Node "n3" is destroyed
 	
 Scenario: Create or destroy node 

data/features/step_definitions/command.rb

@@ -1,5 +1,5 @@
 Then /^Running ssh command "([^"]*)" on "([^"]*)" should succeed$/ do |cmd, node|
-  find(node).run_ssh(cmd).should be_true
+  lambda { find(node).run_ssh(cmd) }.should_not raise_error  
 end
 
 Then /^Running ssh command "([^"]*)" on "([^"]*)" should fail$/ do |cmd, node|

data/features/step_definitions/node.rb

@@ -21,7 +21,7 @@ When /^Node "([^"]*)" is destroyed$/ do |node|
 end
 
 Then /^There should be ([^"]*) nodes in the environment$/ do |count|
-  node_count.should == count.to_i
+  find(:all).size.should == count.to_i
 end
 
 Then /^the node "([^"]*)" should be stopped$/ do |node|
@@ -52,3 +52,7 @@ end
 When /^I remove cname "([^"]*)" from "([^"]*)"$/ do |cname, node|
   find(node).remove_cname cname
 end
+
+Then /^Hostname of Node "([^"]*)" should match its name$/ do |node|
+  find(node).hostname.should == node
+end

data/features/support/env.rb

@@ -3,7 +3,7 @@ require 'rspec/expectations'
 require 'toft'
 
 CHEF_FIXTURE_PATH = File.dirname(__FILE__) + '/../../fixtures/chef'
-CONTAINER_TYPE = "centos-6"
+CONTAINER_TYPE = "natty"
 
 World(Toft)
 
@@ -18,5 +18,5 @@ Before do
 end
 
 at_exit do
-  # n1.destroy
+  n1.destroy
 end

data/lib/toft.rb

@@ -15,17 +15,14 @@ module Toft
     NodeController.instance.create_node(hostname, options)
   end
   
-  def find(hostname)
-    NodeController.instance.nodes[hostname]
+  def find(name)
+    return NodeController.instance.nodes if name === :all
+    NodeController.instance.nodes[name] if name.is_a? String
   end
   
   def destroy_node(hostname)
     NodeController.instance.destroy_node(hostname)
   end
-  
-  def node_count
-    NodeController.instance.nodes.size
-  end
 end
 
 class NilClass

data/lib/toft/command_executor.rb

@@ -0,0 +1,16 @@
+module Toft
+  module CommandExecutor
+    def cmd!(cmd)
+      system "#{sudo}#{cmd}"
+    end
+    
+    def cmd(cmd)
+      `#{sudo}#{cmd}`
+    end 
+    
+    private
+    def sudo
+      ENV["USER"] == "root" ? "" : "sudo "
+    end
+  end
+end

data/lib/toft/file_checker.rb

@@ -1,5 +1,10 @@
+require 'toft/command_executor'
+
 module Toft
   class FileChecker
+    
+    include Toft::CommandExecutor
+    
     def initialize(rootfs, path)
       @rootfs = rootfs
       @path = path
@@ -31,11 +36,11 @@ module Toft
     
     private 
     def stat(format)
-      `chroot #{@rootfs} stat -c #{format} #{@path}`.rstrip      
+      cmd("chroot #{@rootfs} stat -c #{format} #{@path}").rstrip      
     end
     
     def test(op)
-      system("chroot #{@rootfs} test #{op} #{@path}")
+      cmd!("chroot #{@rootfs} test #{op} #{@path}")
       $? == 0 ? true : false
     end
   end

data/lib/toft/node.rb

@@ -2,6 +2,7 @@ require 'observer'
 require 'net/ssh'
 require 'ping'
 require 'toft/file_checker'
+require 'toft/command_executor'
 
 module Toft
   class Node
@@ -39,45 +40,50 @@ CQWv13UgQjiHgQILXSb7xdzpWK1wpDoqIEWQugRyPQDeZhPWVbB4Lg==
     TRY_INTERVAL = 0.5
     
     include Observable
+    include Toft::CommandExecutor
 
-    def initialize(hostname, options)
+    def initialize(hostname, options = {})
       options = {:ip => DYNAMIC_IP, :netmask => "24", :type => "natty"}.merge(options)
       @hostname = hostname
       @ip = options[:ip]
       @netmask = options[:netmask]
       unless exists?
         conf_file = generate_lxc_config
-        system "lxc-create -n #{hostname} -f #{conf_file} -t #{options[:type].to_s}" 
+        cmd! "lxc-create -n #{hostname} -f #{conf_file} -t #{options[:type].to_s}" 
       end
       @chef_runner = Toft::Chef::ChefRunner.new("#{rootfs}") do |chef_command|
         run_ssh chef_command
       end
     end
-
+    
+    def hostname
+      return @hostname
+    end
+    
     def exists?
-      `lxc-ls` =~ /#{@hostname}/
+      cmd("lxc-ls") =~ /#{@hostname}/
     end
 
     def start
-      `lxc-start -n #{@hostname} -d`
-      `lxc-wait -n #{@hostname} -s RUNNING`
+      cmd "lxc-start -n #{@hostname} -d" # system + sudo lxc-start does not work on centos-6, but back-quote does(no clue on why)
+      cmd! "lxc-wait -n #{@hostname} -s RUNNING"
       wait_ssh_ready
     end
 
     def stop
-      `lxc-stop -n #{@hostname}`
-      `lxc-wait -n #{@hostname} -s STOPPED`
+      cmd! "lxc-stop -n #{@hostname}"
+      cmd! "lxc-wait -n #{@hostname} -s STOPPED"
     end
 
     def destroy
       stop
-      `lxc-destroy -n #{@hostname}`
+      cmd! "lxc-destroy -n #{@hostname}"
       changed
       notify_observers(@hostname)
     end
 
     def running?
-      `lxc-info -n #{@hostname}` =~ /RUNNING/
+      cmd("lxc-info -n #{@hostname}") =~ /RUNNING/
     end
     
     def add_cname(cname)
@@ -92,7 +98,7 @@ CQWv13UgQjiHgQILXSb7xdzpWK1wpDoqIEWQugRyPQDeZhPWVbB4Lg==
       raise ArgumentError, "Trying to run empty command on node #{@hostname}", caller if command.blank?
       stdout = ""
       stderr = ""
-      Net::SSH.start(fqdn, "root", :key_data => [PRIVATE_KEY]) do |ssh|
+      Net::SSH.start(fqdn, "root", :key_data => [PRIVATE_KEY], :paranoid => false) do |ssh|
         ssh.open_channel do |channel|
           channel.exec(command) do |ch, success|
             raise RuntimeError, "Could not execute command: [#{command}]", caller unless success
@@ -122,7 +128,7 @@ CQWv13UgQjiHgQILXSb7xdzpWK1wpDoqIEWQugRyPQDeZhPWVbB4Lg==
     
     def rm(dir)
       raise ArgumentError, "Illegal dir path: [#{dir}]", caller if dir.blank? || dir[0] != ?/
-      system "rm -rf #{rootfs}#{dir}"
+      cmd! "rm -rf #{rootfs}#{dir}"
     end
 
     def run_chef(run_list, params = {})
@@ -144,7 +150,7 @@ CQWv13UgQjiHgQILXSb7xdzpWK1wpDoqIEWQugRyPQDeZhPWVbB4Lg==
     
     def wait_sshd_running
       while true
-        netstat = `lxc-netstat --name #{@hostname} -ta`        
+        netstat = cmd("lxc-netstat --name #{@hostname} -ta")        
         return if netstat =~ /ssh/
       end
     end

data/lib/toft/version.rb

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

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

@@ -12,18 +12,6 @@ netmask="255.255.255.0"
 range="192.168.20.2 192.168.20.254"
 domain=foo
 
-
-# intsall lxc
-if [[ ! -f /usr/bin/lxc-ls ]]; then
-	(cd /tmp && \
-	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 --with-config-path=/var/lib/lxc && \
-	make && \
-	make install)
-fi
-
 # setup bridge interface
 if [[ ! `ip link ls dev br0` ]]; then
 	brctl addbr br0

data/scripts/bin/share/lxc-create-centos-image

@@ -28,6 +28,9 @@ if [ -e "$cache/$suite-$arch.tar.gz" ]; then
 	exit 0
 fi
 
+# clean the cache dir
+rm -rf $cache/$suite-$arch
+
 # install latest rinse
 if [[ ! `type rinse` ]]; then
 	echo "Rinse does not exist. Installing..."
@@ -53,5 +56,5 @@ rinse --config /etc/rinse/rinse.conf \
 
 # compress root image
 echo "Packaging rootfs ..."
-(cd $cache/$suite-$arch && tar zcf $suite-$arch.tar.gz .)
-mv $cache/$suite-$arch/$suite-$arch.tar.gz $cache
+(cd $cache/$suite-$arch && tar --exclude=$suite-$arch.tar.gz -zcf $suite-$arch.tar.gz .)
+mv $cache/$suite-$arch/$suite-$arch.tar.gz $cache

data/scripts/bin/ubuntu/lxc-create-ubuntu-image

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ $# -eq 0 ]; then
-	echo "Usage: `basename $0` <sid|wheeze|squeeze|lenny|lucid|maverick|natty>"
+	echo "Usage: `basename $0` <lenny|lucid|natty>"
 	exit 1
 fi
 
@@ -28,6 +28,10 @@ if [ -e "$cache/$suite-$arch.tar.gz" ]; then
 	exit 0
 fi
 
+# clean the cache dir
+rm -rf $cache/$suite-$arch
+
+lenny_packages=ifupdown,locales,libui-dialog-perl,netbase,net-tools,dialog,apt,apt-utils,resolvconf,iproute,inetutils-ping,dnsutils,dhcp3-client,ssh,lsb-release,wget,gpgv,gnupg,sudo,ruby,rubygems1.8,ruby-dev,libopenssl-ruby,build-essential,ssl-cert
 lucid_packages=dialog,apt,apt-utils,resolvconf,iproute,inetutils-ping,dnsutils,dhcp3-client,ssh,lsb-release,wget,gpgv,gnupg,sudo,ruby,rubygems1.8,ruby-dev,libopenssl-ruby,build-essential,ssl-cert
 natty_packages=dialog,apt,apt-utils,resolvconf,iproute,inetutils-ping,dnsutils,isc-dhcp-client,isc-dhcp-common,ssh,lsb-release,gnupg,netbase,lxcguest,sudo,ruby,rubygems1.8,ruby-dev,libruby,build-essential,wget,ssl-cert
 # check the mini ubuntu was not already downloaded
@@ -69,7 +73,5 @@ chroot "$cache/$suite-$arch" bash /tmp/install-chef-ubuntu.sh
 
 # compress root image
 echo "Packaging rootfs ..."
-(cd $cache/$suite-$arch && tar zcf $suite-$arch.tar.gz .)
+(cd $cache/$suite-$arch && tar --exclude=$suite-$arch.tar.gz -zcf $suite-$arch.tar.gz .)
 mv $cache/$suite-$arch/$suite-$arch.tar.gz $cache
-
-

data/scripts/{cookbooks/lxc/templates/default/lxc-natty → lxc-templates/lxc-lenny}

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo "Creating natty node..."
+echo "Creating lenny node..."
 
 configure_ubuntu()
 {
@@ -18,20 +18,7 @@ configure_ubuntu()
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCguB7XL3ARzLZYLsIMZe4UUO371m+H5C6V8MhtmSlgXtgHDo7eZhNSm5zCeoyGd32OKeLxuxCCEkXfDDF1aa2a6twcASE3pmWNdnBS7auiOH4P7g+eQ4Aw9v7DdESbIVgHF/NDiAEFFdmApYNM3oCX2FhEVNVKxkkIokUr4axYFJzmJ6Xoi5Sd8JtPC85FZVXqDucZDnHQlOcCkbSo0UOmsWQGwtu8eUHoDeUG0dB8ntb9xlBeLctdrAPhuFYCX8IfFkdcakkzv61ETPbKE6g9wdTDC/TEep7/AHGYmarziRnwKiVOL1jnE1coOJLqy8wOC3dKGmRZy9D4sTc+FRV root insecure public key
 	EOF
 
-	# copy host resolve 
-    rm $rootfs/etc/resolv.conf
-    cp /etc/resolv.conf $rootfs/etc/resolv.conf
-
-	# add default route to host
-	cat <<EOF > $rootfs/etc/rc.local
-#!/bin/sh -e
-route add default gw <%= node.network.gateway_ip %>
-exit 0
-EOF
-
-    # disable selinux in ubuntu
-    mkdir -p $rootfs/selinux
-    echo 0 > $rootfs/selinux/enforce
+	cp /usr/lib/lxc/templates/files/rc.local $rootfs/etc/rc.local
 
     # set the hostname
     cat <<EOF > $rootfs/etc/hostname
@@ -42,12 +29,33 @@ EOF
 127.0.0.1 localhost $hostname
 EOF
 
-    # suppress log level output for udev
-	sed -i "s/=\"err\"/=0/" $rootfs/etc/udev/udev.conf
+    cat <<EOF > $rootfs/etc/inittab
+id:3:initdefault:
+si::sysinit:/etc/init.d/rcS
+l0:0:wait:/etc/init.d/rc 0
+l1:1:wait:/etc/init.d/rc 1
+l2:2:wait:/etc/init.d/rc 2
+l3:3:wait:/etc/init.d/rc 3
+l4:4:wait:/etc/init.d/rc 4
+l5:5:wait:/etc/init.d/rc 5
+l6:6:wait:/etc/init.d/rc 6
+# Normally not reached, but fallthrough in case of emergency.
+z6:6:respawn:/sbin/sulogin
+1:2345:respawn:/sbin/getty 38400 console
+c1:12345:respawn:/sbin/getty 38400 tty1 linux
+c2:12345:respawn:/sbin/getty 38400 tty2 linux
+c3:12345:respawn:/sbin/getty 38400 tty3 linux
+c4:12345:respawn:/sbin/getty 38400 tty4 linux
+EOF
 
-	# remove jobs for consoles 5 and 6 since we only create 4 consoles in
-	# this template
-	rm -f $rootfs/etc/init/tty{5,6}.conf
+    # reconfigure some services
+    if [ -z "$LANG" ]; then
+		chroot $rootfs locale-gen en_US.UTF-8
+		chroot $rootfs update-locale LANG=en_US.UTF-8
+    else
+		chroot $rootfs locale-gen $LANG
+		chroot $rootfs update-locale LANG=$LANG
+    fi
 
     echo "Set root password to 'root'"
     echo "root:root" | chroot $rootfs chpasswd
@@ -64,7 +72,7 @@ copy_ubuntu()
     # make a local copy of the miniubuntu
     echo "Extracting rootfs image to $rootfs ..."
     mkdir $rootfs
-    tar zxf $cache/natty-$arch.tar.gz -C $rootfs || return 1
+    tar zxf $cache/lenny-$arch.tar.gz -C $rootfs || return 1
     return 0
 }
 
@@ -131,8 +139,8 @@ lxc.cgroup.devices.allow = c 1:5 rwm
 # consoles
 lxc.cgroup.devices.allow = c 5:1 rwm
 lxc.cgroup.devices.allow = c 5:0 rwm
-# lxc.cgroup.devices.allow = c 4:0 rwm
-# lxc.cgroup.devices.allow = c 4:1 rwm
+lxc.cgroup.devices.allow = c 4:0 rwm
+lxc.cgroup.devices.allow = c 4:1 rwm
 # /dev/{,u}random
 lxc.cgroup.devices.allow = c 1:9 rwm
 lxc.cgroup.devices.allow = c 1:8 rwm
@@ -211,12 +219,6 @@ if [ ! -z "$clean" -a -z "$path" ]; then
     exit 0
 fi
 
-type debootstrap
-if [ $? -ne 0 ]; then
-    echo "'debootstrap' command is missing"
-    exit 1
-fi
-
 if [ -z "$path" ]; then
     echo "'path' parameter is required"
     exit 1

data/scripts/lxc-templates/lxc-lucid

@@ -20,10 +20,6 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCguB7XL3ARzLZYLsIMZe4UUO371m+H5C6V8MhtmSl
 
 	cp /usr/lib/lxc/templates/files/rc.local $rootfs/etc/rc.local
 
-    # disable selinux in ubuntu
-    mkdir -p $rootfs/selinux
-    echo 0 > $rootfs/selinux/enforce
-
     # set the hostname
     cat <<EOF > $rootfs/etc/hostname
 $hostname
@@ -281,12 +277,6 @@ if [ ! -z "$clean" -a -z "$path" ]; then
     exit 0
 fi
 
-type debootstrap
-if [ $? -ne 0 ]; then
-    echo "'debootstrap' command is missing"
-    exit 1
-fi
-
 if [ -z "$path" ]; then
     echo "'path' parameter is required"
     exit 1

data/scripts/lxc-templates/lxc-natty

@@ -201,12 +201,6 @@ if [ ! -z "$clean" -a -z "$path" ]; then
     exit 0
 fi
 
-type debootstrap
-if [ $? -ne 0 ]; then
-    echo "'debootstrap' command is missing"
-    exit 1
-fi
-
 if [ -z "$path" ]; then
     echo "'path' parameter is required"
     exit 1

data/spec/spec_helper.rb

@@ -3,4 +3,4 @@ $:.unshift(File.dirname(__FILE__))
 
 PROJECT_ROOT = File.dirname(__FILE__) + '/..'
 
-require 'toft'
+require 'toft'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: toft
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Huang Liang
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-20 00:00:00 Z
+date: 2011-11-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -134,29 +134,25 @@ files:
 - lib/toft.rb
 - lib/toft/chef/chef_attributes.rb
 - lib/toft/chef/chef_runner.rb
+- lib/toft/command_executor.rb
 - lib/toft/file_checker.rb
 - lib/toft/node.rb
 - lib/toft/node_controller.rb
 - lib/toft/version.rb
 - scripts/bin/centos/lxc-prepare-host
 - scripts/bin/share/install-chef-ubuntu.sh
-- scripts/bin/share/install-rvm.sh
 - scripts/bin/share/lxc-create-centos-image
 - scripts/bin/ubuntu/lxc-create-ubuntu-image
 - scripts/bin/ubuntu/lxc-prepare-host
-- scripts/cookbooks/lxc/attributes/default.rb
-- scripts/cookbooks/lxc/recipes/default.rb
-- scripts/cookbooks/lxc/templates/default/lxc-centos-6
-- scripts/cookbooks/lxc/templates/default/lxc-lucid
-- scripts/cookbooks/lxc/templates/default/lxc-natty
 - scripts/lxc-templates/files/rc.local
 - scripts/lxc-templates/lxc-centos-6
+- scripts/lxc-templates/lxc-lenny
 - scripts/lxc-templates/lxc-lucid
 - scripts/lxc-templates/lxc-natty
 - spec/fixtures/illegal_syntax.json
 - spec/spec_helper.rb
-- spec/tuft/chef_attributes_spec.rb
-- spec/tuft/chef_runner_spec.rb
+- spec/toft/chef_attributes_spec.rb
+- spec/toft/chef_runner_spec.rb
 homepage: https://github.com/exceedhl/toft
 licenses: []
 
@@ -202,5 +198,5 @@ test_files:
 - features/support/env.rb
 - spec/fixtures/illegal_syntax.json
 - spec/spec_helper.rb
-- spec/tuft/chef_attributes_spec.rb
-- spec/tuft/chef_runner_spec.rb
+- spec/toft/chef_attributes_spec.rb
+- spec/toft/chef_runner_spec.rb

data/scripts/bin/share/install-rvm.sh

@@ -1,81 +0,0 @@
-#!/bin/bash
-
-function load_rvm {
-	cat <<-EOF >> ~/.profile
-[[ -s ~/.rvm/scripts/rvm ]] && . ~/.rvm/scripts/rvm
-EOF
-	. ~/.profile
-}
-
-function install_rvm {
-  log "installing rvm"
-  bash < <(curl -s https://rvm.beginrescueend.com/install/rvm)
-  echo 'export rvm_project_rvmrc=1' >> $HOME/.rvmrc
-  load_rvm
-}
-
-function check_rvm {
-  load_rvm
-  hash rvm || install_rvm
-  log "rvm installed"
-}
-
-function fix_rvm_readline_for_macos_tiger {
-  if [[ `uname` == 'Darwin' ]] && [[ `uname -r` == 11* ]]; then
-    (cd "$HOME/.rvm/src/readline-6.0" && \
-      sed -i "" -e"s/darwin\[89\]\*\|darwin10\*/darwin\[89\]\*\|darwin1\[01\]\*/g" support/shobj-conf && \
-      ./configure --prefix="$HOME/.rvm/usr/" && \
-      make clean && \
-      make && \
-      make install)
-  fi
-}
-
-function install_xslt {
-  [[ -d "$HOME/.rvm/usr/include/libxslt" ]] || \
-    ( cd /tmp && \
-    rm -rf libxslt-1.1.26 && \
-    wget -c ftp://xmlsoft.org/libxml2/libxslt-1.1.26.tar.gz && \
-    tar -zxvf libxslt-1.1.26.tar.gz && \
-    cd libxslt-1.1.26 && \
-    ./configure --prefix="$HOME/.rvm/usr" --with-libxml-prefix="$HOME/.rvm/usr" && \
-    make && \
-    make install )
-}
-
-function install_ruby {
-  log "installing ruby"
-  rvm pkg install libxml2 && \
-  rvm pkg install openssl && \
-  rvm pkg install ncurses && \
-  rvm pkg install readline && \
-  fix_rvm_readline_for_macos_tiger && \
-  install_xslt && \
-  rvm install ruby-1.8.7-p352 -C "--with-readline-dir=$HOME/.rvm/usr --with-xml-dir=$HOME/.rvm/usr --with-openssl-dir=$HOME/.rvm/usr" && \
-  rvm use 1.8.7-p352 &&
-}
-
-function check_ruby {
-  rvm list | grep 1.8.7-p352 > /dev/null || install_ruby
-  log "ruby installed"
-}
-
-function install_bundler {
-  log "installing bundler"
-  gem sources | grep "http://rubygems.org/" || gem sources -a http://rubygems.org/ && \
-  gem sources | grep "http://gems.rubyforge.org/" || gem sources -a http://gems.rubyforge.org/ && \
-  gem install bundler --no-ri --no-rdoc
-}
-
-function check_bundler {
-  which bundle | grep 1.8.7-p352 > /dev/null || install_bundler
-  log "bundler installed"
-}
-
-function ruby_environment {
-  check_rvm && \
-  check_ruby && \
-  check_bundler
-}
-
-ruby_environment

data/scripts/cookbooks/lxc/attributes/default.rb

@@ -1 +0,0 @@
-default[:network][:gateway_ip] = "192.168.20.1"

data/scripts/cookbooks/lxc/recipes/default.rb

@@ -1,42 +0,0 @@
-%w{lxc bridge-utils debootstrap}.each do |pkg|
-  package "#{pkg}"
-end
-
-bash "set up networking" do
-  code <<-EOH
-brctl addbr br0
-ifconfig br0 #{node.network.gateway_ip} netmask 255.255.255.0 up
-iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
-sysctl -w net.ipv4.ip_forward=1
-EOH
-  not_if "ip link ls dev br0"
-end
-
-directory "/cgroup" do
-  action :create
-end
-
-mount "/cgroup" do
-  device "cgroup"
-  fstype "cgroup"
-  pass 0
-  action [:mount, :enable]
-end
-
-template "/usr/lib/lxc/templates/lxc-lucid" do
-  source "lxc-lucid"
-  mode "0755"
-  action :create
-end
-
-template "/usr/lib/lxc/templates/lxc-natty" do
-  source "lxc-natty"
-  mode "0755"
-  action :create
-end
-
-template "/usr/lib/lxc/templates/lxc-centos-6" do
-  source "lxc-centos-6"
-  mode "0755"
-  action :create
-end

data/scripts/cookbooks/lxc/templates/default/lxc-centos-6

@@ -1,287 +0,0 @@
-#!/bin/bash
-
-echo "Creating centos-6 node..."
-
-configure_centos()
-{
-    rootfs=$1
-    hostname=$2
-
-	# disable selinux in centos
-    mkdir -p $rootfs/selinux
-    echo 0 > $rootfs/selinux/enforce
-
-	# add host root ssh access
-    mkdir $rootfs/root/.ssh
-    chmod 0600 $rootfs/root/.ssh
-	cat <<-EOF > $rootfs/root/.ssh/authorized_keys
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCguB7XL3ARzLZYLsIMZe4UUO371m+H5C6V8MhtmSlgXtgHDo7eZhNSm5zCeoyGd32OKeLxuxCCEkXfDDF1aa2a6twcASE3pmWNdnBS7auiOH4P7g+eQ4Aw9v7DdESbIVgHF/NDiAEFFdmApYNM3oCX2FhEVNVKxkkIokUr4axYFJzmJ6Xoi5Sd8JtPC85FZVXqDucZDnHQlOcCkbSo0UOmsWQGwtu8eUHoDeUG0dB8ntb9xlBeLctdrAPhuFYCX8IfFkdcakkzv61ETPbKE6g9wdTDC/TEep7/AHGYmarziRnwKiVOL1jnE1coOJLqy8wOC3dKGmRZy9D4sTc+FRV root insecure public key
-	EOF
-
-	# copy host resolve 
-    cp /etc/resolv.conf $rootfs/etc/resolv.conf
-
-	# add default route to host
-	cat <<EOF > $rootfs/etc/rc.local
-#!/bin/sh -e
-route add default gw <%= node.network.gateway_ip %>
-exit 0
-EOF
-
-    # set the hostname
-    cat <<EOF > $rootfs/etc/hostname
-$hostname
-EOF
-    # set minimal hosts
-    cat <<EOF > $rootfs/etc/hosts
-127.0.0.1 localhost $hostname
-EOF
-
-    cat <<EOF > $rootfs/etc/init/console.conf
-# console - mingetty
-#
-# This service maintains a console on tty1 from the point the system is
-# started until it is shut down again.
-
-start on stopped rc RUNLEVEL=[2345]
-stop on runlevel [!2345]
-
-respawn
-exec /sbin/mingetty console
-EOF
-
-	cat <<EOF > $rootfs/etc/fstab
-none /dev/pts devpts defaults 0 0
-EOF
-
-	[ ! -f $rootfs/etc/init/kexec-disable.conf ] || mv $rootfs/etc/init/kexec-disable.conf $rootfs/etc/init/kexec-disable.conf.orig
-	sed -i -e 's:/sbin/start_udev:#/sbin/start_udev:' $rootfs/etc/rc.d/rc.sysinit
-	
-	sed -i -e 's:\(Defaults *requiretty\):# \1:' $rootfs/etc/sudoers
-		
-	# create necessary devices
-	rm $rootfs/dev/null
-	mknod -m 666 $rootfs/dev/null c 1 3
-	mknod -m 666 $rootfs/dev/random c 1 8
-	mknod -m 666 $rootfs/dev/urandom c 1 9
-	mkdir -m 755 $rootfs/dev/pts
-	mknod -m 666 $rootfs/dev/tty c 5 0
-	mknod -m 666 $rootfs/dev/tty0 c 4 0
-	mknod -m 666 $rootfs/dev/tty1 c 4 1
-	mknod -m 666 $rootfs/dev/tty2 c 4 2
-	mknod -m 666 $rootfs/dev/tty3 c 4 3
-	mknod -m 666 $rootfs/dev/tty4 c 4 4
-	mknod -m 600 $rootfs/dev/console c 5 1
-	mknod -m 666 $rootfs/dev/full c 1 7
-	mknod -m 600 $rootfs/dev/initctl p
-
-	# change root password
-    echo "Set root password to 'root'"
-    echo "root:root" | chroot $rootfs chpasswd
-
-    return 0
-}
-
-copy_centos()
-{
-    cache=$1
-    arch=$2
-    rootfs=$3
-
-    # make a local copy of the minicentos
-    echo "Extracting rootfs image to $rootfs ..."
-    mkdir $rootfs
-    tar zxf $cache/centos-6-$arch.tar.gz -C $rootfs || return 1
-    return 0
-}
-
-install_centos()
-{
-    cache="/var/cache/lxc"
-    rootfs=$1
-    mkdir -p /var/lock/subsys/
-    (
-	flock -n -x 200
-	if [ $? -ne 0 ]; then
-	    echo "Cache repository is busy."
-	    return 1
-	fi
-
-	arch=$(arch)
-	if [ "$arch" == "x86_64" ]; then
-	    arch=amd64
-	fi
-
-	if [ "$arch" == "i686" ]; then
-	    arch=i386
-	fi
-
-	echo "Checking image cache in $cache/rootfs-$arch ... "
-	if [ ! -e "$cache/rootfs-$arch" ]; then
-	    if [ $? -ne 0 ]; then
-		echo "Failed to download 'centos base'"
-		return 1
-	    fi
-	fi
-
-	copy_centos $cache $arch $rootfs
-	if [ $? -ne 0 ]; then
-	    echo "Failed to copy rootfs"
-	    return 1
-	fi
-
-	return 0
-
-	) 200>/var/lock/subsys/lxc
-
-    return $?
-}
-
-copy_configuration()
-{
-    path=$1
-    rootfs=$2
-    name=$3
-
-    cat <<EOF >> $path/config
-lxc.utsname = $name
-
-lxc.tty = 4
-lxc.pts = 1024
-lxc.rootfs = $rootfs
-lxc.mount  = $path/fstab
-
-lxc.cgroup.devices.deny = a
-
-lxc.cgroup.devices.allow = b 1:0 rwm
-lxc.cgroup.devices.allow = b 1:1 rwm
-lxc.cgroup.devices.allow = c 1:1 rwm
-lxc.cgroup.devices.allow = c 1:2 rwm
-lxc.cgroup.devices.allow = c 1:4 rwm
-lxc.cgroup.devices.allow = c 1:6 rwm
-lxc.cgroup.devices.allow = c 1:7 rwm
-lxc.cgroup.devices.allow = c 1:11 rwm
-
-lxc.cgroup.devices.allow = c 2:* rwm
-lxc.cgroup.devices.allow = c 3:* rwm
-
-# /dev/null and zero
-lxc.cgroup.devices.allow = c 1:3 rwm
-lxc.cgroup.devices.allow = c 1:5 rwm
-# consoles
-lxc.cgroup.devices.allow = c 5:1 rwm
-lxc.cgroup.devices.allow = c 5:0 rwm
-lxc.cgroup.devices.allow = c 4:0 rwm
-lxc.cgroup.devices.allow = c 4:1 rwm
-# /dev/{,u}random
-lxc.cgroup.devices.allow = c 1:9 rwm
-lxc.cgroup.devices.allow = c 1:8 rwm
-lxc.cgroup.devices.allow = c 136:* rwm
-lxc.cgroup.devices.allow = c 5:2 rwm
-# rtc
-lxc.cgroup.devices.allow = c 254:0 rwm
-EOF
-
-    cat <<EOF > $path/fstab
-proc            $rootfs/proc         proc    nodev,noexec,nosuid 0 0
-devpts          $rootfs/dev/pts      devpts defaults 0 0
-sysfs           $rootfs/sys          sysfs defaults  0 0
-EOF
-
-    if [ $? -ne 0 ]; then
-		echo "Failed to add configuration"
-		return 1
-    fi
-
-    return 0
-}
-
-clean()
-{
-    cache="/var/cache/lxc"
-
-    if [ ! -e $cache ]; then
-	exit 0
-    fi
-
-    # lock, so we won't purge while someone is creating a repository
-    (
-	flock -n -x 200
-	if [ $? != 0 ]; then
-	    echo "Cache repository is busy."
-	    exit 1
-	fi
-
-	echo -n "Purging the download cache..."
-	rm --preserve-root --one-file-system -rf $cache && echo "Done." || exit 1
-	exit 0
-
-    ) 200>/var/lock/subsys/lxc
-}
-
-usage()
-{
-    cat <<EOF
-$1 -h|--help -p|--path=<path> --clean
-EOF
-    return 0
-}
-
-options=$(getopt -o hp:n:c -l help,path:,name:,clean -- "$@")
-if [ $? -ne 0 ]; then
-    usage $(basename $0)
-    exit 1
-fi
-eval set -- "$options"
-
-while true
-do
-    case "$1" in
-	-h|--help)      usage $0 && exit 0;;
-	-p|--path)      path=$2; shift 2;;
-	-n|--name)      name=$2; shift 2;;
-	-c|--clean)     clean=$2; shift 2;;
-	--)             shift 1; break ;;
-        *)              break ;;
-    esac
-done
-
-if [ ! -z "$clean" -a -z "$path" ]; then
-    clean || exit 1
-    exit 0
-fi
-
-if [ -z "$path" ]; then
-    echo "'path' parameter is required"
-    exit 1
-fi
-
-if [ "$(id -u)" != "0" ]; then
-    echo "This script should be run as 'root'"
-    exit 1
-fi
-
-rootfs=$path/rootfs
-
-install_centos $rootfs
-if [ $? -ne 0 ]; then
-    echo "failed to install centos"
-    exit 1
-fi
-
-configure_centos $rootfs $name
-if [ $? -ne 0 ]; then
-    echo "failed to configure centos for a container"
-    exit 1
-fi
-
-copy_configuration $path $rootfs $name
-if [ $? -ne 0 ]; then
-    echo "failed write configuration file"
-    exit 1
-fi
-
-if [ ! -z $clean ]; then
-    clean || exit 1
-    exit 0
-fi

data/scripts/cookbooks/lxc/templates/default/lxc-lucid

@@ -1,332 +0,0 @@
-#!/bin/bash
-
-echo "Creating lucid node..."
-
-configure_ubuntu()
-{
-    rootfs=$1
-    hostname=$2
-
-	# disable selinux in ubuntu
-    mkdir -p $rootfs/selinux
-    echo 0 > $rootfs/selinux/enforce
-
-	# add host root ssh access
-    mkdir $rootfs/root/.ssh
-    chmod 0600 $rootfs/root/.ssh
-	cat <<-EOF > $rootfs/root/.ssh/authorized_keys
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCguB7XL3ARzLZYLsIMZe4UUO371m+H5C6V8MhtmSlgXtgHDo7eZhNSm5zCeoyGd32OKeLxuxCCEkXfDDF1aa2a6twcASE3pmWNdnBS7auiOH4P7g+eQ4Aw9v7DdESbIVgHF/NDiAEFFdmApYNM3oCX2FhEVNVKxkkIokUr4axYFJzmJ6Xoi5Sd8JtPC85FZVXqDucZDnHQlOcCkbSo0UOmsWQGwtu8eUHoDeUG0dB8ntb9xlBeLctdrAPhuFYCX8IfFkdcakkzv61ETPbKE6g9wdTDC/TEep7/AHGYmarziRnwKiVOL1jnE1coOJLqy8wOC3dKGmRZy9D4sTc+FRV root insecure public key
-	EOF
-
-	# copy host resolve 
-    rm $rootfs/etc/resolv.conf
-    cp /etc/resolv.conf $rootfs/etc/resolv.conf
-
-	# add default route to host
-	cat <<EOF > $rootfs/etc/rc.local
-#!/bin/sh -e
-route add default gw <%= node.network.gateway_ip %>
-exit 0
-EOF
-
-    # disable selinux in ubuntu
-    mkdir -p $rootfs/selinux
-    echo 0 > $rootfs/selinux/enforce
-
-    # set the hostname
-    cat <<EOF > $rootfs/etc/hostname
-$hostname
-EOF
-    # set minimal hosts
-    cat <<EOF > $rootfs/etc/hosts
-127.0.0.1 localhost $hostname
-EOF
-
-    # provide the lxc service
-    cat <<EOF > $rootfs/etc/init/lxc.conf
-# fake some events needed for correct startup other services
-
-description     "Container Upstart"
-
-start on startup
-
-script
-        rm -rf /var/run/*.pid
-        rm -rf /var/run/network/*
-        /sbin/initctl emit stopped JOB=udevtrigger --no-wait
-        /sbin/initctl emit started JOB=udev --no-wait
-end script
-EOF
-
-    # fix buggus runlevel with sshd
-    cat <<EOF > $rootfs/etc/init/ssh.conf
-# ssh - OpenBSD Secure Shell server
-#
-# The OpenSSH server provides secure shell access to the system.
-
-description	"OpenSSH server"
-
-start on filesystem
-stop on runlevel [!2345]
-
-expect fork
-respawn
-respawn limit 10 5
-umask 022
-# replaces SSHD_OOM_ADJUST in /etc/default/ssh
-oom never
-
-pre-start script
-    test -x /usr/sbin/sshd || { stop; exit 0; }
-    test -e /etc/ssh/sshd_not_to_be_run && { stop; exit 0; }
-    test -c /dev/null || { stop; exit 0; }
-
-    mkdir -p -m0755 /var/run/sshd
-end script
-
-# if you used to set SSHD_OPTS in /etc/default/ssh, you can change the
-# 'exec' line here instead
-exec /usr/sbin/sshd
-EOF
-
-    cat <<EOF > $rootfs/etc/init/console.conf
-# console - getty
-#
-# This service maintains a console on tty1 from the point the system is
-# started until it is shut down again.
-
-start on stopped rc RUNLEVEL=[2345]
-stop on runlevel [!2345]
-
-respawn
-exec /sbin/getty -8 38400 /dev/console
-EOF
-
-    cat <<EOF > $rootfs/lib/init/fstab
-# /lib/init/fstab: lxc system fstab
-none            /spu                      spufs           gid=spu,optional                  0 0
-none            /tmp                      none            defaults                          0 0
-none            /var/lock                 tmpfs           nodev,noexec,nosuid,showthrough   0 0
-none            /lib/init/rw              tmpfs           mode=0755,nosuid,optional         0 0
-EOF
-
-    # reconfigure some services
-    if [ -z "$LANG" ]; then
-		chroot $rootfs locale-gen en_US.UTF-8
-		chroot $rootfs update-locale LANG=en_US.UTF-8
-    else
-		chroot $rootfs locale-gen $LANG
-		chroot $rootfs update-locale LANG=$LANG
-    fi
-
-    # remove pointless services in a container
-    chroot $rootfs /usr/sbin/update-rc.d -f ondemand remove
-
-    chroot $rootfs /bin/bash -c 'cd /etc/init; for f in $(ls u*.conf); do mv $f $f.orig; done'
-    chroot $rootfs /bin/bash -c 'cd /etc/init; for f in $(ls tty[2-9].conf); do mv $f $f.orig; done'
-    chroot $rootfs /bin/bash -c 'cd /etc/init; for f in $(ls plymouth*.conf); do mv $f $f.orig; done'
-    chroot $rootfs /bin/bash -c 'cd /etc/init; for f in $(ls hwclock*.conf); do mv $f $f.orig; done'
-    chroot $rootfs /bin/bash -c 'cd /etc/init; for f in $(ls module*.conf); do mv $f $f.orig; done'
-
-    echo "Set root password to 'root'"
-    echo "root:root" | chroot $rootfs chpasswd
-
-    return 0
-}
-
-copy_ubuntu()
-{
-    cache=$1
-    arch=$2
-    rootfs=$3
-
-    # make a local copy of the miniubuntu
-    echo "Extracting rootfs image to $rootfs ..."
-    mkdir $rootfs
-    tar zxf $cache/lucid-$arch.tar.gz -C $rootfs || return 1
-    return 0
-}
-
-install_ubuntu()
-{
-    cache="/var/cache/lxc"
-    rootfs=$1
-    mkdir -p /var/lock/subsys/
-    (
-	flock -n -x 200
-	if [ $? -ne 0 ]; then
-	    echo "Cache repository is busy."
-	    return 1
-	fi
-
-	arch=$(arch)
-	if [ "$arch" == "x86_64" ]; then
-	    arch=amd64
-	fi
-
-	if [ "$arch" == "i686" ]; then
-	    arch=i386
-	fi
-
-	echo "Checking image cache in $cache/rootfs-$arch ... "
-	if [ ! -e "$cache/rootfs-$arch" ]; then
-	    if [ $? -ne 0 ]; then
-		echo "Failed to download 'ubuntu base'"
-		return 1
-	    fi
-	fi
-
-	copy_ubuntu $cache $arch $rootfs
-	if [ $? -ne 0 ]; then
-	    echo "Failed to copy rootfs"
-	    return 1
-	fi
-
-	return 0
-
-	) 200>/var/lock/subsys/lxc
-
-    return $?
-}
-
-copy_configuration()
-{
-    path=$1
-    rootfs=$2
-    name=$3
-
-    cat <<EOF >> $path/config
-lxc.utsname = $name
-
-lxc.tty = 4
-lxc.pts = 1024
-lxc.rootfs = $rootfs
-lxc.mount  = $path/fstab
-
-lxc.cgroup.devices.deny = a
-# /dev/null and zero
-lxc.cgroup.devices.allow = c 1:3 rwm
-lxc.cgroup.devices.allow = c 1:5 rwm
-# consoles
-lxc.cgroup.devices.allow = c 5:1 rwm
-lxc.cgroup.devices.allow = c 5:0 rwm
-lxc.cgroup.devices.allow = c 4:0 rwm
-lxc.cgroup.devices.allow = c 4:1 rwm
-# /dev/{,u}random
-lxc.cgroup.devices.allow = c 1:9 rwm
-lxc.cgroup.devices.allow = c 1:8 rwm
-lxc.cgroup.devices.allow = c 136:* rwm
-lxc.cgroup.devices.allow = c 5:2 rwm
-# rtc
-lxc.cgroup.devices.allow = c 254:0 rwm
-EOF
-
-    cat <<EOF > $path/fstab
-proc            $rootfs/proc         proc    nodev,noexec,nosuid 0 0
-devpts          $rootfs/dev/pts      devpts defaults 0 0
-sysfs           $rootfs/sys          sysfs defaults  0 0
-EOF
-
-    if [ $? -ne 0 ]; then
-	echo "Failed to add configuration"
-	return 1
-    fi
-
-    return 0
-}
-
-clean()
-{
-    cache="/var/cache/lxc"
-
-    if [ ! -e $cache ]; then
-	exit 0
-    fi
-
-    # lock, so we won't purge while someone is creating a repository
-    (
-	flock -n -x 200
-	if [ $? != 0 ]; then
-	    echo "Cache repository is busy."
-	    exit 1
-	fi
-
-	echo -n "Purging the download cache..."
-	rm --preserve-root --one-file-system -rf $cache && echo "Done." || exit 1
-	exit 0
-
-    ) 200>/var/lock/subsys/lxc
-}
-
-usage()
-{
-    cat <<EOF
-$1 -h|--help -p|--path=<path> --clean
-EOF
-    return 0
-}
-
-options=$(getopt -o hp:n:c -l help,path:,name:,clean -- "$@")
-if [ $? -ne 0 ]; then
-    usage $(basename $0)
-    exit 1
-fi
-eval set -- "$options"
-
-while true
-do
-    case "$1" in
-	-h|--help)      usage $0 && exit 0;;
-	-p|--path)      path=$2; shift 2;;
-	-n|--name)      name=$2; shift 2;;
-	-c|--clean)     clean=$2; shift 2;;
-	--)             shift 1; break ;;
-        *)              break ;;
-    esac
-done
-
-if [ ! -z "$clean" -a -z "$path" ]; then
-    clean || exit 1
-    exit 0
-fi
-
-type debootstrap
-if [ $? -ne 0 ]; then
-    echo "'debootstrap' command is missing"
-    exit 1
-fi
-
-if [ -z "$path" ]; then
-    echo "'path' parameter is required"
-    exit 1
-fi
-
-if [ "$(id -u)" != "0" ]; then
-    echo "This script should be run as 'root'"
-    exit 1
-fi
-
-rootfs=$path/rootfs
-
-install_ubuntu $rootfs
-if [ $? -ne 0 ]; then
-    echo "failed to install ubuntu"
-    exit 1
-fi
-
-configure_ubuntu $rootfs $name
-if [ $? -ne 0 ]; then
-    echo "failed to configure ubuntu for a container"
-    exit 1
-fi
-
-copy_configuration $path $rootfs $name
-if [ $? -ne 0 ]; then
-    echo "failed write configuration file"
-    exit 1
-fi
-
-if [ ! -z $clean ]; then
-    clean || exit 1
-    exit 0
-fi