pauper 0.0.12 → 0.1.0

data/README

@@ -1,12 +1,56 @@
-To make a new base VM:
-
-1) Install your OS (only tested with Ubuntu 10.04 64-bit)
-2) Setup a user with a password that you don't mind hardcoding in your Pauperfile
-3) Make sure that user has no-password sudo access
-4) sudo apt-get install ruby1.8 ruby1.8-dev libopenssl-ruby rubygems ssh
-5) sudo gem install chef
-6) Delete /etc/udev/rules.d/70-persistent-net.whatever
-7) Shut down VM
-8) Remove all *.lck files from inside the VM's vmwarevm folder
+To setup a dev environment
+
+Install 11.10
+
+sudo apt-get install build-essential aptitude lxc bridge-utils libvirt-bin ruby openssh-server curl libssl-dev libxml2-dev libxslt-dev git-core libreadline6-dev
+
+Install rvm
+
+See https://rvm.io/
+rvm install 1.9.3
+rvm use 1.9.3 --default
+source ~/.profile
+
+gem install ohai chef
+
+Setup .ssh, .chef, .gitconfig
+https://gist.github.com/eb11025e7c0e53ef58be
+
+mkdir fastly
+cd fastly
+git clone git@github.com:fastly/Chef.git
+git clone git@github.com:macros/Pauper.git
+git clone git@github.com:fastly/pauper-env.git
+# Customizations for lxc
+https://gist.github.com/d15219c4edcf0f112c1c
+
+git clone git@github.com:fastly/Heavenly.git
+touch Heavenly/heavenly.log
+chmod 777 Heavenly/heavenly.log
+git clone git@github.com:fastly/Northstar.git
+mv Northstar northstar
+git clone git@github.com:fastly/Sierra.git
+git clone git@github.com:fastly/conduction.git
+git clone git@github.com:fastly/Website.git
+
+cd Pauper
+gem build pauper.gemspec
+gem install pauper-0.0.6.gem
+knife environment create <username>-dev
+(If knife cant be found, try 'source ~/.rvm/scripts/rvm')
+
+cd ../pauper-env
+pauper bootstrap
+pauper start
+pauper setup
+
+* Assumes ssh user/pass in container is root as setup by lxc (TODO)
+
+pauper bootstrap
+pauper start <node>
+pauper setup <node>
+pauper stop <node>
+
+The base node can be run, not normally started
 
 DONE!

data/bin/pauper

@@ -5,6 +5,12 @@ require 'thor'
 require 'pauper'
 
 class CLI < Thor
+  desc "bootstrap", "Initialize the base image"
+  def bootstrap
+    pauper = Pauper.new
+    pauper.bootstrap
+  end
+  
   desc "destroy [NODENAME]", "Completely destroy a VM"
   def destroy(node_name=nil)
     pauper = Pauper.new
@@ -35,6 +41,29 @@ class CLI < Thor
     end
   end
 
+  desc "resume [NODENAME]", "Resume a VM"
+  def resume(node_name=nil)
+    pauper = Pauper.new
+    if node_name
+      pauper.resume(node_name)
+    else
+      pauper.resume_all
+    end
+  end
+
+
+  desc "suspend [NODENAME]", "Suspends a VM"
+  def suspend(node_name=nil)
+    pauper = Pauper.new
+    if node_name
+      pauper.suspend(node_name)
+    else
+      pauper.suspend_all
+    end
+  end
+
+
+
   desc "setup [NODENAME]", "Refresh configs and run Chef on a VM"
   def setup(node_name=nil)
     pauper = Pauper.new

data/lib/dhcpd.rb

@@ -11,7 +11,7 @@ class DHCPD
   end
 
   def subnet
-    @preamble.match(/subnet (\d+\.\d+\.\d+)\.0 netmask/)[1]
+    @preamble.match(/(172\.16\.\d+)\.0/)[1]
   end
 
   def save

data/lib/libvirt.rb

@@ -0,0 +1,80 @@
+class LIBVIRT
+  attr_reader :subnet
+  attr_reader :ip
+
+  CONF_FILE = "/etc/libvirt/qemu/networks/pauper.xml"
+
+  def initialize(subnet)
+    @subnet = subnet
+    @ip = @subnet + '.1'
+    @template = ERB.new <<EOF
+<network>
+  <name>pauper</name>
+  <bridge name="pauperbr%d" />
+  <forward/>
+  <ip address="<%= ip %>" netmask="255.255.255.0">
+    <dhcp>
+      <range start="<%= subnet %>.100" stop="<%= subnet %>.200" />
+    </dhcp>
+  </ip>
+</network>
+EOF
+  end
+
+  def enable
+    write_config
+    unless active?
+      unless loaded?
+        load_config
+      end
+      start_network
+      # The bridge needs a bit to settle
+      sleep 3
+    end
+  end
+
+  def interface
+    `sudo virsh net-info pauper | grep Bridge`.split(%r{\s+})[1]
+  end
+
+  private
+  def write_config
+    config_data = @template.result(OpenStruct.new(:ip => @ip, :subnet => @subnet).send(:binding))
+    File.open(".tmp.pauper.xml",'w') do |f|
+      f.puts config_data
+    end
+    
+    system("sudo mv .tmp.pauper.xml #{CONF_FILE}")
+  end
+  
+  def load_config
+    system("sudo virsh net-define #{CONF_FILE}")
+  end
+
+  def unload_config
+    system("sudo virsh net-undefine pauper")
+  end
+
+  def start_network
+    system("sudo rm /var/lib/misc/dnsmasq.leases")
+    system("sudo virsh net-start pauper >> pauper.log 2>&1")
+  end
+
+  def stop_network
+    system("sudo virsh net-destroy pauper >> pauper.log 2>&1")
+  end
+
+  def active?
+    virsh = `sudo virsh net-info pauper | grep '^Active.*yes$'`
+    unless virsh == ""
+      return true
+    end
+  end
+  
+  def loaded?
+    virsh = `sudo virsh net-info pauper | grep '^Name.*pauper$'`    
+    unless virsh == ""
+      return true
+    end
+  end
+end

data/lib/lxc.rb

@@ -0,0 +1,53 @@
+require 'fileutils'
+
+class LXC
+  attr_accessor :interface
+  attr_accessor :mac
+  attr_reader :node_name
+
+  def initialize(node_name)
+    @node_name = node_name
+    @filename = "/var/lib/lxc/#{node_name}/config"
+    @mac = ''
+    @interface = ''
+    @template = ERB.new <<EOF
+lxc.utsname = <%= node_name %>
+lxc.pts = 1024    
+lxc.tty = 4
+lxc.cgroup.cpu.shares = 512
+lxc.rootfs = /var/lib/lxc/<%= node_name %>/rootfs 
+lxc.mount = /var/lib/lxc/<%= node_name %>/fstab 
+lxc.network.type = veth
+lxc.network.name = eth0
+lxc.network.link = <%= interface %>
+lxc.network.hwaddr = <%= mac %>
+lxc.network.flags = up
+lxc.cgroup.devices.deny = a
+lxc.cgroup.devices.allow = c 1:3 rwm
+lxc.cgroup.devices.allow = c 1:5 rwm
+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 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
+lxc.cgroup.devices.allow = b 7:0 rwm
+lxc.cgroup.devices.allow = c 254:0 rwm
+lxc.cgroup.devices.allow = c 108:0 rwm
+lxc.cgroup.devices.allow = c 10:229 rwm
+lxc.cgroup.devices.allow = c 10:200 rwm
+EOF
+
+  end
+
+  def save(filename=@filename)
+    config_data = @template.result(OpenStruct.new(:node_name => @node_name, 
+                                                  :mac => @mac, :interface => @interface ).send(:binding))
+    File.open(".tmp.lxc.conf",'w') do |f|
+      f.puts config_data
+    end
+    system "sudo mv .tmp.lxc.conf #{@filename}"
+  end
+end

data/lib/pauper.rb

@@ -7,74 +7,123 @@ require 'fileutils'
 require 'erb'
 require 'ostruct'
 
-require 'vmx'
-require 'dhcpd'
+require 'lxc'
+require 'libvirt'
 require 'hosts'
 
 class Pauper
   DEFAULT_PAUPERFILE = './Pauperfile'
-  DEFAULT_VM_PATH = File.expand_path('~/Documents/Virtual Machines.localized/')
-
-  VMWARE_PATH = '/Library/Application Support/VMware Fusion'
-  DHCPD_CONF_PATH = "#{VMWARE_PATH}/vmnet8/dhcpd.conf"
+  DEFAULT_VM_PATH = File.expand_path('/var/lib/lxc/')
 
   def initialize(pauperfile=DEFAULT_PAUPERFILE)
     @pauper_config = Pauper::Config.new(DEFAULT_PAUPERFILE)
+    network = LIBVIRT.new(@pauper_config.config[:subnet])
+    network.enable
+    @pauper_config.config[:bridge] = network.interface
   end
 
   def bootstrap
-    vmx = template_vmx
-    vmx.data['sharedFolder0.hostPath'] = File.expand_path('~')
-    vmx.data['sharedFolder0.guestName'] = 'host_home'
-    vmx.save
+    raise "Base already exists!" if vm_exists?("base")
+    system("sudo touch /var/lib/lxc/lxc.conf")
+    system("sudo lxc-create -n base -t ubuntu -f /var/lib/lxc/lxc.conf -- -a amd64 -r lucid")
+    mac = generate_mac
+    ip = "#{@pauper_config.config[:subnet]}.2"
+    
+    lxc = LXC.new('base')
+    lxc.interface = @pauper_config.config[:bridge]
+    lxc.mac = mac
+    lxc.save
+
+    prepare_fstab('base')
+    prepare_vm_network('base',ip)
+    prepare_base_cache
+
+    puts "Installing chef.."
+    start_node('base')
+    chef_node = "base#{@pauper_config.config[:node_suffix]}"
+
+    cmd "knife bootstrap --bootstrap-version chef-full -N #{chef_node} -E #{@pauper_config.config[:chef_environment]} -x #{@pauper_config.config[:ssh_user]} -P #{@pauper_config.config[:ssh_password]} -r \"#{@pauper_config.config[:default_run_list].join(",")}\" #{ip}"
+    stop_node('base')
+  end
+  
+  def prepare_fstab(node_name)
+    File.open('.tmp.fstab','w') do |f|
+      @pauper_config.config[:shares].each do |share_name, guest_path, host_path, options|
+        f.puts "#{host_path} #{DEFAULT_VM_PATH}/#{node_name}/rootfs/#{guest_path} none defaults,bind 0 0"
+      end
+    end
+    system "sudo mv .tmp.fstab #{DEFAULT_VM_PATH}/#{node_name}/fstab"
+  end
+
+  def prepare_vm_network(node_name,ip)
+    host_ip = "#{@pauper_config.config[:subnet]}.1"
+    File.open('.tmp.interfaces', 'w') do |f|
+      f.puts "auto lo"
+      f.puts "iface lo inet loopback"
+      f.puts ""
+      f.puts "auto eth0"
+      f.puts "iface eth0 inet static"
+      f.puts " address #{ip}"
+      f.puts " netmask 255.255.255.0"
+      f.puts " gateway #{host_ip}"
+    end
+    File.open('.tmp.resolv.conf', 'w') do |f|
+      f.puts "nameserver #{host_ip}"
+    end
+    system "sudo mv .tmp.interfaces #{DEFAULT_VM_PATH}/#{node_name}/rootfs/etc/network/interfaces"
+    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|
+      cmd "sudo mkdir -p #{host_path}"
+      cmd "sudo mkdir -p /var/lib/lxc/base/rootfs#{guest_path}"
+    end
+    cmd "sudo mkdir -p /var/cache/lxc/lucid/cache/apt/partial"
   end
 
+  def reconfigure_ssh(node_name)
+    cmd "sudo chroot /var/lib/lxc/#{node_name}/rootfs/ /usr/sbin/dpkg-reconfigure openssh-server"
+  end
+  
   def create(node_name)
     node_config = get_node_config(node_name)
 
     raise "VM already exists!" if vm_exists?(node_name)
 
-    puts "Cloning template..."
-    clone_template node_name
-
-    puts "Updating machine configuration..."
+    puts "Cloning base..."
+    clone_base(node_name)
     mac = generate_mac
-    uuid = generate_uuid
-
-    vmx = node_vmx(node_name)
-    vmx.data['displayName'] = node_name
-    vmx.data['memsize'] = node_config.config[:ram] || @pauper_config.config[:default_ram] || 512
-    vmx.data['numvcpus'] = node_config.config[:cpus] || @pauper_config.config[:default_cpus] || 1
-    vmx.data['ethernet0.address'] = mac
-    vmx.data['uuid.bios'] = uuid
-    vmx.data['uuid.location'] = uuid
-    vmx.save
-
-    dhcpd = DHCPD.new(DHCPD_CONF_PATH)
-    ip = node_ip(node_config)
-
-    dhcpd.config[node_name] = {
-      'hardware ethernet' => mac,
-      'fixed-address' => ip
-    }
-    dhcpd.save
-
-    puts "Restarting dhcpd..."
-    dhcpd.restart
-
+    ip = "#{@pauper_config.config[:subnet]}.#{node_config.config[:last_octet]}"
+    
+    lxc = LXC.new(node_name)
+    lxc.interface = @pauper_config.config[:bridge]
+    lxc.mac = mac
+    lxc.save
+
+    prepare_fstab(node_name)
+    prepare_vm_network(node_name,ip)
+    reconfigure_ssh(node_name)
     puts "Starting..."
     start_node(node_name)
-
+    sleep 3
     setup(node_name)
   end
 
   def setup(node_name)
     node_config = get_node_config(node_name)
-
+    config = @pauper_config.config
     puts "Setting up #{node_name}..."
-
-    client_erb = ERB.new(File.read(File.join(File.dirname(__FILE__), 'client.rb.erb')))
-    client_rb_data = client_erb.result(OpenStruct.new(:config => @pauper_config.config, :node_config => node_config).send(:binding))
+    client_erb = ERB.new <<EOF
+node_name              "<%= chef_node %>"
+chef_server_url        "<%= config[:chef_server_url] %>"
+validation_client_name "<%= config[:validation_client_name] %>"
+environment            "<%= config[:chef_environment] %>"
+verbose_logging        false
+json_attribs           "/etc/chef/client-config.json"
+EOF
+    chef_node = "#{node_name}#{config[:node_suffix]}"
+    client_rb_data = client_erb.result(OpenStruct.new(:config => config, :chef_node => chef_node).send(:binding))
     tmp_client_rb_path = ".tmp.#{node_name}.client.rb"
     File.open(tmp_client_rb_path,'w') do |f|
       f.puts client_rb_data
@@ -83,69 +132,59 @@ class Pauper
     ip = node_ip(node_config)
 
     chef_attribs = {
-      :run_list => @pauper_config.config[:default_run_list] + node_config.config[:run_list],
+      :run_list => config[:default_run_list] + node_config.config[:run_list],
       :ip => {
         :private => ip,
         :private_netmask => '255.255.255.0'
       }
-    }.merge(@pauper_config.config[:chef_options]).merge(node_config.config[:chef_options])
+    }.merge(config[:chef_options]).merge(node_config.config[:chef_options])
 
     puts "Uploading Chef files..."
-    Net::SCP.start ip, @pauper_config.config[:ssh_user], :password => @pauper_config.config[:ssh_password] do |scp|
+    Net::SCP.start ip, config[:ssh_user], :password => config[:ssh_password] do |scp|
       scp.upload! tmp_client_rb_path, "client.rb"
-      scp.upload! @pauper_config.config[:validation_key_path], "validation.pem"
+      scp.upload! config[:validation_key_path], "validation.pem"
       scp.upload! StringIO.new(chef_attribs.to_json), "client-config.json"
     end
 
     FileUtils.rm(tmp_client_rb_path)
 
-    enable_shared_folders node_name
-    @pauper_config.config[:shares].each do |share_name, guest_path, host_path, options|
-      cmd "mkdir -p #{host_path}"
-      share_folder node_name, share_name, host_path
-    end
-
     puts "Connecting over SSH..."
-    Net::SSH.start ip, @pauper_config.config[:ssh_user], :password => @pauper_config.config[:ssh_password] do |ssh|
-      ssh_exec ssh, "sudo hostname #{node_name}"
-      ssh_exec ssh, "sudo bash -c \"echo #{node_name} > /etc/hostname\""
-
-      ssh_exec ssh, "sudo mkdir /etc/chef"
-
-      @pauper_config.config[:shares].each do |share_name, guest_path, host_path, options|
-        ssh_exec ssh, "sudo mkdir -p #{File.dirname(guest_path)} && sudo ln -sf /mnt/hgfs/#{share_name} #{guest_path}"
-      end
-
-      ssh_exec ssh, "sudo mv client.rb /etc/chef/"
-      ssh_exec ssh, "sudo mv validation.pem /etc/chef/"
-      ssh_exec ssh, "sudo mv client-config.json /etc/chef/"
+    Net::SSH.start ip, config[:ssh_user], :password => config[:ssh_password] do |ssh|
+      ssh_exec ssh, "mv client.rb /etc/chef/"
+      ssh_exec ssh, "mv client-config.json /etc/chef/"
 
-      ssh.exec! "sudo /var/lib/gems/1.8/bin/chef-client" do |channel, stream, data|
+      ssh.exec! "/usr/bin/chef-client" do |channel, stream, data|
         print data
       end
     end
   end
-  
+
   def destroy(node_name)
-    node_config = get_node_config(node_name)
+    if node_name == 'base'
+      ip = @pauper_config.config[:subnet] + '.2'
+    else
+      node_config = get_node_config(node_name)
+      ip = node_ip(node_config)
+    end      
 
     if vm_exists?(node_name)
       stop_node(node_name)
 
+      chef_node = "#{node_name}#{@pauper_config.config[:node_suffix]}"
       puts "Removing #{node_name} from Chef..."
-      `knife node delete #{node_name} -y`
-      `knife client delete #{node_name} -y`
+      `knife node delete #{chef_node} -y`
+      `knife client delete #{chef_node} -y`
 
       puts "Destroying #{node_name}..."
-      FileUtils.rm_rf(node_name_to_vm_path(node_name))
+      cmd "sudo lxc-destroy -n '#{node_name}' >> pauper.log 2>&1"
+      cmd "ssh-keygen -R '#{node_name}' >> pauper.log 2>&1"
+      cmd "ssh-keygen -R '#{ip}' >> pauper.log 2>&1"
     else
       puts "#{node_name} hasn't even been created yet, thusly you can't destroy it!"
     end
   end
 
   def stop(node_name)
-    node_config = get_node_config(node_name)
-
     if vm_running?(node_name)
       puts "Stopping #{node_name}..."
       stop_node(node_name)
@@ -155,8 +194,6 @@ class Pauper
   end
 
   def start(node_name)
-    node_config = get_node_config(node_name)
-
     if vm_running?(node_name)
       puts "Dude, #{node_name} is already running!"
     elsif vm_exists?(node_name)
@@ -168,6 +205,25 @@ class Pauper
     end
   end
 
+
+  def resume(node_name)
+    if vm_frozen?(node_name)
+      puts "Resuming #{node_name}..."
+      resume_node(node_name)
+    else
+      puts "wtf, #{node_name} is not suspended."
+    end
+  end
+
+  def suspend(node_name)
+    if vm_frozen?(node_name)
+      puts "Dude, #{node_name} is already suspended!"
+    else
+      puts "Suspending #{node_name}..."
+      suspend_node(node_name)
+    end
+  end
+
   def write_hosts
     puts "Writing /etc/hosts file..."
     hosts = Hosts.new
@@ -188,6 +244,16 @@ class Pauper
     @pauper_config.config[:nodes].each { |n| stop(n.name) }
   end
 
+  def resume_all
+    puts "Resuming all nodes..."
+    @pauper_config.config[:nodes].each { |n| resume(n.name) }
+  end
+
+  def suspend_all
+    puts "Suspending all nodes..."
+    @pauper_config.config[:nodes].each { |n| suspend(n.name) }
+  end
+
   def destroy_all
     puts "Destroying all nodes..."
     @pauper_config.config[:nodes].each { |n| destroy(n.name) }
@@ -202,12 +268,7 @@ class Pauper
 
   def node_ip(node_config)
     return node_config.config[:ip] if node_config.config[:ip]
-
-    @subnet ||= begin
-      dhcpd = DHCPD.new(DHCPD_CONF_PATH)
-      dhcpd.subnet
-    end
-
+    @subnet = @pauper_config.config[:subnet]
     return @subnet + '.' + node_config.config[:last_octet]
   end
 
@@ -221,15 +282,6 @@ class Pauper
     print ssh.exec!(cmd)
   end
 
-  def enable_shared_folders(node_name)
-    cmd "'#{VMWARE_PATH}/vmrun' enableSharedFolders '#{node_name_to_vmx(node_name)}'"
-  end
-
-  def share_folder(node_name, share_name, path)
-    cmd "'#{VMWARE_PATH}/vmrun' removeSharedFolder '#{node_name_to_vmx(node_name)}' '#{share_name}'"
-    cmd "'#{VMWARE_PATH}/vmrun' addSharedFolder '#{node_name_to_vmx(node_name)}' '#{share_name}' '#{path}'"
-  end
-
   def get_node_config(node_name)
     node_config = @pauper_config.get_node(node_name)
     raise "Alas, I don't know about a node named #{node_name.inspect}..." unless node_config
@@ -241,31 +293,42 @@ class Pauper
   end
 
   def vm_running?(node_name)
-    `'#{VMWARE_PATH}/vmrun' list`.include?("#{node_name}.vmwarevm")
+    `sudo lxc-info -n '#{node_name}'`.include?("RUNNING")
   end
 
-  def clone_template(node_name)
-    FileUtils.cp_r(template_vm_path, node_name_to_vm_path(node_name))
+  def vm_frozen?(node_name)
+    `sudo lxc-info -n '#{node_name}'`.include?("FROZEN")
   end
 
-  def template_vmx
-    @template_vmx ||= VMX.new(@pauper_config.config[:vmx])
+  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"
   end
 
-  def node_vmx(node_name)
-    VMX.new(node_name_to_vmx(node_name))
+  def vm_config(node_name)
+    LXC.new("#{DEFAULT_VM_PATH}/#{node_name}/config")
   end
 
   def start_node(node_name)
-    cmd "'#{VMWARE_PATH}/vmrun' start '#{node_name_to_vmx(node_name)}' nogui  >>vmware.log 2>&1"
+    cmd "sudo lxc-start -d -n '#{node_name}' >> pauper.log 2>&1"
   end
 
   def stop_node(node_name)
-    cmd "'#{VMWARE_PATH}/vmrun' stop '#{node_name_to_vmx(node_name)}' >>vmware.log 2>&1"
+    cmd "sudo lxc-stop -n '#{node_name}' >> pauper.log 2>&1"
+  end
+
+  def resume_node(node_name)
+    cmd "sudo lxc-unfreeze -n '#{node_name}' >> pauper.log 2>&1"
+  end
+
+  def suspend_node(node_name)
+    cmd "sudo lxc-freeze -n '#{node_name}' >> pauper.log 2>&1"
   end
 
   def generate_mac
-    "00:50:56:" + 3.times.map { ("%2s" % rand(256).to_s(16)).gsub(' ','0') }.join(':').upcase
+    "ce:71:52:" + 3.times.map { ("%2s" % rand(256).to_s(16)).gsub(' ','0') }.join(':').upcase
   end
 
   # not actually universal - doesn't fucking matter
@@ -277,14 +340,8 @@ class Pauper
     }.join('-')
   end
 
-  def node_name_to_vmx(node_name)
-    vmxes = Dir[File.join(node_name_to_vm_path(node_name), '*.vmx')]
-    raise "Can't find a vmx file in #{node_name_to_vm_path(node_name)}" unless vmxes[0]
-    vmxes[0]
-  end
-
   def node_name_to_vm_path(node_name)
-    File.join(DEFAULT_VM_PATH, "#{node_name}.vmwarevm")
+    File.join(DEFAULT_VM_PATH, "#{node_name}/config")
   end
 
   def template_vm_path
@@ -301,7 +358,7 @@ class Pauper
         :ssh_password => 'password',
         :run_list => [],
         :shares => [],
-        :suffix => '',
+        :subnet => '172.16.254',
         :chef_options => {}
       }
       instance_eval File.read(pauperfile)
@@ -311,7 +368,6 @@ class Pauper
       @config[:nodes].detect { |n| n.name == node_name }
     end
 
-
     def ssh_user(user)
       @config[:ssh_user] = user
     end
@@ -320,12 +376,16 @@ class Pauper
       @config[:ssh_password] = pass
     end
 
+    def subnet(net)
+      @config[:subnet] = net
+    end
+
     def vmx(vmx_file)
       @config[:vmx] = File.expand_path(vmx_file)
     end
 
     def node(name, &block)
-      @config[:nodes] << Node.new(name + @config[:suffix], name, &block)
+      @config[:nodes] << Node.new(name, name, &block)
     end
 
     def ram(megabytes)
@@ -361,11 +421,11 @@ class Pauper
     end
 
     def share(share_name, guest_path, host_path, options={})
-      @config[:shares] << [share_name, guest_path, File.expand_path(host_path), options]
+      @config[:shares] << [share_name, guest_path, host_path, options]
     end
 
     def node_suffix(suffix)
-      @config[:suffix] = suffix
+      @config[:node_suffix] = suffix
     end
 
     class Node

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: pauper
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 12
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors: 
 - Tyler McMullen
+- Jason Cook
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-09-13 00:00:00 -07:00
+date: 2012-06-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,7 +75,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
-description: Inspired by Vagrant but much much simpler. Also uses VMware, instead of Virtualbox.
+description: Inspired by Vagrant but much much simpler. Also uses LXC, instead of Virtualbox.
 email: 
 - tyler@fastly.com
 executables: 
@@ -85,9 +86,10 @@ extra_rdoc_files: []
 
 files: 
 - bin/pauper
-- lib/client.rb.erb
 - lib/dhcpd.rb
 - lib/hosts.rb
+- lib/libvirt.rb
+- lib/lxc.rb
 - lib/pauper.rb
 - lib/vmx.rb
 - README

data/lib/client.rb.erb

@@ -1,7 +0,0 @@
-# Managed by Pauper
-
-node_name              "<%= node_config.name %>"
-chef_server_url        "<%= config[:chef_server_url] %>"
-validation_client_name "<%= config[:validation_client_name] %>"
-environment            "<%= config[:chef_environment] %>"
-json_attribs           "/etc/chef/client-config.json"