vagrant-lxc 0.6.0 → 0.6.1

data/boxes/common/install-babushka

@@ -1,12 +1,13 @@
 #!/bin/bash
 
-cache=`readlink -f .`
-rootfs="${cache}/rootfs"
+set -e
+
+rootfs=$1
 
 echo "installing babushka"
 cat > $rootfs/tmp/install-babushka.sh << EOF
 #!/bin/sh
-curl -L https://babushka.me/up | sudo bash < /dev/null
+curl https://babushka.me/up | sudo bash
 
 EOF
 chmod +x $rootfs/tmp/install-babushka.sh

data/boxes/common/install-chef

@@ -1,7 +1,8 @@
 #!/bin/bash
 
-cache=`readlink -f .`
-rootfs="${cache}/rootfs"
+set -e
+
+rootfs=$1
 
 echo "installing chef"
 cat > $rootfs/tmp/install-chef.sh << EOF

data/boxes/common/install-puppet

@@ -1,7 +1,8 @@
 #!/bin/bash
 
-cache=`readlink -f .`
-rootfs="${cache}/rootfs"
+set -e
+
+rootfs=$1
 
 echo "installing puppet"
 wget http://apt.puppetlabs.com/puppetlabs-release-stable.deb -O "${rootfs}/tmp/puppetlabs-release-stable.deb"

data/boxes/common/install-salt

@@ -1,7 +1,8 @@
 #!/bin/bash
 
-cache=`readlink -f .`
-rootfs="${cache}/rootfs"
+set -e
+
+rootfs=$1
 
 echo "installing salt"
 chroot $rootfs apt-add-repository -y ppa:saltstack/salt

data/boxes/common/lxc-template

@@ -112,17 +112,13 @@ post_process()
 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
+$1 -h|--help [-a|--arch] [--trim] [-d|--debug] [--rootfs <rootfs>] [-T|--tarball <rootfs-tarball>
 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:C -l arch:,help,path:,release:,trim,name:,flush-cache,auth-key:,debug:,tarball: -- "$@")
+options=$(getopt -o a:b:hp:r:xn:FS:d:C -l arch:,help,path:,release:,trim,name:,flush-cache,auth-key:,debug:,tarball:,rootfs: -- "$@")
 if [ $? -ne 0 ]; then
     usage $(basename $0)
     exit 1
@@ -162,12 +158,11 @@ while true
 do
     case "$1" in
     -h|--help)      usage $0 && exit 0;;
+    --rootfs)       rootfs=$2; shift 2;;
     -p|--path)      path=$2; shift 2;;
     -n|--name)      name=$2; shift 2;;
     -T|--tarball)   tarball=$2; shift 2;;
-    -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 ;;
@@ -179,7 +174,6 @@ if [ $debug -eq 1 ]; then
     set -x
 fi
 
-
 if [ "$arch" == "i686" ]; then
     arch=i386
 fi
@@ -201,10 +195,13 @@ fi
 
 # detect rootfs
 config="$path/config"
-if grep -q '^lxc.rootfs' $config 2>/dev/null ; then
-    rootfs=`grep 'lxc.rootfs =' $config | awk -F= '{ print $2 }'`
-else
-    rootfs=$path/rootfs
+# if $rootfs exists here, it was passed in with --rootfs
+if [ -z "$rootfs" ]; then
+    if grep -q '^lxc.rootfs' $config 2>/dev/null ; then
+        rootfs=`grep 'lxc.rootfs =' $config | awk -F= '{ print $2 }'`
+    else
+        rootfs=$path/rootfs
+    fi
 fi
 
 install_ubuntu $rootfs $release $tarball

data/boxes/common/metadata.json

@@ -1,4 +1,5 @@
 {
   "provider": "lxc",
-  "version":  "3"
+  "version":  "3",
+  "built-on": "<TODAY>"
 }

data/development/Vagrantfile

@@ -25,7 +25,10 @@ BOXES = {
   },
   raring:  {
     lxc_url:  lxc_box_url('raring'),
-    vbox_url: 'http://cloud-images.ubuntu.com/vagrant/raring/current/raring-server-cloudimg-amd64-vagrant-disk1.box'
+    vbox_url: 'http://goo.gl/Y4aRr'
+  },
+  saucy: {
+    vbox_url: 'http://cloud-images.ubuntu.com/vagrant/saucy/current/saucy-server-cloudimg-amd64-vagrant-disk1.box'
   },
   squeeze: {
     lxc_url:  lxc_box_url('squeeze'),
@@ -83,9 +86,6 @@ Vagrant.configure("2") do |config|
     end
   end
 
-  config.vm.provision :shell, :inline => 'sudo apt-get update'
-  config.vm.provision :shell, :path   => 'shell-provisioning/upgrade-kernel'
-
   config.vm.provision :puppet do |puppet|
     puppet.manifests_path = "."
     puppet.manifest_file  = "site.pp"

data/development/site.pp

@@ -1,5 +1,18 @@
 Exec { path => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/', '/usr/local/bin'] }
 
+stage { 'preinstall':
+  before => Stage['main']
+}
+
+class apt_get_update {
+  exec { 'apt-get -y update':
+    unless => "test -f /etc/default/lxc"
+  }
+}
+class { 'apt_get_update':
+  stage => preinstall
+}
+
 # Because I'm lazy ;)
 exec {
   'echo "alias be=\"bundle exec\"" >> /home/vagrant/.bashrc':
@@ -38,17 +51,18 @@ package {
   ;
 }
 
+# Upgrade kernel if needed
+package {
+  [ 'linux-image-generic', 'linux-headers-generic' ]:
+    ensure => 'latest'
+}
+
 # Make sure we can create and boot nested containers
 if $hostname == 'vbox' {
   package { 'apparmor-utils': }
   exec    { 'aa-complain /usr/bin/lxc-start': }
 }
 
-# TMUX
-package {
-  'tmux': ensure => 'installed';
-}
-
 # Allow gems to be installed on vagrant user home avoiding "sudo"s
 # Tks to http://wiki.railsplayground.com/railsplayground/show/How+to+install+gems+and+non+root+user
 file {
@@ -73,7 +87,7 @@ gem: --no-ri --no-rdoc
 gemhome: /home/vagrant/gems
 gempath:
 - /home/vagrant/gems
-- /usr/local/lib/ruby/gems/1.8
+- /var/lib/gems/1.9.1
 '
 }
 exec {
@@ -126,3 +140,14 @@ file {
     mode    => '0600',
     require => Exec['download-private-key']
 }
+
+# Passwordless sudo wrapper script
+file {
+  '/usr/bin/lxc-vagrant-wrapper':
+    ensure  => 'present',
+    mode    => '0755',
+    content => "
+#!/usr/bin/env ruby
+exec ARGV.join(' ')
+    "
+}

data/lib/vagrant-lxc/action.rb

@@ -27,18 +27,22 @@ end
 module Vagrant
   module LXC
     module Action
+      # Shortcuts
+      Builtin = Vagrant::Action::Builtin
+      Builder = Vagrant::Action::Builder
+
       # This action is responsible for reloading the machine, which
       # brings it down, sucks in new configuration, and brings the
       # machine back up with the new configuration.
       def self.action_reload
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use Vagrant::Action::Builtin::Call, Created do |env1, b2|
+        Builder.new.tap do |b|
+          b.use Builtin::Call, Created do |env1, b2|
             if !env1[:result]
               b2.use Message, :not_created
               next
             end
 
-            b2.use Vagrant::Action::Builtin::ConfigValidate
+            b2.use Builtin::ConfigValidate
             b2.use action_halt
             b2.use action_start
           end
@@ -48,35 +52,35 @@ module Vagrant
       # This action boots the VM, assuming the VM is in a state that requires
       # a bootup (i.e. not saved).
       def self.action_boot
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use Vagrant::Action::Builtin::Provision
-          b.use Vagrant::Action::Builtin::EnvSet, :port_collision_repair => true
-          b.use Vagrant::Action::Builtin::HandleForwardedPortCollisions
+        Builder.new.tap do |b|
+          b.use Builtin::Provision
+          b.use Builtin::EnvSet, :port_collision_repair => true
+          b.use Builtin::HandleForwardedPortCollisions
           b.use ShareFolders
-          b.use Vagrant::Action::Builtin::SetHostname
+          b.use Builtin::SetHostname
           b.use ForwardPorts
           b.use Boot
-          b.use Vagrant::Action::Builtin::WaitForCommunicator, [:starting, :running]
+          b.use Builtin::WaitForCommunicator
         end
       end
 
       # This action just runs the provisioners on the machine.
       def self.action_provision
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use Vagrant::Action::Builtin::ConfigValidate
-          b.use Vagrant::Action::Builtin::Call, Created do |env1, b2|
+        Builder.new.tap do |b|
+          b.use Builtin::ConfigValidate
+          b.use Builtin::Call, Created do |env1, b2|
             if !env1[:result]
               b2.use Message, :not_created
               next
             end
 
-            b2.use Vagrant::Action::Builtin::Call, IsRunning do |env2, b3|
+            b2.use Builtin::Call, IsRunning do |env2, b3|
               if !env2[:result]
                 b3.use Message, :not_running
                 next
               end
 
-              b3.use Vagrant::Action::Builtin::Provision
+              b3.use Builtin::Provision
             end
           end
         end
@@ -85,12 +89,11 @@ module Vagrant
       # This action starts a container, assuming it is already created and exists.
       # A precondition of this action is that the container exists.
       def self.action_start
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use Vagrant::Action::Builtin::ConfigValidate
-          b.use Vagrant::Action::Builtin::Call, IsRunning do |env, b2|
+        Builder.new.tap do |b|
+          b.use Builtin::ConfigValidate
+          b.use Builtin::Call, IsRunning do |env, b2|
             # If the VM is running, then our work here is done, exit
             next if env[:result]
-            # TODO: Check if has been saved / frozen and resume
             b2.use action_boot
           end
         end
@@ -99,12 +102,12 @@ module Vagrant
       # This action brings the machine up from nothing, including creating the
       # container, configuring metadata, and booting.
       def self.action_up
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use Vagrant::Action::Builtin::ConfigValidate
-          b.use Vagrant::Action::Builtin::Call, Created do |env, b2|
+        Builder.new.tap do |b|
+          b.use Builtin::ConfigValidate
+          b.use Builtin::Call, Created do |env, b2|
             # If the VM is NOT created yet, then do the setup steps
             if !env[:result]
-              b2.use Vagrant::Action::Builtin::HandleBoxUrl
+              b2.use Builtin::HandleBoxUrl
               b2.use HandleBoxMetadata
               b2.use Create
             end
@@ -116,14 +119,14 @@ module Vagrant
       # This is the action that is primarily responsible for halting
       # the virtual machine, gracefully or by force.
       def self.action_halt
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use Vagrant::Action::Builtin::Call, Created do |env, b2|
+        Builder.new.tap do |b|
+          b.use Builtin::Call, Created do |env, b2|
             if env[:result]
-              # TODO: Remove this on / after 0.4
+              # TODO: Remove once we drop support for vagrant 1.1
               b2.use Disconnect
               b2.use ClearForwardedPorts
               b2.use RemoveTemporaryFiles
-              b2.use Vagrant::Action::Builtin::Call, Vagrant::Action::Builtin::GracefulHalt, :stopped, :running do |env2, b3|
+              b2.use Builtin::Call, Builtin::GracefulHalt, :stopped, :running do |env2, b3|
                 if !env2[:result]
                   b3.use ForcedHalt
                 end
@@ -138,21 +141,22 @@ module Vagrant
       # This is the action that is primarily responsible for completely
       # freeing the resources of the underlying virtual machine.
       def self.action_destroy
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use Vagrant::Action::Builtin::Call, Created do |env1, b2|
+        Builder.new.tap do |b|
+          b.use Builtin::Call, Created do |env1, b2|
             if !env1[:result]
               b2.use Message, :not_created
               next
             end
 
-            b2.use Vagrant::Action::Builtin::Call, DestroyConfirm do |env2, b3|
+            # TODO: Use Vagrant's built in action once we drop support for vagrant 1.2
+            b2.use Builtin::Call, DestroyConfirm do |env2, b3|
               if env2[:result]
-                b3.use Vagrant::Action::Builtin::ConfigValidate
-                b3.use Vagrant::Action::Builtin::EnvSet, :force_halt => true
+                b3.use Builtin::ConfigValidate
+                b3.use Builtin::EnvSet, :force_halt => true
                 b3.use action_halt
                 b3.use Destroy
                 if Vagrant::LXC.vagrant_1_3_or_later
-                  b3.use Vagrant::Action::Builtin::ProvisionerCleanup
+                  b3.use Builtin::ProvisionerCleanup
                 end
               else
                 b3.use Message, :will_not_destroy
@@ -164,8 +168,8 @@ module Vagrant
 
       # This action packages the virtual machine into a single box file.
       def self.action_package
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use Vagrant::Action::Builtin::Call, Created do |env1, b2|
+        Builder.new.tap do |b|
+          b.use Builtin::Call, Created do |env1, b2|
             if !env1[:result]
               b2.use Message, :not_created
               next
@@ -182,8 +186,8 @@ module Vagrant
       # This action is called to read the IP of the container. The IP found
       # is expected to be put into the `:machine_ip` key.
       def self.action_fetch_ip
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use Vagrant::Action::Builtin::ConfigValidate
+        Builder.new.tap do |b|
+          b.use Builtin::ConfigValidate
           b.use FetchIpWithLxcAttach
           b.use FetchIpFromDnsmasqLeases
         end
@@ -191,19 +195,19 @@ module Vagrant
 
       # This is the action that will exec into an SSH shell.
       def self.action_ssh
-        Vagrant::Action::Builder.new.tap do |b|
+        Builder.new.tap do |b|
           b.use CheckCreated
           b.use CheckRunning
-          b.use Vagrant::Action::Builtin::SSHExec
+          b.use Builtin::SSHExec
         end
       end
 
       # This is the action that will run a single SSH command.
       def self.action_ssh_run
-        Vagrant::Action::Builder.new.tap do |b|
+        Builder.new.tap do |b|
           b.use CheckCreated
           b.use CheckRunning
-          b.use Vagrant::Action::Builtin::SSHRun
+          b.use Builtin::SSHRun
         end
       end
     end

data/lib/vagrant-lxc/action/clear_forwarded_ports.rb

@@ -18,7 +18,10 @@ module Vagrant
               system "pkill -TERM -P #{pid}"
             end
 
+            @logger.info "Removing redir pids files"
             remove_redir_pids
+          else
+            @logger.info "No redir pids found"
           end
 
           @app.call env
@@ -33,6 +36,7 @@ module Vagrant
         end
 
         def is_redir_pid?(pid)
+          @logger.debug "Checking if #{pid} is a redir process with `ps -o cmd= #{pid}`"
           `ps -o cmd= #{pid}`.strip.chomp =~ /redir/
         end
 

data/lib/vagrant-lxc/action/fetch_ip_from_dnsmasq_leases.rb

@@ -17,7 +17,7 @@ module Vagrant
           ip = nil
           10.times do
             dnsmasq_leases = read_dnsmasq_leases
-            @logger.debug 'Attempting to load ip from dnsmasq leases'
+            @logger.debug "Attempting to load ip from dnsmasq leases (mac: #{mac_address})"
             @logger.debug dnsmasq_leases
             if dnsmasq_leases =~ /#{Regexp.escape mac_address}\s+([0-9.]+)\s+/
               ip = $1.to_s

data/lib/vagrant-lxc/action/fetch_ip_with_lxc_attach.rb

@@ -12,17 +12,14 @@ module Vagrant
 
           def call(env)
             env[:machine_ip] ||= assigned_ip(env)
+          rescue LXC::Errors::NamespacesNotSupported
+            @logger.info 'The `lxc-attach` command available does not support the --namespaces parameter, falling back to dnsmasq leases to fetch container ip'
+          ensure
             @app.call(env)
           end
 
           def assigned_ip(env)
-            driver  = env[:machine].provider.driver
-            version = driver.version.match(/^(\d+\.\d+)\./)[1].to_f
-            unless version >= 0.8
-              @logger.debug "lxc version does not support the --namespaces argument to lxc-attach"
-              return nil
-            end
-
+            driver = env[:machine].provider.driver
             ip = ''
             retryable(:on => LXC::Errors::ExecuteError, :tries => 10, :sleep => 3) do
               unless ip = get_container_ip_from_ip_addr(driver)