vagrant-lxc 0.2.0 → 0.3.0

data/example/Vagrantfile

@@ -1,34 +1,22 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-def local_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
-end
-
 # Not really needed, but useful while developing so that vagrant picks it up
 Vagrant.require_plugin 'vagrant-lxc'
 
 Vagrant.configure("2") do |config|
   config.vm.box      = "quantal64"
-  config.vm.box_url  = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-03-31.box'
+  config.vm.box_url  = 'http://dl.dropbox.com/u/13510779/lxc-quantal64-2013-04-10.box'
   # Uncomment if you want to try out a box built locally
   # config.vm.box_url  = '../boxes/output/lxc-quantal64.box'
   config.vm.hostname = 'lxc-quantal64-example'
 
   config.vm.synced_folder "/tmp", "/vagrant_data"
 
-  cache_dir = local_cache(config.vm.box)
-  config.vm.synced_folder cache_dir, "/var/cache/apt/archives"
 
   config.vm.provider :lxc do |lxc|
-    lxc.start_opts << 'lxc.cgroup.memory.limit_in_bytes=400M'
-    lxc.start_opts << 'lxc.cgroup.memory.memsw.limit_in_bytes=500M'
+    lxc.customize 'cgroup.memory.limit_in_bytes', '400M'
+    lxc.customize 'cgroup.memory.memsw.limit_in_bytes', '500M'
   end
 
   config.vm.provision :shell, :inline => <<-SCRIPT

data/lib/vagrant-lxc.rb

@@ -1,4 +1,2 @@
 require "vagrant-lxc/version"
 require "vagrant-lxc/plugin"
-
-I18n.load_path << File.expand_path(File.dirname(__FILE__) + '/../locales/en.yml')

data/lib/vagrant-lxc/action.rb

@@ -1,7 +1,3 @@
-# TODO: Remove base action
-require 'vagrant-lxc/action/base_action'
-
-# TODO: Use require_relative
 require 'vagrant-lxc/action/boot'
 require 'vagrant-lxc/action/check_created'
 require 'vagrant-lxc/action/check_running'
@@ -15,7 +11,6 @@ require 'vagrant-lxc/action/forced_halt'
 require 'vagrant-lxc/action/forward_ports'
 require 'vagrant-lxc/action/handle_box_metadata'
 require 'vagrant-lxc/action/is_running'
-require 'vagrant-lxc/action/network'
 require 'vagrant-lxc/action/setup_package_files'
 require 'vagrant-lxc/action/share_folders'
 
@@ -42,11 +37,6 @@ module Vagrant
         end
       end
 
-      # We could do this here as VirtualBox does, but at least for now its better
-      # to be explicit and have the full constant name in order to easily spot
-      # what we implemented and what is builtin on Vagrant.
-      #
-      #   include Vagrant::Action::Builtin
 
       # This action boots the VM, assuming the VM is in a state that requires
       # a bootup (i.e. not saved).
@@ -56,11 +46,8 @@ module Vagrant
           b.use Vagrant::Action::Builtin::Provision
           b.use Vagrant::Action::Builtin::EnvSet, :port_collision_repair => true
           # b.use PrepareForwardedPortCollisionParams
-          # b.use ClearSharedFolders
           b.use ShareFolders
-          b.use Network
           b.use Vagrant::Action::Builtin::SetHostname
-          # b.use Customize
           b.use ForwardPorts
           b.use Boot
         end
@@ -135,7 +122,7 @@ module Vagrant
               b2.use Disconnect
               b2.use ClearForwardedPorts
               b2.use Vagrant::Action::Builtin::Call, Vagrant::Action::Builtin::GracefulHalt, :stopped, :running do |env2, b3|
-                if !env2[:result] && env2[:machine].provider.state.running?
+                if !env2[:result]
                   b3.use ForcedHalt
                 end
               end

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

@@ -1,20 +1,19 @@
 module Vagrant
   module LXC
     module Action
-      class Boot < BaseAction
+      class Boot
+        def initialize(app, env)
+          @app = app
+        end
+
         def call(env)
           @env = env
 
           config = env[:machine].provider_config
 
-          # Allows this middleware to be called multiple times. We need to
-          # support this as base boxes might have after create scripts which
-          # require SSH access
-          unless env[:machine].state.running?
-            env[:ui].info I18n.t("vagrant.actions.vm.boot.booting")
-            env[:machine].provider.container.start(config)
-            raise Vagrant::Errors::VMFailedToBoot if !wait_for_boot
-          end
+          env[:ui].info I18n.t("vagrant.actions.vm.boot.booting")
+          env[:machine].provider.driver.start(config.customizations)
+          raise Vagrant::Errors::VMFailedToBoot if !wait_for_boot
 
           @app.call env
         end

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

@@ -1,9 +1,13 @@
 module Vagrant
   module LXC
     module Action
-      class CheckCreated < BaseAction
+      class CheckCreated
+        def initialize(app, env)
+          @app = app
+        end
+
         def call(env)
-          unless env[:machine].state.created?
+          if env[:machine].state.id == :not_created
             raise Vagrant::Errors::VMNotCreatedError
           end
 

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

@@ -1,9 +1,13 @@
 module Vagrant
   module LXC
     module Action
-      class CheckRunning < BaseAction
+      class CheckRunning
+        def initialize(app, env)
+          @app = app
+        end
+
         def call(env)
-          unless env[:machine].state.running?
+          if env[:machine].state.id != :running
             raise Vagrant::Errors::VMNotRunningError
           end
 

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

@@ -12,7 +12,7 @@ module Vagrant
           raise Vagrant::Errors::VMPowerOffToPackage if env[:machine].provider.state.id != :stopped
 
           env[:ui].info I18n.t("vagrant.actions.lxc.compressing_rootfs")
-          @rootfs = env['package.rootfs'] = env[:machine].provider.container.compress_rootfs
+          @rootfs = env['package.rootfs'] = env[:machine].provider.driver.compress_rootfs
 
           @app.call env
 

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

@@ -1,16 +1,24 @@
 module Vagrant
   module LXC
     module Action
-      class Create < BaseAction
+      class Create
+        def initialize(app, env)
+          @app = app
+        end
+
         def call(env)
-          base_name = env[:root_path].basename.to_s
-          base_name.gsub!(/[^-a-z0-9_]/i, "")
+          container_name = env[:root_path].basename.to_s
+          container_name.gsub!(/[^-a-z0-9_]/i, "")
+          container_name << "-#{Time.now.to_i}"
+
+          env[:machine].provider.driver.create(
+            container_name,
+            env[:lxc_template_src],
+            env[:lxc_template_opts]
+          )
 
-          target_rootfs_path = env[:machine].provider_config.target_rootfs_path
+          env[:machine].id = container_name
 
-          machine_id         = env[:machine].provider.container.create(base_name, target_rootfs_path, env[:machine].box.metadata)
-          env[:machine].id   = machine_id
-          env[:just_created] = true
           @app.call env
         end
       end

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

@@ -1,10 +1,14 @@
 module Vagrant
   module LXC
     module Action
-      class Created < BaseAction
+      class Created
+        def initialize(app, env)
+          @app = app
+        end
+
         def call(env)
           # Set the result to be true if the machine is created.
-          env[:result] = env[:machine].state.created?
+          env[:result] = env[:machine].state.id != :not_created
 
           # Call the next if we have one (but we shouldn't, since this
           # middleware is built to run with the Call-type middlewares)

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

@@ -1,10 +1,14 @@
 module Vagrant
   module LXC
     module Action
-      class Destroy < BaseAction
+      class Destroy
+        def initialize(app, env)
+          @app = app
+        end
+
         def call(env)
           env[:ui].info I18n.t("vagrant.actions.vm.destroy.destroying")
-          env[:machine].provider.container.destroy
+          env[:machine].provider.driver.destroy
           env[:machine].id = nil
           @app.call env
         end

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

@@ -1,7 +1,11 @@
 module Vagrant
   module LXC
     module Action
-      class Disconnect < BaseAction
+      class Disconnect
+        def initialize(app, env)
+          @app = app
+        end
+
         def call(env)
           @app.call env
           # FIXME: Vagrant >= 1.1.3 should not need this

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

@@ -7,11 +7,11 @@ module Vagrant
         end
 
         def call(env)
-          if env[:machine].provider.state.running?
+          if env[:machine].provider.state.id == :running
             env[:ui].info I18n.t("vagrant.actions.vm.halt.force")
-            # TODO: Container#halt is kinda graceful as well, if it doesn't
+            # TODO: Driver#halt is kinda graceful as well, if it doesn't
             #       work we can issue a lxc-stop.
-            env[:machine].provider.container.halt
+            env[:machine].provider.driver.halt
           end
 
           @app.call(env)

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

@@ -29,7 +29,7 @@ module Vagrant
         end
 
         def forward_ports
-          @container_ip = @env[:machine].provider.container.assigned_ip
+          @container_ip = @env[:machine].provider.driver.assigned_ip
 
           @env[:forwarded_ports].each do |fp|
             message_attributes = {
@@ -63,7 +63,7 @@ module Vagrant
         end
 
         def redirect_port(host, guest)
-          redir_cmd = "sudo redir --laddr=127.0.0.1 --lport=#{host} --cport=#{guest} --caddr=#{@container_ip}"
+          redir_cmd = "sudo redir --laddr=127.0.0.1 --lport=#{host} --cport=#{guest} --caddr=#{@container_ip} 2>/dev/null"
 
           @logger.debug "Forwarding port with `#{redir_cmd}`"
           fork { exec redir_cmd }

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

@@ -2,45 +2,56 @@ module Vagrant
   module LXC
     module Action
       # Prepare arguments to be used for lxc-create
-      class HandleBoxMetadata < BaseAction
-        LXC_TEMPLATES_PATH = Pathname.new("/usr/share/lxc/templates")
-        TEMP_PREFIX        = "vagrant-lxc-rootfs-temp-"
-
+      class HandleBoxMetadata
         def initialize(app, env)
-          super
+          @app    = app
           @logger = Log4r::Logger.new("vagrant::lxc::action::handle_box_metadata")
         end
 
         def call(env)
-          env[:ui].info I18n.t("vagrant.actions.vm.import.importing",
-                               :name => env[:machine].box.name)
+          @env = env
+          @box = @env[:machine].box
 
-          rootfs_cache  = Dir.mktmpdir(TEMP_PREFIX)
-          box           = env[:machine].box
-          template_name = "vagrant-#{box.name}"
+          @env[:ui].info I18n.t("vagrant.actions.vm.import.importing",
+                                :name => @env[:machine].box.name)
 
-          # Prepends "lxc-" to the template file so that `lxc-create` is able to find it
-          lxc_template_src = box.directory.join('lxc-template').to_s
-          unless File.exists?(lxc_template_src)
-            raise Errors::TemplateFileMissing.new name: box.name
-          end
-          dest = LXC_TEMPLATES_PATH.join("lxc-#{template_name}").to_s
-          @logger.debug('Copying LXC template into place')
-          system(%Q[sudo su root -c "cp #{lxc_template_src} #{dest}"])
+          @logger.debug 'Validating box contents'
+          validate_box
 
-          @logger.debug('Extracting rootfs')
-          # TODO: Ideally the compressed rootfs should not output errors...
-          system(%Q[sudo su root -c "cd #{box.directory} && tar xfz rootfs.tar.gz -C #{rootfs_cache} 2>/dev/null"])
+          @logger.debug 'Setting box options on environment'
+          @env[:lxc_template_opts] = template_opts
+          @env[:lxc_template_src]  = template_src
+
+          @app.call env
+        end
 
-          box.metadata.merge!(
-            'template-name'     => template_name,
-            'rootfs-cache-path' => rootfs_cache
+        def template_src
+          @template_src ||= @box.directory.join('lxc-template').to_s
+        end
+
+        def template_opts
+          @template_opts ||= @box.metadata.fetch('template-opts', {}).dup.merge!(
+            '--tarball'  => rootfs_tarball,
+            '--auth-key' => Vagrant.source_root.join('keys', 'vagrant.pub').expand_path.to_s
           )
+        end
 
-          @app.call(env)
+        def rootfs_tarball
+          @rootfs_tarball ||= @box.directory.join('rootfs.tar.gz').to_s
+        end
+
+        def validate_box
+          if @box.metadata.fetch('version').to_i != 2
+            raise Errors::InvalidBoxVersion.new name: @box.name
+          end
 
-        ensure
-          system %Q[sudo su root -c "rm -rf #{rootfs_cache}"]
+          unless File.exists?(template_src)
+            raise Errors::TemplateFileMissing.new name: @box.name
+          end
+
+          unless File.exists?(rootfs_tarball)
+            raise Errors::RootFSTarballMissing.new name: @box.name
+          end
         end
       end
     end

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

@@ -1,9 +1,13 @@
 module Vagrant
   module LXC
     module Action
-      class IsRunning < BaseAction
+      class IsRunning
+        def initialize(app, env)
+          @app = app
+        end
+
         def call(env)
-          env[:result] = env[:machine].state.running?
+          env[:result] = env[:machine].state.id == :running
 
           # Call the next if we have one (but we shouldn't, since this
           # middleware is built to run with the Call-type middlewares)

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

@@ -1,11 +1,15 @@
 module Vagrant
   module LXC
     module Action
-      class ShareFolders < BaseAction
+      class ShareFolders
+        def initialize(app, env)
+          @app = app
+        end
+
         def call(env)
           @env = env
           prepare_folders
-          add_start_opts
+          add_override_configs
           @app.call env
         end
 
@@ -14,9 +18,6 @@ module Vagrant
         def shared_folders
           {}.tap do |result|
             @env[:machine].config.vm.synced_folders.each do |id, data|
-              # Ignore NFS shared folders
-              next if data[:nfs]
-
               # This to prevent overwriting the actual shared folders data
               result[id] = data.dup
             end
@@ -43,7 +44,7 @@ module Vagrant
           end
         end
 
-        def add_start_opts
+        def add_override_configs
           @env[:ui].info I18n.t("vagrant.actions.lxc.share_folders.preparing")
 
           folders = []
@@ -56,8 +57,7 @@ module Vagrant
             @env[:ui].info(I18n.t("vagrant.actions.vm.share_folders.mounting_entry",
                                   :guest_path => data[:guestpath]))
           end
-          config = @env[:machine].provider_config
-          @env[:machine].provider.container.share_folders(folders, config)
+          @env[:machine].provider.driver.share_folders(folders)
         end
       end
     end

data/lib/vagrant-lxc/config.rb

@@ -1,21 +1,31 @@
 module Vagrant
   module LXC
     class Config < Vagrant.plugin("2", :config)
-      # An array of options to be passed to lxc-start when booting the machine.
+      # An array of container's configuration overrides to be provided to `lxc-start`.
       #
       # @return [Array]
-      attr_reader :start_opts
-
-      # Base directory to store container's rootfs
-      #
-      # Defaults to nil, which means it will be stored wherever the lxc template
-      # tells it to be stored
-      attr_accessor :target_rootfs_path
+      attr_reader :customizations
 
       def initialize
-        @start_opts         = []
-        @target_rootfs_path = nil
+        @customizations = []
+      end
+
+      # Customize the container by calling `lxc-start` with the given
+      # configuration overrides.
+      #
+      # For example, if you want to set the memory limit, you can use it
+      # like: config.customize 'cgroup.memory.limit_in_bytes', '400M'
+      #
+      # When `lxc-start`ing the container, vagrant-lxc will pass in
+      # "-s lxc.cgroup.memory.limit_in_bytes=400M" to it.
+      #
+      # @param [String] key Configuration key to override
+      # @param [String] value Configuration value to override
+      def customize(key, value)
+        @customizations << [key, value]
       end
+
+      # TODO: At some point in the future it would be nice to validate these options
     end
   end
 end