vagrant-lxc 0.3.4 → 0.4.0

data/development/site.pp

@@ -24,7 +24,7 @@ exec {
 # Install dependencies
 package {
   [ 'libffi-dev', 'bsdtar', 'exuberant-ctags', 'ruby1.9.1-dev', 'htop', 'git',
-    'build-essential', 'redir', 'curl' ]:
+    'build-essential', 'redir', 'curl', 'vim', 'btrfs-tools' ]:
     ensure   => 'installed'
   ;
 

data/example/Vagrantfile

@@ -3,6 +3,7 @@
 
 # Not really needed, but useful while developing so that vagrant picks it up
 Vagrant.require_plugin 'vagrant-lxc'
+Vagrant.require_plugin 'vagrant-omnibus'
 
 Vagrant.configure("2") do |config|
   config.vm.synced_folder "/tmp", "/vagrant_data"
@@ -22,35 +23,25 @@ echo "Hi there I'm a shell script used for provisioning"
     puppet.manifest_file  = "site.pp"
   end
 
-  config.vm.provision :chef_solo do |chef|
-    chef.add_recipe "hello-world"
-    chef.log_level = :debug
-  end
-
   port     = 8080
-  releases = %w(precise quantal raring)
+  releases = %w(precise quantal raring 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)
+      lxc_config.vm.box_url  = "http://dl.dropbox.com/u/13510779/lxc-#{release}-amd64-2013-07-12.box"
       # 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.box_url  = "../boxes/output/lxc-#{release}-amd64-2013-07-12.box"
+      lxc_config.vm.network :forwarded_port, guest: 80, host: (port += 1)
       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"
+      if %w(precise quantal raring squeeze).include? release
+        lxc_config.omnibus.chef_version = :latest
+
+        lxc_config.vm.provision :chef_solo do |chef|
+          chef.add_recipe "hello-world"
+          chef.log_level = :debug
+        end
+      end
     end
   end
 end

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

@@ -11,6 +11,8 @@ module Vagrant
 
           config = env[:machine].provider_config
 
+          config.customize 'utsname', env[:machine].id
+
           env[:ui].info I18n.t("vagrant_lxc.messages.starting")
           env[:machine].provider.driver.start(config.customizations)
           raise Vagrant::Errors::VMFailedToBoot if !wait_for_boot

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

@@ -14,6 +14,7 @@ module Vagrant
           env[:machine].provider.driver.create(
             container_name,
             env[:lxc_template_src],
+            env[:lxc_template_config],
             env[:lxc_template_opts]
           )
 

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

@@ -3,6 +3,7 @@ module Vagrant
     module Action
       # Prepare arguments to be used for lxc-create
       class HandleBoxMetadata
+        SUPPORTED_VERSIONS = [2, 3]
         def initialize(app, env)
           @app    = app
           @logger = Log4r::Logger.new("vagrant::lxc::action::handle_box_metadata")
@@ -22,6 +23,10 @@ module Vagrant
           @env[:lxc_template_opts] = template_opts
           @env[:lxc_template_src]  = template_src
 
+          if template_config_file.exist?
+            @env[:lxc_template_config] = template_config_file.to_s
+          end
+
           @app.call env
         end
 
@@ -29,9 +34,15 @@ module Vagrant
           @template_src ||= @box.directory.join('lxc-template').to_s
         end
 
+        def template_config_file
+          @template_config_file ||= @box.directory.join('lxc.conf')
+        end
+
         def template_opts
           @template_opts ||= @box.metadata.fetch('template-opts', {}).dup.merge!(
             '--tarball'  => rootfs_tarball,
+            # TODO: Deprecate this, the rootfs should be ready for vagrant-lxc
+            #       SSH access at this point
             '--auth-key' => Vagrant.source_root.join('keys', 'vagrant.pub').expand_path.to_s
           )
         end
@@ -41,8 +52,10 @@ module Vagrant
         end
 
         def validate_box
-          if @box.metadata.fetch('version').to_i != 2
-            raise Errors::InvalidBoxVersion.new name: @box.name
+          unless SUPPORTED_VERSIONS.include? @box.metadata.fetch('version').to_i
+            raise Errors::IncompatibleBox.new name: @box.name,
+                                              found: @box.metadata.fetch('version').to_i,
+                                              supported: SUPPORTED_VERSIONS.join(' and ')
           end
 
           unless File.exists?(template_src)

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

@@ -45,6 +45,9 @@ module Vagrant
           box_dir = @env[:machine].box.directory
           FileUtils.cp box_dir.join('lxc-template').to_s, @env['package.directory'].to_s
           FileUtils.cp box_dir.join('metadata.json').to_s, @env['package.directory'].to_s
+          if (conf = box_dir.join('lxc.conf')).exist?
+            FileUtils.cp conf.to_s, @env['package.directory'].to_s
+          end
         end
       end
     end

data/lib/vagrant-lxc/driver.rb

@@ -33,12 +33,12 @@ module Vagrant
         Pathname.new(base_path.join('config').read.match(/^lxc\.rootfs\s+=\s+(.+)$/)[1])
       end
 
-      def create(name, template_path, template_options = {})
+      def create(name, template_path, config_file, template_options = {})
         @cli.name = @container_name = name
 
         import_template(template_path) do |template_name|
           @logger.debug "Creating container..."
-          @cli.create template_name, template_options
+          @cli.create template_name, config_file, template_options
         end
       end
 
@@ -131,6 +131,8 @@ module Vagrant
       TEMPLATES_PATH_LOOKUP = %w(
         /usr/share/lxc/templates
         /usr/lib/lxc/templates
+        /usr/lib64/lxc/templates
+        /usr/local/lib/lxc/templates
       )
       def templates_path
         return @templates_path if @templates_path

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

@@ -39,20 +39,25 @@ module Vagrant
         end
 
         def state
-          if @name && run(:info, '--name', @name) =~ /^state:[^A-Z]+([A-Z]+)$/
+          if @name && run(:info, '--name', @name, retryable: true) =~ /^state:[^A-Z]+([A-Z]+)$/
             $1.downcase.to_sym
           elsif @name
             :unknown
           end
         end
 
-        def create(template, template_opts = {})
+        def create(template, config_file, template_opts = {})
+          if config_file
+            config_opts = ['-f', config_file]
+          end
+
           extra = template_opts.to_a.flatten
           extra.unshift '--' unless extra.empty?
 
           run :create,
               '--template', template,
               '--name',     @name,
+              *(config_opts),
               *extra
         end
 

data/lib/vagrant-lxc/errors.rb

@@ -14,8 +14,8 @@ module Vagrant
       class RootFSTarballMissing < Vagrant::Errors::VagrantError
         error_key(:lxc_invalid_box_version)
       end
-      class InvalidBoxVersion < Vagrant::Errors::VagrantError
-        error_key(:lxc_invalid_box_version)
+      class IncompatibleBox < Vagrant::Errors::VagrantError
+        error_key(:lxc_incompatible_box)
       end
     end
   end

data/lib/vagrant-lxc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module LXC
-    VERSION = "0.3.4"
+    VERSION = "0.4.0"
   end
 end

data/locales/en.yml

@@ -17,8 +17,12 @@ en:
       force_shutdown: |-
         Forcing shutdown of container...
 
-  # TODO: Review messages below
   vagrant:
+    commands:
+      status:
+        stopped: |-
+          The container is currently stopped. Run `vagrant up` to bring it up again.
+
     actions:
       lxc:
         compressing_rootfs: Compressing container's rootfs...
@@ -33,6 +37,10 @@ en:
         For more information on the failure, enable detailed logging by setting
         the environment variable VAGRANT_LOG to DEBUG.
 
+      lxc_incompatible_box: |-
+        The base box you are trying to use is not compatible with the installed
+        vagrant-lxc version. Supported box versions are %{supported} but %{found} was found.
+
       lxc_template_file_missing: |-
         The template file used for creating the container was not found for %{name}
         box.

data/spec/Vagrantfile

@@ -8,10 +8,7 @@ ENV['BOX_NAME'] ||= 'quantal64'
 
 Vagrant.configure("2") do |config|
   config.vm.box = ENV['BOX_NAME']
-  # FIXME: Find out why this does not work for debian boxes
-  unless %w( squeeze64 wheezy64 sid64 ).include? config.vm.box
-    config.vm.hostname = 'lxc-test-box'
-  end
+  config.vm.hostname = 'lxc-test-box'
 
   config.cache.enable :apt
 

data/spec/acceptance/sanity_check_spec.rb

@@ -20,10 +20,7 @@ describe 'Sanity check' do
     end
 
     it "is able to be SSH'ed" do
-      expected = 'lxc-test-box'
-      # HACK:
-      expected = ENV['BOX_NAME'].gsub(/64$/, '') if %w( squeeze64 wheezy64 sid64 ).include? ENV['BOX_NAME']
-      expect(vagrant_ssh('hostname')).to eq expected
+      expect(vagrant_ssh('hostname')).to eq 'lxc-test-box'
     end
 
     it 'mounts shared folders with the right permissions' do

data/spec/unit/action/clear_forwarded_ports_spec.rb

@@ -1,11 +1,12 @@
 require 'unit_helper'
 
+require 'tmpdir'
 require 'vagrant-lxc/action/clear_forwarded_ports'
 
 describe Vagrant::LXC::Action::ClearForwardedPorts do
-  let(:app)       { mock(:app, call: true) }
-  let(:env)       { {machine: machine, ui: stub(info: true)} }
-  let(:machine)   { mock(:machine, data_dir: data_dir) }
+  let(:app)       { double(:app, call: true) }
+  let(:env)       { {machine: machine, ui: double(info: true)} }
+  let(:machine)   { double(:machine, data_dir: data_dir) }
   let!(:data_dir) { Pathname.new(Dir.mktmpdir) }
   let(:pids_dir)  { data_dir.join('pids') }
   let(:pid)       { 'a-pid' }

data/spec/unit/action/compress_rootfs_spec.rb

@@ -3,11 +3,11 @@ require 'unit_helper'
 require 'vagrant-lxc/action/compress_rootfs'
 
 describe Vagrant::LXC::Action::CompressRootFS do
-  let(:app)                    { mock(:app, call: true) }
-  let(:env)                    { {machine: machine, ui: stub(info: true)} }
-  let(:machine)                { fire_double('Vagrant::Machine', provider: provider) }
-  let(:provider)               { fire_double('Vagrant::LXC::Provider', driver: driver) }
-  let(:driver)                 { fire_double('Vagrant::LXC::Driver', compress_rootfs: compressed_rootfs_path) }
+  let(:app)                    { double(:app, call: true) }
+  let(:env)                    { {machine: machine, ui: double(info: true)} }
+  let(:machine)                { instance_double('Vagrant::Machine', provider: provider) }
+  let(:provider)               { instance_double('Vagrant::LXC::Provider', driver: driver) }
+  let(:driver)                 { instance_double('Vagrant::LXC::Driver', compress_rootfs: compressed_rootfs_path) }
   let(:compressed_rootfs_path) { '/path/to/rootfs.tar.gz' }
 
   subject { described_class.new(app, env) }

data/spec/unit/action/forward_ports_spec.rb

@@ -3,15 +3,15 @@ require 'unit_helper'
 require 'vagrant-lxc/action/forward_ports'
 
 describe Vagrant::LXC::Action::ForwardPorts do
-  let(:app)          { mock(:app, call: true) }
-  let(:env)          { {machine: machine, ui: stub(info: true)} }
-  let(:machine)      { mock(:machine) }
+  let(:app)          { double(:app, call: true) }
+  let(:env)          { {machine: machine, ui: double(info: true)} }
+  let(:machine)      { double(:machine) }
   let!(:data_dir)    { Pathname.new(Dir.mktmpdir) }
   let(:networks)     { [[:other_config, {}], [:forwarded_port, {guest: guest_port, host: host_port}]] }
   let(:host_port)    { 8080 }
   let(:guest_port)   { 80 }
-  let(:provider)     { fire_double('Vagrant::LXC::Provider', driver: driver) }
-  let(:driver)       { fire_double('Vagrant::LXC::Driver', assigned_ip: container_ip) }
+  let(:provider)     { instance_double('Vagrant::LXC::Provider', driver: driver) }
+  let(:driver)       { instance_double('Vagrant::LXC::Driver', assigned_ip: container_ip) }
   let(:container_ip) { '10.0.1.234' }
   let(:pid)          { 'a-pid' }
 

data/spec/unit/action/handle_box_metadata_spec.rb

@@ -5,10 +5,10 @@ require 'vagrant-lxc/errors'
 require 'vagrant-lxc/action/handle_box_metadata'
 
 describe Vagrant::LXC::Action::HandleBoxMetadata do
-  let(:app)           { mock(:app, call: true) }
-  let(:env)           { {machine: machine, ui: stub(info: true)} }
-  let(:machine)       { mock(:machine, box: box) }
-  let(:box)           { mock(:box, name: 'box-name', metadata: metadata, directory: box_directory) }
+  let(:app)           { double(:app, call: true) }
+  let(:env)           { {machine: machine, ui: double(info: true)} }
+  let(:machine)       { double(:machine, box: box) }
+  let(:box)           { double(:box, name: 'box-name', metadata: metadata, directory: box_directory) }
   let(:box_directory) { Pathname.new('/path/to/box') }
   let(:version)       { '2' }
   let(:metadata)      { {'template-opts' => {'--foo' => 'bar'}, 'version' => version} }
@@ -50,7 +50,7 @@ describe Vagrant::LXC::Action::HandleBoxMetadata do
       metadata['version'] = '1'
       expect {
         subject.call(env)
-      }.to raise_error(Vagrant::LXC::Errors::InvalidBoxVersion)
+      }.to raise_error(Vagrant::LXC::Errors::IncompatibleBox)
     end
 
     it 'raises an error if the rootfs tarball cant be found' do

data/spec/unit/action/setup_package_files_spec.rb

@@ -3,39 +3,57 @@ require 'unit_helper'
 require 'vagrant-lxc/action/setup_package_files'
 
 describe Vagrant::LXC::Action::SetupPackageFiles do
-  let(:app)         { mock(:app, call: true) }
-  let(:env)         { {machine: machine, tmp_path: tmp_path, ui: stub(info: true), 'package.rootfs' => rootfs_path} }
-  let(:machine)     { fire_double('Vagrant::Machine', box: box) }
+  let(:app)         { double(:app, call: true) }
+  let(:env)         { {machine: machine, tmp_path: tmp_path, ui: double(info: true), 'package.rootfs' => rootfs_path} }
+  let(:machine)     { instance_double('Vagrant::Machine', box: box) }
   let!(:tmp_path)   { Pathname.new(Dir.mktmpdir) }
-  let(:box)         { fire_double('Vagrant::Box', directory: tmp_path.join('box')) }
+  let(:box)         { instance_double('Vagrant::Box', directory: tmp_path.join('box')) }
   let(:rootfs_path) { tmp_path.join('rootfs-amd64.tar.gz') }
 
   subject { described_class.new(app, env) }
 
   before do
     box.directory.mkdir
-    [box.directory.join('lxc-template'), box.directory.join('metadata.json'), rootfs_path].each do |file|
+    files = %w( lxc-template metadata.json lxc.conf ).map { |f| box.directory.join(f) }
+    (files + [rootfs_path]).each do |file|
       file.open('w') { |f| f.puts file.to_s }
     end
 
     subject.stub(recover: true) # Prevents files from being removed on specs
-    subject.call(env)
   end
 
   after do
     FileUtils.rm_rf(tmp_path.to_s)
   end
 
-  it 'copies box lxc-template to package directory' do
-    env['package.directory'].join('lxc-template').should be_file
-  end
+  context 'when all files exist' do
+    before { subject.call(env) }
+
+    it 'copies box lxc-template to package directory' do
+      env['package.directory'].join('lxc-template').should be_file
+    end
 
-  it 'copies metadata.json to package directory' do
-    env['package.directory'].join('metadata.json').should be_file
+    it 'copies metadata.json to package directory' do
+      env['package.directory'].join('metadata.json').should be_file
+    end
+
+    it 'copies box lxc.conf to package directory' do
+      env['package.directory'].join('lxc-template').should be_file
+    end
+
+    it 'moves the compressed rootfs to package directory' do
+      env['package.directory'].join(rootfs_path.basename).should be_file
+      env['package.rootfs'].should_not be_file
+    end
   end
 
-  it 'moves the compressed rootfs to package directory' do
-    env['package.directory'].join(rootfs_path.basename).should be_file
-    env['package.rootfs'].should_not be_file
+  context 'when lxc.conf file is not present' do
+    before do
+      box.directory.join('lxc.conf').delete
+    end
+
+    it 'does not blow up' do
+      expect { subject.call(env) }.to_not raise_error
+    end
   end
 end

data/spec/unit/driver/cli_spec.rb

@@ -38,13 +38,14 @@ describe Vagrant::LXC::Driver::CLI do
   describe 'create' do
     let(:template)      { 'quantal-64' }
     let(:name)          { 'quantal-container' }
+    let(:config_file)   { 'config' }
     let(:template_args) { { '--extra-param' => 'param', '--other' => 'value' } }
 
     subject { described_class.new(name) }
 
     before do
       subject.stub(:run) { |*args| @run_args = args }
-      subject.create(template, template_args)
+      subject.create(template, config_file, template_args)
     end
 
       it 'issues a lxc-create with provided template, container name and hash of arguments' do
@@ -52,6 +53,7 @@ describe Vagrant::LXC::Driver::CLI do
           :create,
           '--template', template,
           '--name',     name,
+          '-f',         config_file,
           '--',
           '--extra-param', 'param',
           '--other',       'value'
@@ -124,7 +126,7 @@ describe Vagrant::LXC::Driver::CLI do
 
     it 'calls lxc-info with the right arguments' do
       subject.state
-      subject.should have_received(:run).with(:info, '--name', name)
+      subject.should have_received(:run).with(:info, '--name', name, retryable: true)
     end
 
     it 'maps the output of lxc-info status out to a symbol' do