pauper 0.2.0 → 0.2.1

data/lib/pauper.rb

@@ -20,6 +20,7 @@ require 'pauper/version'
 class Pauper
   DEFAULT_PAUPERFILE = './Pauperfile'
   DEFAULT_VM_PATH = File.expand_path('/var/lib/lxc/')
+  SUPPORTED_RELEASES = [:lucid, :precise]
 
   def initialize(ignore_network = false, pauperfile = DEFAULT_PAUPERFILE)
     if root?
@@ -39,37 +40,69 @@ class Pauper
     @pauper_config
   end
 
-  def bootstrap
-    raise "Base already exists!" if vm_exists?("base")
+  def self.version
+    puts "Pauper v#{VERSION}"
+  end
+
+  def self.grok_release(release_s)
+    release = release_s.intern
+    raise "Unsupported release '#{release_s}'" unless SUPPORTED_RELEASES.include?(release)
+    release
+  end
+
+  def get_base_name(release)
+    case Pauper.grok_release(release)
+    when :lucid
+      'base'
+    when :precise
+      'base-precise'
+    else
+      raise "Unsupported release #{release}"
+    end
+  end
+
+  def get_base_ip(base_name)
+    if base_name == 'base'
+      return @pauper_config.config[:subnet] + '.2'
+    elsif base_name == 'base-precise'
+      return @pauper_config.config[:subnet] + '.3'
+    end
+  end
+
+  def bootstrap(release)
+    release = Pauper.grok_release(release)
+    base_name = get_base_name(release)
+
+    raise "Base '#{base_name}' already exists!" if vm_exists?(base_name)
 
-    ip = "#{@pauper_config.config[:subnet]}.2"
-    ssh_clean_known_hosts('base', ip)
+    ip = get_base_ip(base_name)
+    ssh_clean_known_hosts(base_name, ip)
     @pauper_config.config[:nodes].each { |n| ssh_clean_known_hosts(n.name, "#{@pauper_config.config[:subnet]}.#{n.config[:last_octet]}") }
 
     lxc_pauper_template
     system("sudo touch /var/lib/lxc/lxc.conf")
-    system("sudo lxc-create -n base -t pauper -f /var/lib/lxc/lxc.conf -- -a amd64 --auth-key #{public_ssh_key} -r lucid")
+    system("sudo lxc-create -n #{base_name} -t pauper -f /var/lib/lxc/lxc.conf -- -a amd64 --auth-key #{public_ssh_key} -r #{release}")
     mac = generate_mac
 
-    lxc = LXC.new('base')
+    lxc = LXC.new(base_name)
     lxc.interface = @pauper_config.config[:bridge]
     lxc.mac = mac
     lxc.save
 
-    prepare_fstab('base')
-    prepare_vm_network('base',ip)
-    prepare_base_cache
+    prepare_fstab(base_name, release)
+    prepare_vm_network(base_name,ip)
+    prepare_base_cache(release)
 
     puts "Installing chef..."
-    cmd "sudo chroot /var/lib/lxc/base/rootfs/ bash -c 'wget #{@pauper_config.config[:chef_download_url]}/#{@pauper_config.config[:chef_deb_name]} && dpkg -i #{@pauper_config.config[:chef_deb_name]}; rm #{@pauper_config.config[:chef_deb_name]}'"
+    cmd "sudo chroot /var/lib/lxc/#{base_name}/rootfs/ bash -c 'wget #{@pauper_config.config[:chef_download_url][release]}/#{@pauper_config.config[:chef_deb_name][release]} && dpkg -i #{@pauper_config.config[:chef_deb_name][release]}; rm #{@pauper_config.config[:chef_deb_name][release]}'"
 
-    start_node('base')
+    start_node(base_name)
     sleep 3
 
-    chef_node = "base#{@pauper_config.config[:node_suffix]}"
+    chef_node = "#{base_name}#{@pauper_config.config[:node_suffix]}"
     cmd "knife bootstrap --bootstrap-version chef-full -N #{chef_node} -E #{@pauper_config.config[:chef_environment]} -x root -r \"#{@pauper_config.config[:default_run_list].join(",")}\" #{ip}"
 
-    stop_node('base')
+    stop_node(base_name)
   end
 
   def username
@@ -89,9 +122,14 @@ class Pauper
     ssh_key + ".pub"
   end
 
-  def prepare_fstab(node_name)
+  def get_share_release(options)
+    options[:release] || :lucid
+  end
+
+  def prepare_fstab(node_name, release)
     File.open('.tmp.fstab','w') do |f|
       @pauper_config.config[:shares].each do |share_name, guest_path, host_path, options|
+        next if get_share_release(options) != release
         f.puts "#{host_path} #{DEFAULT_VM_PATH}/#{node_name}/rootfs/#{guest_path} none defaults,bind 0 0"
       end
     end
@@ -117,12 +155,15 @@ class Pauper
     system "sudo mv .tmp.resolv.conf #{DEFAULT_VM_PATH}/#{node_name}/rootfs/etc/resolv.conf"
   end
 
-  def prepare_base_cache
-    @pauper_config.config[:shares].each do |share_name, guest_path, host_path, options|
+  def prepare_base_cache(release)
+    base_name = get_base_name(release)
+    shares = @pauper_config.config[:shares]
+    shares.each do |share_name, guest_path, host_path, options|
+      next if get_share_release(options) != release
       cmd "sudo mkdir -p #{host_path}"
-      cmd "sudo mkdir -p /var/lib/lxc/base/rootfs#{guest_path}"
+      cmd "sudo mkdir -p /var/lib/lxc/#{base_name}/rootfs#{guest_path}"
     end
-    cmd "sudo mkdir -p /var/cache/lxc/lucid/cache/apt/partial"
+    cmd "sudo mkdir -p /var/cache/lxc/#{release}/cache/apt/partial"
   end
 
   def reconfigure_ssh(node_name)
@@ -134,8 +175,16 @@ class Pauper
 
     raise "VM already exists!" if vm_exists?(node_name)
 
-    puts "Cloning base..."
-    clone_base(node_name)
+    release = node_config.config[:release]
+    base_name = get_base_name(release)
+
+    unless vm_exists?(base_name)
+      puts "Bootstrapping base '#{base_name}' for release '#{release}'"
+      bootstrap(release)
+    end
+
+    puts "Cloning #{base_name}..."
+    clone_base(base_name, node_name)
     mac = generate_mac
     ip = "#{@pauper_config.config[:subnet]}.#{node_config.config[:last_octet]}"
 
@@ -144,24 +193,26 @@ class Pauper
     lxc.mac = mac
     lxc.save
 
-    prepare_fstab(node_name)
+    prepare_fstab(node_name, release)
     prepare_vm_network(node_name,ip)
     reconfigure_ssh(node_name)
     puts "Starting..."
     start_node(node_name)
     sleep 3
+    write_hosts
     setup(node_name)
   end
 
   def setup(node_name)
     node_config = get_node_config(node_name)
+    release = node_config.config[:release]
     config = @pauper_config.config
     puts "Setting up #{node_name}..."
     client_erb = ERB.new <<EOF
 node_name              "<%= chef_node %>"
 chef_server_url        "<%= config[:chef_server_url] %>"
-chef_download_url      "<%= config[:chef_download_url] %>"
-chef_deb_name          "<%= config[:chef_deb_name] %>"
+chef_download_url      "<%= config[:chef_download_url][release] %>"
+chef_deb_name          "<%= config[:chef_deb_name][release] %>"
 validation_client_name "<%= config[:validation_client_name] %>"
 environment            "<%= config[:chef_environment] %>"
 verbose_logging        false
@@ -207,9 +258,8 @@ EOF
   end
 
   def destroy(node_name)
-    if node_name == 'base'
-      ip = @pauper_config.config[:subnet] + '.2'
-    else
+    ip = get_base_ip(node_name)
+    if ip.nil?
       node_config = get_node_config(node_name)
       ip = node_ip(node_config)
     end
@@ -225,6 +275,7 @@ EOF
       puts "Destroying #{node_name}..."
       cmd "sudo lxc-destroy -n '#{node_name}' >> pauper.log 2>&1"
       ssh_clean_known_hosts(node_name, ip)
+      write_hosts
     else
       puts "#{node_name} hasn't even been created yet, thusly you can't destroy it!"
     end
@@ -273,7 +324,9 @@ EOF
   def write_hosts
     puts "Writing /etc/hosts file..."
     hosts = Hosts.new
+    hosts.config.clear
     @pauper_config.config[:nodes].each do |node|
+      next unless vm_exists?(node.name)
       hosts.config[node_ip(node)] = node.name
     end
     hosts.save(@pauper_config.config[:dev_domain])
@@ -474,7 +527,10 @@ EOF
 
   def cmd(*args)
     puts ["local>", *args].join(" ")
-    system *args
+    ok = system *args
+    if not ok
+      raise "shell command '"+args.join(" ")+"' failed"
+    end
   end
 
   def ssh_clean_known_hosts(hostname, ip)
@@ -505,11 +561,11 @@ EOF
     `sudo lxc-info -n '#{node_name}'`.include?("FROZEN")
   end
 
-  def clone_base(node_name)
-    cmd "sudo cp -ax #{DEFAULT_VM_PATH}/base #{DEFAULT_VM_PATH}/#{node_name}"
-    cmd "sudo rm #{DEFAULT_VM_PATH}/#{node_name}/rootfs/etc/chef/client.pem"
-    cmd "sudo rm #{DEFAULT_VM_PATH}/#{node_name}/rootfs/etc/ssh/ssh*key*"
-    cmd "sudo sed -i \"s/base/#{node_name}/g\" /var/lib/lxc/#{node_name}/rootfs/etc/hostname /var/lib/lxc/#{node_name}/rootfs/etc/chef/client.rb"
+  def clone_base(base_name, node_name)
+    cmd "sudo cp -ax #{DEFAULT_VM_PATH}/#{base_name} #{DEFAULT_VM_PATH}/#{node_name}"
+    cmd "sudo rm -f #{DEFAULT_VM_PATH}/#{node_name}/rootfs/etc/chef/client.pem"
+    cmd "sudo rm -f #{DEFAULT_VM_PATH}/#{node_name}/rootfs/etc/ssh/ssh*key*"
+    cmd "sudo sed -i \"s/#{base_name}/#{node_name}/g\" /var/lib/lxc/#{node_name}/rootfs/etc/hostname /var/lib/lxc/#{node_name}/rootfs/etc/chef/client.rb"
   end
 
   def vm_config(node_name)
@@ -553,637 +609,15 @@ EOF
     File.dirname(@pauper_config.config[:vmx])
   end
 
-    def lxc_pauper_template
-      @template = <<TEMPLATE
-#!/bin/bash
-
-#
-# template script for generating ubuntu container for LXC
-#
-# This script consolidates and extends the existing lxc ubuntu scripts
-#
-
-# Copyright � 2011 Serge Hallyn <serge.hallyn@canonical.com>
-# Copyright � 2010 Wilhelm Meier
-# Author: Wilhelm Meier <wilhelm.meier@fh-kl.de>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2, as
-# published by the Free Software Foundation.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-set -e
-
-if [ -r /etc/default/lxc ]; then
-    . /etc/default/lxc
-fi
-
-configure_ubuntu()
-{
-    rootfs=$1
-    hostname=$2
-    release=$3
-
-   # configure the network using the dhcp
-    cat <<EOF > $rootfs/etc/network/interfaces
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-auto eth0
-iface eth0 inet dhcp
-EOF
-
-    # set the hostname
-    cat <<EOF > $rootfs/etc/hostname
-$hostname
-EOF
-    # set minimal hosts
-    cat <<EOF > $rootfs/etc/hosts
-127.0.0.1   localhost
-127.0.1.1   $hostname
-
-# The following lines are desirable for IPv6 capable hosts
-::1     ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-EOF
-
-    if [ ! -f $rootfs/etc/init/container-detect.conf ]; then
-        # suppress log level output for udev
-        sed -i "s/=\"err\"/=0/" $rootfs/etc/udev/udev.conf
-
-        # 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
-    fi
-
-    return 0
-}
-
-# finish setting up the user in the container by injecting ssh key
-finalize_user()
-{
-    if [ -n "$auth_key" -a -f "$auth_key" ]; then
-        u_path="/root/.ssh"
-        root_u_path="$rootfs/$u_path"
-
-        mkdir -p $root_u_path
-        cp $auth_key "$root_u_path/authorized_keys"
-        chroot $rootfs chown -R root: "$u_path"
-
-        echo "Inserted SSH public key from $auth_key into /root/.ssh/authorized_keys"
-    fi
-    return 0
-}
-
-write_sourceslist()
-{
-    # $1 => path to the rootfs
-    # $2 => architecture we want to add
-    # $3 => whether to use the multi-arch syntax or not
-
-    case $2 in
-      amd64|i386)
-            MIRROR=${MIRROR:-http://mirrors.fastly.net/ubuntu}
-            SECURITY_MIRROR=${SECURITY_MIRROR:-http://mirrors.fastly.net/ubuntu}
-            ;;
-      *)
-            MIRROR=${MIRROR:-http://ports.ubuntu.com/ubuntu-ports}
-            SECURITY_MIRROR=${SECURITY_MIRROR:-http://ports.ubuntu.com/ubuntu-ports}
-            ;;
-    esac
-    if [ -n "$3" ]; then
-        cat >> "$1/etc/apt/sources.list" << EOF
-deb [arch=$2] $MIRROR ${release} main restricted universe multiverse
-deb [arch=$2] $MIRROR ${release}-updates main restricted universe multiverse
-deb [arch=$2] $SECURITY_MIRROR ${release}-security main restricted universe multiverse
-EOF
-    else
-        cat >> "$1/etc/apt/sources.list" << EOF
-deb $MIRROR ${release} main restricted universe multiverse
-deb $MIRROR ${release}-updates main restricted universe multiverse
-deb $SECURITY_MIRROR ${release}-security main restricted universe multiverse
-EOF
-    fi
-}
-
-cleanup()
-{
-    rm -rf $cache/partial-$arch
-    rm -rf $cache/rootfs-$arch
-}
-
-download_ubuntu()
-{
-    cache=$1
-    arch=$2
-    release=$3
-
-    packages=vim,ssh,curl,wget
-    echo "installing packages: $packages"
-
-    trap cleanup EXIT SIGHUP SIGINT SIGTERM
-    # check the mini ubuntu was not already downloaded
-    mkdir -p "$cache/partial-$arch"
-    if [ $? -ne 0 ]; then
-        echo "Failed to create '$cache/partial-$arch' directory"
-        return 1
-    fi
-
-    # download a mini ubuntu into a cache
-    echo "Downloading ubuntu $release minimal ..."
-    if [ -n "$(which qemu-debootstrap)" ]; then
-        qemu-debootstrap --verbose --components=main,universe --arch=$arch --include=$packages $release $cache/partial-$arch $MIRROR
-    else
-        debootstrap --verbose --components=main,universe --arch=$arch --include=$packages $release $cache/partial-$arch $MIRROR
-    fi
-
-    if [ $? -ne 0 ]; then
-        echo "Failed to download the rootfs, aborting."
-            return 1
-    fi
-
-    # Serge isn't sure whether we should avoid doing this when
-    # $release == `distro-info -d`
-    echo "Installing updates"
-    > $cache/partial-$arch/etc/apt/sources.list
-    write_sourceslist $cache/partial-$arch/ $arch
-
-    chroot "$1/partial-${arch}" apt-get update
-    if [ $? -ne 0 ]; then
-        echo "Failed to update the apt cache"
-        return 1
-    fi
-    cat > "$1/partial-${arch}"/usr/sbin/policy-rc.d << EOF
-#!/bin/sh
-exit 101
-EOF
-    chmod +x "$1/partial-${arch}"/usr/sbin/policy-rc.d
-
-    lxc-unshare -s MOUNT -- chroot "$1/partial-${arch}" apt-get dist-upgrade -y
-    ret=$?
-    rm -f "$1/partial-${arch}"/usr/sbin/policy-rc.d
-
-    if [ $ret -ne 0 ]; then
-        echo "Failed to upgrade the cache"
-        return 1
-    fi
-
-    mv "$1/partial-$arch" "$1/rootfs-$arch"
-    trap EXIT
-    trap SIGINT
-    trap SIGTERM
-    trap SIGHUP
-    echo "Download complete"
-    return 0
-}
-
-copy_ubuntu()
-{
-    cache=$1
-    arch=$2
-    rootfs=$3
-
-    # make a local copy of the miniubuntu
-    echo "Copying rootfs to $rootfs ..."
-    mkdir -p $rootfs
-    rsync -a $cache/rootfs-$arch/ $rootfs/ || return 1
-    return 0
-}
-
-install_ubuntu()
-{
-    rootfs=$1
-    release=$2
-    flushcache=$3
-    cache="/var/cache/lxc/$release"
-    mkdir -p /var/lock/subsys/
-
-    (
-        flock -x 200
-        if [ $? -ne 0 ]; then
-            echo "Cache repository is busy."
-            return 1
-        fi
-
-
-        if [ $flushcache -eq 1 ]; then
-            echo "Flushing cache..."
-            rm -rf "$cache/partial-$arch"
-            rm -rf "$cache/rootfs-$arch"
-        fi
-
-        echo "Checking cache download in $cache/rootfs-$arch ... "
-        if [ ! -e "$cache/rootfs-$arch" ]; then
-            download_ubuntu $cache $arch $release
-            if [ $? -ne 0 ]; then
-                echo "Failed to download 'ubuntu $release base'"
-                return 1
-            fi
-        fi
-
-        echo "Copy $cache/rootfs-$arch to $rootfs ... "
-        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
-    arch=$4
-    release=$5
-
-    if [ $arch = "i386" ]; then
-        arch="i686"
-    fi
-
-    ttydir=""
-    if [ -f $rootfs/etc/init/container-detect.conf ]; then
-        ttydir=" lxc"
-    fi
-
-    # if there is exactly one veth network entry, make sure it has an
-    # associated hwaddr.
-    nics=`grep -e '^lxc\.network\.type[ \t]*=[ \t]*veth' $path/config | wc -l`
-    if [ $nics -eq 1 ]; then
-        grep -q "^lxc.network.hwaddr" $path/config || cat <<EOF >> $path/config
-lxc.network.hwaddr = 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//')
-EOF
-    fi
-
-    cat <<EOF >> $path/config
-lxc.utsname = $name
-
-lxc.devttydir =$ttydir
-lxc.tty = 4
-lxc.pts = 1024
-lxc.rootfs = $rootfs
-lxc.mount  = $path/fstab
-lxc.arch = $arch
-lxc.cap.drop = sys_module mac_admin
-lxc.pivotdir = lxc_putold
-
-# uncomment the next line to run the container unconfined:
-#lxc.aa_profile = unconfined
-
-lxc.cgroup.devices.deny = a
-# Allow any mknod (but not using the node)
-lxc.cgroup.devices.allow = c *:* m
-lxc.cgroup.devices.allow = b *:* m
-# /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
-#fuse
-lxc.cgroup.devices.allow = c 10:229 rwm
-#tun
-lxc.cgroup.devices.allow = c 10:200 rwm
-#full
-lxc.cgroup.devices.allow = c 1:7 rwm
-#hpet
-lxc.cgroup.devices.allow = c 10:228 rwm
-#kvm
-lxc.cgroup.devices.allow = c 10:232 rwm
-EOF
-
-    cat <<EOF > $path/fstab
-proc            proc         proc    nodev,noexec,nosuid 0 0
-sysfs           sys          sysfs defaults  0 0
-EOF
-
-    if [ $? -ne 0 ]; then
-        echo "Failed to add configuration"
-        return 1
-    fi
-
-    return 0
-}
-
-trim()
-{
-    rootfs=$1
-    release=$2
-
-    # 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: cleared out for bare-bones lxc
-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'
-
-    # if this isn't lucid, then we need to twiddle the network upstart bits :(
-    if [ $release != "lucid" ]; then
-        sed -i 's/^.*emission handled.*$/echo Emitting lo/' $rootfs/etc/network/if-up.d/upstart
-    fi
-}
-
-post_process()
-{
-    rootfs=$1
-    release=$2
-    trim_container=$3
-
-    if [ $trim_container -eq 1 ]; then
-        trim $rootfs $release
-    elif [ ! -f $rootfs/etc/init/container-detect.conf ]; then
-        # Make sure we have a working resolv.conf
-        cresolvonf="${rootfs}/etc/resolv.conf"
-        mv $cresolvonf ${cresolvonf}.lxcbak
-        cat /etc/resolv.conf > ${cresolvonf}
-
-        # for lucid, if not trimming, then add the ubuntu-virt
-        # ppa and install lxcguest
-        if [ $release = "lucid" ]; then
-            chroot $rootfs apt-get install --force-yes -y python-software-properties
-            chroot $rootfs add-apt-repository ppa:ubuntu-virt/ppa
-        fi
-
-        chroot $rootfs apt-get update
-        chroot $rootfs apt-get install --force-yes -y lxcguest
-
-        # Restore old resolv.conf
-        rm -f ${cresolvonf}
-        mv ${cresolvonf}.lxcbak ${cresolvonf}
-    fi
-
-    # If the container isn't running a native architecture, setup multiarch
-    if [ -x "$(ls -1 ${rootfs}/usr/bin/qemu-*-static 2>/dev/null)" ]; then
-        dpkg_version=$(chroot $rootfs dpkg-query -W -f='${Version}' dpkg)
-        if chroot $rootfs dpkg --compare-versions $dpkg_version ge "1.16.2"; then
-            chroot $rootfs dpkg --add-architecture ${hostarch}
-        else
-            mkdir -p ${rootfs}/etc/dpkg/dpkg.cfg.d
-            echo "foreign-architecture ${hostarch}" > ${rootfs}/etc/dpkg/dpkg.cfg.d/lxc-multiarch
-        fi
-
-        # Save existing value of MIRROR and SECURITY_MIRROR
-        DEFAULT_MIRROR=$MIRROR
-        DEFAULT_SECURITY_MIRROR=$SECURITY_MIRROR
-
-        # Write a new sources.list containing both native and multiarch entries
-        > ${rootfs}/etc/apt/sources.list
-        write_sourceslist $rootfs $arch "native"
-
-        MIRROR=$DEFAULT_MIRROR
-        SECURITY_MIRROR=$DEFAULT_SECURITY_MIRROR
-        write_sourceslist $rootfs $hostarch "multiarch"
-
-        # Finally update the lists and install upstart using the host architecture
-        chroot $rootfs apt-get update
-        chroot $rootfs apt-get install --force-yes -y --no-install-recommends upstart:${hostarch} mountall:${hostarch} iproute:${hostarch} isc-dhcp-client:${hostarch}
-    fi
-
-    # rmdir /dev/shm for containers that have /run/shm
-    # I'm afraid of doing rm -rf $rootfs/dev/shm, in case it did
-    # get bind mounted to the host's /run/shm.  So try to rmdir
-    # it, and in case that fails move it out of the way.
-    if [ ! -L $rootfs/dev/shm ] && [ -d $rootfs/run/shm ] && [ -e $rootfs/dev/shm ]; then
-        mv $rootfs/dev/shm $rootfs/dev/shm.bak
-        ln -s /run/shm $rootfs/dev/shm
-    fi
-}
-
-usage()
-{
-    cat <<EOF
-$1 -h|--help [-a|--arch] [--trim] [-d|--debug]
-   [-F | --flush-cache] [-r|--release <release>] [ -S | --auth-key <keyfile>]
-release: the ubuntu release (e.g. precise): defaults to host release on ubuntu, otherwise uses latest LTS
-trim: make a minimal (faster, but not upgrade-safe) container
-arch: the container architecture (e.g. amd64): defaults to host arch
-auth-key: SSH Public key file to inject into container
-EOF
-    return 0
-}
-
-options=$(getopt -o a:b:hp:r:xn:FS:d -l arch:,help,path:,release:,trim,name:,flush-cache,auth-key:,debug -- "$@")
-if [ $? -ne 0 ]; then
-    usage $(basename $0)
-    exit 1
-fi
-eval set -- "$options"
-
-release=precise # Default to the last Ubuntu LTS release for non-Ubuntu systems
-if [ -f /etc/lsb-release ]; then
-    . /etc/lsb-release
-    if [ "$DISTRIB_ID" = "Ubuntu" ]; then
-        release=$DISTRIB_CODENAME
-    fi
-fi
-
-bindhome=
-arch=$(arch)
-
-# Code taken from debootstrap
-if [ -x /usr/bin/dpkg ] && /usr/bin/dpkg --print-architecture >/dev/null 2>&1; then
-    arch=`/usr/bin/dpkg --print-architecture`
-elif type udpkg >/dev/null 2>&1 && udpkg --print-architecture >/dev/null 2>&1; then
-    arch=`/usr/bin/udpkg --print-architecture`
-else
-    arch=$(arch)
-    if [ "$arch" = "i686" ]; then
-        arch="i386"
-    elif [ "$arch" = "x86_64" ]; then
-        arch="amd64"
-    elif [ "$arch" = "armv7l" ]; then
-        arch="armel"
-    fi
-fi
-
-debug=0
-trim_container=0
-hostarch=$arch
-flushcache=0
-while true
-do
-    case "$1" in
-    -h|--help)      usage $0 && exit 0;;
-    -p|--path)      path=$2; shift 2;;
-    -n|--name)      name=$2; shift 2;;
-    -F|--flush-cache) flushcache=1; shift 1;;
-    -r|--release)   release=$2; shift 2;;
-    -a|--arch)      arch=$2; shift 2;;
-    -x|--trim)      trim_container=1; shift 1;;
-    -S|--auth-key)  auth_key=$2; shift 2;;
-    -d|--debug)     debug=1; shift 1;;
-    --)             shift 1; break ;;
-        *)              break ;;
-    esac
-done
-
-if [ $debug -eq 1 ]; then
-    set -x
-fi
-
-if [ "$arch" == "i686" ]; then
-    arch=i386
-fi
-
-if [ $hostarch = "i386" -a $arch = "amd64" ]; then
-    echo "can't create amd64 container on i386"
-    exit 1
-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 $release $flushcache
-if [ $? -ne 0 ]; then
-    echo "failed to install ubuntu $release"
-    exit 1
-fi
-
-configure_ubuntu $rootfs $name $release
-if [ $? -ne 0 ]; then
-    echo "failed to configure ubuntu $release for a container"
-    exit 1
-fi
-
-copy_configuration $path $rootfs $name $arch $release
-if [ $? -ne 0 ]; then
-    echo "failed write configuration file"
-    exit 1
-fi
-
-post_process $rootfs $release $trim_container
-
-finalize_user
-
-TEMPLATE
-  File.open(".tmp.lxc-pauper.conf",'w') do |f|
-    f.puts @template
+  def lxc_pauper_template
+    require 'lxc_template'
+    File.open(".tmp.lxc-pauper.conf",'w') do |f|
+      f.puts Template.lxc
+    end
+    tmpl_dir = File.exist?('/usr/lib/lxc/templates') ? '/usr/lib/lxc/templates' : '/usr/share/lxc/templates'
+    system "sudo mv .tmp.lxc-pauper.conf #{tmpl_dir}/lxc-pauper"
+    system "sudo chmod +x #{tmpl_dir}/lxc-pauper"
   end
-  tmpl_dir = File.exist?('/usr/lib/lxc/templates') ? '/usr/lib/lxc/templates' : '/usr/share/lxc/templates'
-  system "sudo mv .tmp.lxc-pauper.conf #{tmpl_dir}/lxc-pauper"
-  system "sudo chmod +x #{tmpl_dir}/lxc-pauper"
-end
 
   class Config
     attr_reader :config
@@ -1197,7 +631,15 @@ end
         :shares => [],
         :subnet => '172.16.254',
         :chef_options => {},
-        :dev_domain => nil
+        :dev_domain => nil,
+        :chef_download_url => {
+          :lucid => 'https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/10.04/x86_64',
+          :precise => 'https://opscode-omnibus-packages.s3.amazonaws.com/ubuntu/12.04/x86_64',
+        },
+        :chef_deb_name => {
+          :lucid => 'chef_11.0.0-1.ubuntu.10.04_amd64.deb',
+          :precise => 'chef_11.10.4-1.ubuntu.12.04_amd64.deb',
+        },
       }
       if File.exists? pauperfile
         pauperpath = File.dirname(pauperfile)
@@ -1251,12 +693,12 @@ end
       @config[:chef_server_url] = url
     end
 
-    def chef_download_url(url)
-      @config[:chef_download_url] = url
+    def chef_download_url(url, release='lucid')
+      @config[:chef_download_url][Pauper.grok_release(release)] = url
     end
 
-    def chef_deb_name(name)
-      @config[:chef_deb_name] = name
+    def chef_deb_name(name, release='lucid')
+      @config[:chef_deb_name][Pauper.grok_release(release)] = name
     end
 
     def validation_key_path(path)
@@ -1295,7 +737,8 @@ end
         @pretty_name = pretty_name
         @config = {
           :run_list => [],
-          :chef_options => {}
+          :chef_options => {},
+          :release => :lucid,
         }
         instance_eval &block
       end
@@ -1323,6 +766,10 @@ end
       def cpus(count)
         @config[:cpus] = count
       end
+
+      def release(release_s)
+        @config[:release] = Pauper.grok_release(release_s)
+      end
     end
   end
 end