vagrant-lxc 0.3.3 → 0.3.4

data/development/Vagrantfile

@@ -1,112 +1,86 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-def local_apt_cache(box_name)
-  cache_dir = File.join(File.expand_path(Vagrant::Environment::DEFAULT_HOME),
-                        'cache',
-                        'apt',
-                        box_name)
-  partial_dir = File.join(cache_dir, 'partial')
-  FileUtils.mkdir_p(partial_dir) unless File.exists? partial_dir
-  cache_dir
+require 'pathname'
+BASE_URL          = 'http://dl.dropbox.com/u/13510779'
+LAST_RELEASE_DATE = '2013-05-08'
+LOCAL_BOXES_PATH  = Pathname('../boxes/output').expand_path
+def lxc_box_url(release_name)
+  file_name      = "lxc-#{release_name}-amd64-#{LAST_RELEASE_DATE}.box"
+  local_box_file = LOCAL_BOXES_PATH.join(file_name)
+
+  local_box_file.exist? ?
+    local_box_file.to_s :
+    "#{BASE_URL}/#{file_name}"
 end
 
-def local_gem_cache(box_name)
-  cache_dir = File.join(File.expand_path(Vagrant::Environment::DEFAULT_HOME),
-                        'cache',
-                        'gems',
-                        'source',
-                        box_name)
-  FileUtils.mkdir_p(cache_dir) unless File.exists? cache_dir
-  cache_dir
-end
+BOXES = {
+  precise: {
+    lxc_url:  lxc_box_url('precise'),
+    vbox_url: 'http://files.vagrantup.com/precise64.box'
+  },
+  quantal: {
+    lxc_url:  lxc_box_url('quantal'),
+    vbox_url: 'https://github.com/downloads/roderik/VagrantQuantal64Box/quantal64.box'
+  },
+  raring:  {
+    lxc_url:  lxc_box_url('raring'),
+    vbox_url: 'http://cloud-images.ubuntu.com/vagrant/raring/current/raring-server-cloudimg-amd64-vagrant-disk1.box'
+  },
+  squeeze: {
+    lxc_url:  lxc_box_url('squeeze'),
+    vbox_url: 'http://f.willianfernandes.com.br/vagrant-boxes/DebianSqueeze64.box'
+  },
+  wheezy:  {
+    lxc_url:  lxc_box_url('wheezy'),
+  },
+  sid: {
+    lxc_url:  lxc_box_url('sid'),
+  }
+}
 
-# Required to make sure vagrant picks it up during development
 Vagrant.require_plugin 'vagrant-lxc'
+Vagrant.require_plugin 'vagrant-cachier'
 
 Vagrant.configure("2") do |config|
   config.vm.synced_folder "../", "/vagrant", id: 'vagrant-root', nfs: true
 
-  config.vm.define :vbox do |vb_config|
-    vb_config.vm.network :private_network, ip: "192.168.50.33"
-    vb_config.vm.box      = 'quantal64'
-    vb_config.vm.box_url  = "https://github.com/downloads/roderik/VagrantQuantal64Box/quantal64.box"
-    vb_config.vm.hostname = 'vbox'
-
-    vb_config.vm.provider :virtualbox do |vb|
-      # Configure VM to use 1.5gb of ram and 2 cpus
-      vb.customize [
-        "modifyvm", :id,
-        "--memory", '1536',
-        "--cpus", '2'
-      ]
-    end
-
-    cache_dir = local_apt_cache(vb_config.vm.box)
-    vb_config.vm.synced_folder cache_dir, "/var/cache/apt/archives", id: "vagrant-apt-cache"
-
-    cache_dir = local_gem_cache(vb_config.vm.box)
-    vb_config.vm.synced_folder cache_dir, "/home/vagrant/gems/cache", id: "vagrant-gem-cache"
-  end
-
-  config.vm.define :precise do |precise|
-    precise.vm.network :private_network, ip: "192.168.50.32"
-    precise.vm.box      = 'precise64'
-    precise.vm.hostname = 'vbox'
-    precise.vm.box_url  = 'http://files.vagrantup.com/precise64.box'
-
-    precise.vm.provider :virtualbox do |vb|
-      # Configure VM to use 1.5gb of ram and 2 cpus
-      vb.customize [
-        "modifyvm", :id,
-        "--memory", '1536',
-        "--cpus", '2'
-      ]
-    end
-
-    cache_dir = local_apt_cache(precise.vm.box)
-    precise.vm.synced_folder cache_dir, "/var/cache/apt/archives", id: "vagrant-apt-cache"
-
-    cache_dir = local_gem_cache(precise.vm.box)
-    precise.vm.synced_folder cache_dir, "/home/vagrant/gems/cache", id: "vagrant-gem-cache"
-  end
-
-  config.vm.define :raring do |raring|
-    raring.vm.network :private_network, ip: "192.168.50.34"
-    raring.vm.box      = 'raring64'
-    raring.vm.hostname = 'vbox'
-    raring.vm.box_url  = 'http://cloud-images.ubuntu.com/vagrant/raring/current/raring-server-cloudimg-amd64-vagrant-disk1.box'
-
-    raring.vm.provider :virtualbox do |vb|
-      # Configure VM to use 1.5gb of ram and 2 cpus
-      vb.customize [
-        "modifyvm", :id,
-        "--memory", '1536',
-        "--cpus", '2'
-      ]
-    end
-
-    cache_dir = local_apt_cache(raring.vm.box)
-    raring.vm.synced_folder cache_dir, "/var/cache/apt/archives", id: "vagrant-apt-cache"
-
-    cache_dir = local_gem_cache(raring.vm.box)
-    raring.vm.synced_folder cache_dir, "/home/vagrant/gems/cache", id: "vagrant-gem-cache"
-  end
-
-  config.vm.define :lxc do |lxc_config|
-    lxc_config.vm.box      = 'quantal64'
-    lxc_config.vm.hostname = 'lxc-dev-box'
-    lxc_config.vm.box_url  = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-04-21.box'
-    # Uncomment to test boxes built locally:
-    # lxc_config.vm.box_url  = '../boxes/output/lxc-quantal64.box'
-
-    lxc_config.vm.provider :lxc do |lxc|
-      # Required to boot nested containers
-      lxc.customize 'aa_profile', 'unconfined'
+  ip_suffix = 30
+  BOXES.each do |box_name, box_config|
+    config.vm.define(box_name.to_sym) do |vm_config|
+      vm_config.vm.network :private_network, ip: "192.168.50.#{ip_suffix += 1}"
+      vm_config.vm.box      = "#{box_name}64"
+
+      if box_config[:vbox_url]
+        vm_config.vm.provider :virtualbox do |vb, vb_config|
+          vb_config.vm.box_url  = box_config[:vbox_url]
+          vb_config.vm.hostname = 'vbox'
+
+          vb.customize [
+            "modifyvm", :id,
+            "--memory", '1536',
+            "--cpus", '2'
+          ]
+        end
+      end
+
+      if box_config[:lxc_url]
+        vm_config.vm.provider :lxc do |lxc, lxc_config|
+          lxc_config.vm.box_url  = box_config[:lxc_url]
+          lxc_config.vm.hostname = 'lxc-dev-box' unless %w(squeeze wheezy sid).include? box_name.to_s
+
+          # Required to boot nested containers
+          lxc.customize 'aa_profile', 'unconfined' unless %w(squeeze wheezy sid).include? box_name.to_s
+        end
+      end
+
+      vm_config.cache.enable :apt
+      vm_config.cache.enable :gem
     end
   end
 
-  config.vm.provision :shell, :path => 'shell-provisioning/upgrade-kernel'
+  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 = "."

data/development/lxc-configs/sid

@@ -0,0 +1,37 @@
+###############################################################################
+# This file has the same configs as the built in /etc/default/lxc on Ubuntu,
+# we only changed IPs to 10.0.254.* to avoid collision with LXC default 10.0.3.*
+# which is likely to be running from the host machine
+###############################################################################
+
+
+# MIRROR to be used by ubuntu template at container creation:
+# Leaving it undefined is fine
+#MIRROR="http://archive.ubuntu.com/ubuntu"
+# or
+#MIRROR="http://<host-ip-addr>:3142/archive.ubuntu.com/ubuntu"
+
+# LXC_AUTO - whether or not to start containers symlinked under
+# /etc/lxc/auto
+LXC_AUTO="true"
+
+# Leave USE_LXC_BRIDGE as "true" if you want to use lxcbr0 for your
+# containers.  Set to "false" if you'll use virbr0 or another existing
+# bridge, or mavlan to your host's NIC.
+USE_LXC_BRIDGE="true"
+
+# If you change the LXC_BRIDGE to something other than lxcbr1, then
+# you will also need to update your /etc/lxc/lxc.conf as well as the
+# configuration (/var/lib/lxc/<container>/config) for any containers
+# already created using the default config to reflect the new bridge
+# name.
+# If you have the dnsmasq daemon installed, you'll also have to update
+# /etc/dnsmasq.d/lxc and restart the system wide dnsmasq daemon.
+LXC_BRIDGE="lxcbr0"
+LXC_ADDR="10.0.251.1"
+LXC_NETMASK="255.255.255.0"
+LXC_NETWORK="10.0.251.0/24"
+LXC_DHCP_RANGE="10.0.253.2,10.0.251.254"
+LXC_DHCP_MAX="253"
+
+LXC_SHUTDOWN_TIMEOUT=120

data/development/lxc-configs/squeeze

@@ -0,0 +1,37 @@
+###############################################################################
+# This file has the same configs as the built in /etc/default/lxc on Ubuntu,
+# we only changed IPs to 10.0.254.* to avoid collision with LXC default 10.0.3.*
+# which is likely to be running from the host machine
+###############################################################################
+
+
+# MIRROR to be used by ubuntu template at container creation:
+# Leaving it undefined is fine
+#MIRROR="http://archive.ubuntu.com/ubuntu"
+# or
+#MIRROR="http://<host-ip-addr>:3142/archive.ubuntu.com/ubuntu"
+
+# LXC_AUTO - whether or not to start containers symlinked under
+# /etc/lxc/auto
+LXC_AUTO="true"
+
+# Leave USE_LXC_BRIDGE as "true" if you want to use lxcbr0 for your
+# containers.  Set to "false" if you'll use virbr0 or another existing
+# bridge, or mavlan to your host's NIC.
+USE_LXC_BRIDGE="true"
+
+# If you change the LXC_BRIDGE to something other than lxcbr1, then
+# you will also need to update your /etc/lxc/lxc.conf as well as the
+# configuration (/var/lib/lxc/<container>/config) for any containers
+# already created using the default config to reflect the new bridge
+# name.
+# If you have the dnsmasq daemon installed, you'll also have to update
+# /etc/dnsmasq.d/lxc and restart the system wide dnsmasq daemon.
+LXC_BRIDGE="lxcbr0"
+LXC_ADDR="10.0.250.1"
+LXC_NETMASK="255.255.255.0"
+LXC_NETWORK="10.0.250.0/24"
+LXC_DHCP_RANGE="10.0.253.2,10.0.250.254"
+LXC_DHCP_MAX="253"
+
+LXC_SHUTDOWN_TIMEOUT=120

data/development/lxc-configs/wheezy

@@ -0,0 +1,37 @@
+###############################################################################
+# This file has the same configs as the built in /etc/default/lxc on Ubuntu,
+# we only changed IPs to 10.0.254.* to avoid collision with LXC default 10.0.3.*
+# which is likely to be running from the host machine
+###############################################################################
+
+
+# MIRROR to be used by ubuntu template at container creation:
+# Leaving it undefined is fine
+#MIRROR="http://archive.ubuntu.com/ubuntu"
+# or
+#MIRROR="http://<host-ip-addr>:3142/archive.ubuntu.com/ubuntu"
+
+# LXC_AUTO - whether or not to start containers symlinked under
+# /etc/lxc/auto
+LXC_AUTO="true"
+
+# Leave USE_LXC_BRIDGE as "true" if you want to use lxcbr0 for your
+# containers.  Set to "false" if you'll use virbr0 or another existing
+# bridge, or mavlan to your host's NIC.
+USE_LXC_BRIDGE="true"
+
+# If you change the LXC_BRIDGE to something other than lxcbr1, then
+# you will also need to update your /etc/lxc/lxc.conf as well as the
+# configuration (/var/lib/lxc/<container>/config) for any containers
+# already created using the default config to reflect the new bridge
+# name.
+# If you have the dnsmasq daemon installed, you'll also have to update
+# /etc/dnsmasq.d/lxc and restart the system wide dnsmasq daemon.
+LXC_BRIDGE="lxcbr0"
+LXC_ADDR="10.0.252.1"
+LXC_NETMASK="255.255.255.0"
+LXC_NETWORK="10.0.252.0/24"
+LXC_DHCP_RANGE="10.0.253.2,10.0.252.254"
+LXC_DHCP_MAX="253"
+
+LXC_SHUTDOWN_TIMEOUT=120

data/development/shell-provisioning/upgrade-kernel

@@ -9,6 +9,6 @@ fi
 echo 'An old kernel was found on the guest machine and it will be upgraded' 1>&2
 echo 'Please reload the box after provisioning when finished' 1>&2
 sudo apt-get update
-sudo apt-get install linux-image-3.5.0-27-generic linux-headers-3.5.0-27-generic -y
-sudo apt-get dist-upgrade -y
+sudo apt-get install linux-image-3.5.0-28-generic linux-headers-3.5.0-28-generic -y
+sudo apt-get upgrade -y
 sudo apt-get autoremove -y

data/development/site.pp

@@ -5,6 +5,9 @@ exec {
   'echo "alias be=\"bundle exec\"" >> /home/vagrant/.bashrc':
     unless => 'grep -q "bundle exec" /home/vagrant/.bashrc';
 
+  'echo "export VAGRANT_DEFAULT_PROVIDER=lxc" >> /home/vagrant/.bashrc':
+    unless => 'grep -q "VAGRANT_DEFAULT_PROVIDER" /home/vagrant/.bashrc';
+
   'echo "cd /vagrant" >> /home/vagrant/.bashrc':
     unless => 'grep -q "cd /vagrant" /home/vagrant/.bashrc';
 }

data/example/Vagrantfile

@@ -32,11 +32,25 @@ echo "Hi there I'm a shell script used for provisioning"
   releases.each do |release|
     config.vm.define(release) do |lxc_config|
       lxc_config.vm.box      = "#{release}64"
-      lxc_config.vm.box_url  = "http://dl.dropbox.com/u/13510779/lxc-#{release}-amd64-2013-04-21.box"
+      lxc_config.vm.box_url  = "http://dl.dropbox.com/u/13510779/lxc-#{release}-amd64-2013-05-08.box"
+      lxc_config.vm.network :forwarded_port, guest: 80, host: (port += 1)
       # Uncomment if you want to try out a box built locally
       # lxc_config.vm.box_url  = "../boxes/output/lxc-#{release}64.box"
       lxc_config.vm.hostname = "lxc-#{release}64-example"
+    end
+  end
+
+  port     = 8090
+  releases = %w(wheezy squeeze sid)
+  releases.each do |release|
+    config.vm.define(release) do |lxc_config|
+      lxc_config.vm.box      = "#{release}64"
+      lxc_config.vm.box_url  = "http://dl.dropbox.com/u/13510779/lxc-#{release}-amd64-2013-05-08.box"
       lxc_config.vm.network :forwarded_port, guest: 80, host: (port += 1)
+      # Uncomment if you want to try out a box built locally
+      # lxc_config.vm.box_url  = "../boxes/output/lxc-#{release}64.box"
+      # Does not work yet:
+      # lxc_config.vm.hostname = "lxc-#{release}64-example"
     end
   end
 end

data/lib/vagrant-lxc/action.rb

@@ -13,6 +13,7 @@ require 'vagrant-lxc/action/forward_ports'
 require 'vagrant-lxc/action/handle_box_metadata'
 require 'vagrant-lxc/action/is_running'
 require 'vagrant-lxc/action/message'
+require 'vagrant-lxc/action/remove_temporary_files'
 require 'vagrant-lxc/action/setup_package_files'
 require 'vagrant-lxc/action/share_folders'
 
@@ -117,9 +118,10 @@ module Vagrant
           # b.use CheckDependencies
           b.use Vagrant::Action::Builtin::Call, Created do |env, b2|
             if env[:result]
-              # TODO: If vagrant >=...
+              # TODO: Remove this on / after 0.4
               b2.use Disconnect
               b2.use ClearForwardedPorts
+              b2.use RemoveTemporaryFiles
               b2.use Vagrant::Action::Builtin::Call, Vagrant::Action::Builtin::GracefulHalt, :stopped, :running do |env2, b3|
                 if !env2[:result]
                   b3.use ForcedHalt

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

@@ -9,9 +9,7 @@ module Vagrant
         def call(env)
           if env[:machine].provider.state.id == :running
             env[:ui].info I18n.t("vagrant_lxc.messages.force_shutdown")
-            # TODO: Driver#halt is kinda graceful as well, if it doesn't
-            #       work we can issue a lxc-stop.
-            env[:machine].provider.driver.halt
+            env[:machine].provider.driver.forced_halt
           end
 
           @app.call(env)

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

@@ -0,0 +1,23 @@
+module Vagrant
+  module LXC
+    module Action
+      class RemoveTemporaryFiles
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant::lxc::action::remove_tmp_files")
+        end
+
+        def call(env)
+          # Continue execution, we need the container to be stopped
+          @app.call env
+
+          if env[:machine].state.id == :stopped
+            @logger.debug 'Removing temporary files'
+            tmp_path = env[:machine].provider.driver.rootfs_path.join('tmp')
+            system "sudo rm -rf #{tmp_path}/*"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-lxc/driver.rb

@@ -69,11 +69,11 @@ module Vagrant
         @cli.transition_to(:running) { |c| c.start(customizations, (extra || nil)) }
       end
 
-      def halt
+      def forced_halt
         @logger.info('Shutting down container...')
-
-        # TODO: issue an lxc-stop if a timeout gets reached
         @cli.transition_to(:stopped) { |c| c.shutdown }
+      rescue CLI::TargetStateNotReached
+        @cli.transition_to(:stopped) { |c| c.stop }
       end
 
       def destroy

data/lib/vagrant-lxc/driver/cli.rb

@@ -10,6 +10,12 @@ module Vagrant
         attr_accessor :name
 
         class TransitionBlockNotProvided < RuntimeError; end
+        class TargetStateNotReached < RuntimeError
+          def initialize(target_state, state)
+            msg = "Target state '#{target_state}' not reached, currently on '#{state}'"
+            super(msg)
+          end
+        end
 
         # Include this so we can use `Subprocess` more easily.
         include Vagrant::Util::Retryable
@@ -60,6 +66,10 @@ module Vagrant
           run :start, '-d', '--name', @name, *options
         end
 
+        def stop
+          run :stop, '--name', @name
+        end
+
         def shutdown
           run :shutdown, '--name', @name
         end
@@ -76,12 +86,20 @@ module Vagrant
           run :attach, '--name', @name, *((extra || []) + cmd)
         end
 
-        def transition_to(state, &block)
+        def transition_to(target_state, tries = 30, timeout = 1, &block)
           raise TransitionBlockNotProvided unless block_given?
 
           yield self
 
-          run :wait, '--name', @name, '--state', state.to_s.upcase
+          while (last_state = self.state) != target_state && tries > 0
+            @logger.debug "Target state '#{target_state}' not reached, currently on '#{last_state}'"
+            sleep timeout
+            tries -= 1
+          end
+
+          unless last_state == target_state
+            raise TargetStateNotReached.new target_state, last_state
+          end
         end
 
         private