vagrant-lxc 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDIyYWI4OWI1MDRkM2I1ZjE4ZGVmMDI5YzkwODc3YTA3OGQxMmQzOQ==
-  data.tar.gz: !binary |-
-    NjVjOTNlMDNmZjFmN2YyZGFhYmExN2RhOTY0MDZhNDMwM2QxYWRlNg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OThkNThlMjU2ZmVkN2E5MjAyYzgxZGM4ZjdlMTBhNGI4Njc0YjYxYjE5ZWYz
-    YmI1YzlmOWQ1ZTU2NzRjOWE2MWY1ODZiNDNmMDNhMzExMmI4YThkNGVkMjBi
-    YmNmYTRjYjRmNjBiNGZiYmU4Y2I5NjE3ZmY4MTQ5YjBhMzQyMmI=
-  data.tar.gz: !binary |-
-    Y2JkM2Y1OGZmMDdkNjE1ZDY1ODQ5YWY1MDNjM2ZmNGRkMjk1YmVkMmVlNjQz
-    OWQyZTg5NzU0ZjhmZWVlYjE3OWIwZDZkZWU3ZmFhNmEwOTFmMGMzYWNlYTgx
-    ZDZjOWEyNDQzY2Y5ZTQzMjY0NGE1M2JmNThlZmNhZTVlNjI0YzM=
+SHA1:
+  metadata.gz: bd1975bccf20eba75300c481bdf0278fe909151c
+  data.tar.gz: 6d9d53e02972c5f080aec5f26a750066d695bd57
+SHA512:
+  metadata.gz: 7e7803f41a9bb9b45c2656e38711a7180b700f5e11d96d07a2b28c04009f3fc3fc72f63c985a6ade6af446914f7a2e0aa09308d7cbddfa90b24bc03fd88ad3ea
+  data.tar.gz: 3e5ad8c62617b4e385773ff4fec76b14005c53304e4302bd487094cdd77bc0838bc47cbbfec5c4dc9d2b3094111ac4336e157fbffacc736e168cad0c75fc981d

data/Gemfile.lock

@@ -14,7 +14,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxc (0.0.1)
+    vagrant-lxc (0.0.3.dev)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -4,18 +4,17 @@
 
 Highly experimental Linux Containers support for Vagrant 1.1.
 
-Please refer to the [closed issues](https://github.com/fgrehm/vagrant-lxc/issues?labels=&milestone=&page=1&state=closed)
-to find out whats currently supported.
-
 
 ## Dependencies
 
-LXC, `bsdtar` and `fping` packages and a Kernel [higher than 3.5.0-17.28](#im-unable-to-restart-containers),
-which on Ubuntu 12.10 means:
+Vagrant >= 1.1.0, the `lxc` package and a Kernel [higher than 3.5.0-17.28](#help-im-unable-to-restart-containers),
+which on Ubuntu 12.10 means something like:
 
 ```
 sudo apt-get update && sudo apt-get dist-upgrade
-sudo apt-get install lxc bsdtar fping
+sudo apt-get install lxc
+wget "http://files.vagrantup.com/packages/67bd4d30f7dbefa7c0abc643599f0244986c38c8/vagrant_`uname -m`.deb" -O /tmp/vagrant.deb
+sudo dpkg -i /tmp/vagrant.deb
 ```
 
 
@@ -23,14 +22,16 @@ sudo apt-get install lxc bsdtar fping
 
 * Vagrant's `up`, `halt`, `reload`, `destroy`, and `ssh` commands
 * Shared folders
-* Provisioners
+* Provisioning with shell scripts and puppet (should work with chef but I [haven't had the chance](https://github.com/fgrehm/vagrant-lxc/issues/37) to set it up on the base box)
 * Setting container's host name
-* Host-only / private networking
+
+*Please refer to the [closed issues](https://github.com/fgrehm/vagrant-lxc/issues?labels=&milestone=&page=1&state=closed)
+for the most up to date list.*
 
 
 ## Current limitations
 
-* Port forwarding does not work [yet](https://github.com/fgrehm/vagrant-lxc/issues/4)
+* Port forwarding does not work [yet](https://github.com/fgrehm/vagrant-lxc/issues/6)
 * A hell lot of `sudo`s
 * Only a [single ubuntu box supported](boxes), I'm still [figuring out what should go
   on the .box file](https://github.com/fgrehm/vagrant-lxc/issues/4)
@@ -71,11 +72,8 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-If you don't trust me and believe that it will mess up with your current Vagrant
-installation and / or are afraid that something might go wrong with your machine,
-fire up the [same Vagrant VirtualBox machine I'm using for development](#using-virtualbox-and-vagrant-10-for-development)
-to try things out and do the same as above. That might also get you up and running
-if you are working on a mac or windows host ;)
+If you are on a mac or window host and still want to try this plugin out, you
+can use the [same Vagrant VirtualBox machine I use for development](#using-virtualbox-and-vagrant-11-for-development).
 
 
 ## Development
@@ -121,6 +119,15 @@ Keep in mind that you'll probably need to run `sudo aa-complain /usr/bin/lxc-sta
 on the host whenever you want to hack on it, otherwise you won't be able to
 start nested containers there to try things out.
 
+### Using VirtualBox and Vagrant 1.1 for development
+
+```
+cd development
+ln -s Vagrantfile.1.1 Vagrantfile
+bundle exec vagrant up vbox
+bundle exec vagrant reload vbox
+bundle exec vagrant ssh vbox
+```
 
 ### Using VirtualBox and Vagrant 1.0 for development
 
@@ -132,16 +139,6 @@ vagrant reload
 vagrant ssh
 ```
 
-### Using VirtualBox and Vagrant 1.1 for development
-
-```
-cd development
-ln -s Vagrantfile.1.1 Vagrantfile
-bundle exec vagrant up vbox
-bundle exec vagrant reload vbox
-bundle exec vagrant ssh vbox
-```
-
 
 ## Protips
 
@@ -157,9 +154,7 @@ This will output A LOT of information on your terminal and some useful informati
 about `lxc-start` to `/tmp/lxc-start.log`.
 
 
-## Help!
-
-### I'm unable to restart containers!
+## Help! I'm unable to restart containers!
 
 It happened to me quite a few times in the past and it seems that it is related
 to a bug on linux kernel, so make sure you are using a bug-free kernel

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-25-generic linux-headers-3.5.0-25-generic -y
+sudo apt-get install linux-image-3.5.0-26-generic linux-headers-3.5.0-26-generic -y
 sudo apt-get dist-upgrade -y
 sudo apt-get autoremove -y

data/development/site.pp

@@ -20,8 +20,7 @@ exec {
 
 # Install dependencies
 package {
-  [ 'libffi-dev', 'bsdtar', 'exuberant-ctags', 'ruby1.9.1-dev', 'htop', 'git',
-    'build-essential', 'dnsutils', 'fping' ]:
+  [ 'libffi-dev', 'bsdtar', 'exuberant-ctags', 'ruby1.9.1-dev', 'htop', 'git', 'build-essential' ]:
     ensure   => 'installed'
   ;
 

data/lib/vagrant-lxc/action.rb

@@ -6,6 +6,7 @@ require 'vagrant-lxc/action/check_running'
 require 'vagrant-lxc/action/create'
 require 'vagrant-lxc/action/created'
 require 'vagrant-lxc/action/destroy'
+require 'vagrant-lxc/action/disconnect'
 require 'vagrant-lxc/action/forced_halt'
 require 'vagrant-lxc/action/handle_box_metadata'
 require 'vagrant-lxc/action/is_running'
@@ -123,6 +124,7 @@ module Vagrant
           # b.use CheckLXC
           b.use Vagrant::Action::Builtin::Call, Created do |env, b2|
             if env[:result]
+              b2.use Disconnect
               b2.use Vagrant::Action::Builtin::Call, Vagrant::Action::Builtin::GracefulHalt, :stopped, :running do |env2, b3|
                 if !env2[:result] && env2[:machine].provider.state.running?
                   b3.use ForcedHalt

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

@@ -0,0 +1,14 @@
+module Vagrant
+  module LXC
+    module Action
+      class Disconnect < BaseAction
+        def call(env)
+          @app.call env
+          # FIXME: Vagrant >= 1.1.3 should not need this
+          #          https://github.com/mitchellh/vagrant/compare/715539eac30bc9ae62ddbb6337d13f036f7b774d...ec1bae0#L2R128
+          env[:machine].instance_variable_set(:@communicator, nil)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-lxc/container.rb

@@ -1,4 +1,3 @@
-# FIXME: Ruby 1.8 users dont have SecureRandom
 require 'securerandom'
 
 require "vagrant-lxc/errors"
@@ -104,67 +103,22 @@ module Vagrant
       end
 
       def assigned_ip
-        unless File.read(base_path.join('config')) =~ /^lxc\.network\.hwaddr\s*=\s*([a-z0-9:]+)\s*$/
-          raise 'Unknown Container MAC Address'
-        end
-        mac_addr = $1
-
         ip = ''
         retryable(:on => LXC::Errors::ExecuteError, :tries => 10, :sleep => 3) do
-          # See: http://programminglinuxblog.blogspot.com.br/2007/11/detecting-ip-address-from-mac-address.html
-          unless ip = get_container_ip_from_arp(mac_addr)
-            # Ping subnet and try to get ip again
-            ping_subnet!
+          unless ip = get_container_ip_from_ifconfig
+            # retry
+            raise LXC::Errors::ExecuteError, :command => ['arp', '-n'].inspect
           end
         end
         ip
       end
 
-      def get_container_ip_from_arp(mac_addr)
-        r = raw 'arp', '-n'
-
-        # If the command was a failure then raise an exception that is nicely
-        # handled by Vagrant.
-        if r.exit_code != 0
-          if @interrupted
-            @logger.info("Exit code != 0, but interrupted. Ignoring.")
-          else
-            raise LXC::Errors::ExecuteError, :command => ['arp', '-n'].inspect
-          end
-        end
-
-        if r.stdout.gsub("\r\n", "\n").strip =~ /^([0-9.]+).+#{Regexp.escape mac_addr}/
+      def get_container_ip_from_ifconfig
+        output = @cli.attach '/sbin/ifconfig', '-v', 'eth0', namespaces: 'network'
+        if output =~ /\s+inet addr:([0-9.]+)\s+/
           return $1.to_s
         end
       end
-
-      # FIXME: Should output an error friendly message in case fping is not installed
-      def ping_subnet!
-        raise LXC::Errors::UnknownLxcConfigFile unless File.exists?(LXC_DEFAULTS_PATH)
-
-        raise LXC::Errors::UnknownLxcBridgeAddress unless
-          File.read(LXC_DEFAULTS_PATH) =~ /^LXC_ADDR\="?([0-9.]+)"?.*$/
-
-        cmd = ['fping', '-c', '1', '-g', '-q', "#{$1}/24"]
-        raw(*cmd)
-
-        raise LXC::Errors::ExecuteError, :command => cmd.inspect
-      end
-
-      # TODO: Review code below this line, it was pretty much a copy and paste from VirtualBox base driver
-      def raw(*command, &block)
-        int_callback = lambda do
-          @interrupted = true
-          @logger.info("Interrupted.")
-        end
-
-        # Append in the options for subprocess
-        command << { :notify => [:stdout, :stderr] }
-
-        Vagrant::Util::Busy.busy(int_callback) do
-          Vagrant::Util::Subprocess.execute(*command, &block)
-        end
-      end
     end
   end
 end

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

@@ -56,6 +56,18 @@ module Vagrant
           run :shutdown, '--name', @name
         end
 
+        def attach(*cmd)
+          cmd = ['--'] + cmd
+
+          if cmd.last.is_a?(Hash)
+            opts       = cmd.pop
+            namespaces = Array(opts[:namespaces]).map(&:upcase).join('|')
+            extra      = ['--namespaces', namespaces] if namespaces
+          end
+
+          run :attach, '--name', @name, *((extra || []) + cmd)
+        end
+
         def transition_to(state, &block)
           raise TransitionBlockNotProvided unless block_given?
 

data/lib/vagrant-lxc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module LXC
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/fixtures/sample-ifconfig-output

@@ -0,0 +1,18 @@
+eth0      Link encap:Ethernet  HWaddr 00:16:3e:7c:dd:44  
+          inet addr:10.0.3.109  Bcast:10.0.3.255  Mask:255.255.255.0
+          inet6 addr: fe80::216:3eff:fe7c:dd44/64 Scope:Link
+          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
+          RX packets:204 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:203 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:1000 
+          RX bytes:29663 (29.6 KB)  TX bytes:30168 (30.1 KB)
+
+lo        Link encap:Local Loopback  
+          inet addr:127.0.0.1  Mask:255.0.0.0
+          inet6 addr: ::1/128 Scope:Host
+          UP LOOPBACK RUNNING  MTU:16436  Metric:1
+          RX packets:73 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:73 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0 
+          RX bytes:34173 (34.1 KB)  TX bytes:34173 (34.1 KB)
+

data/spec/spec_helper.rb

@@ -2,13 +2,11 @@ if ENV['COVERAGE']
   require 'simplecov'
   SimpleCov.start do
     # This can probably go away once we stop using vagrant as submodule
-    add_filter { |source_file| source_file.filename =~ /\/vagrant\/plugins\// }
-    add_filter { |source_file| source_file.filename =~ /\/vagrant\/lib\/vagrant(\/|\.rb)/ }
     add_filter { |source_file| source_file.filename =~ /\/spec\/support/ }
   end
 end
 
-require 'bundler'
+require 'bundler/setup'
 
 require 'rspec-spies'
 

data/spec/unit/container/cli_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_helper'
 
-require "vendored_vagrant"
+require 'vagrant'
 require 'vagrant-lxc/container/cli'
 
 describe Vagrant::LXC::Container::CLI do
@@ -122,6 +122,27 @@ describe Vagrant::LXC::Container::CLI do
     end
   end
 
+  describe 'attach' do
+    let(:name)           { 'a-running-container' }
+    let(:command)        { ['ls', 'cat /tmp/file'] }
+    let(:command_output) { 'folders list' }
+    subject              { described_class.new(name) }
+
+    before do
+      subject.stub(run: command_output)
+    end
+
+    it 'calls lxc-attach with specified command' do
+      subject.attach(*command)
+      subject.should have_received(:run).with(:attach, '--name', name, '--', *command)
+    end
+
+    it 'supports a "namespaces" parameter' do
+      subject.attach *(command + [{namespaces: ['network', 'mount']}])
+      subject.should have_received(:run).with(:attach, '--name', name, '--namespaces', 'NETWORK|MOUNT', '--', *command)
+    end
+  end
+
   describe 'transition block' do
     let(:name) { 'a-running-container' }
     subject    { described_class.new(name) }

data/spec/unit/container_spec.rb

@@ -1,6 +1,6 @@
 require 'unit_helper'
 
-require "vendored_vagrant"
+require 'vagrant'
 require 'vagrant-lxc/container'
 
 describe Vagrant::LXC::Container do
@@ -125,27 +125,19 @@ describe Vagrant::LXC::Container do
   end
 
   describe 'assigned ip' do
-    # This ip is set on the sample-arp-output fixture based on mac address from
-    # sample-config fixture
-    let(:ip)                 { "10.0.3.30" }
-    let(:conf_file_contents) { File.read('spec/fixtures/sample-config') }
-    let(:name)               { 'random-container-name' }
-
-    context 'when container mac address gets returned from the first `arp` call' do
-      before do
-        @arp_output = File.read('spec/fixtures/sample-arp-output')
-        subject.stub(:raw) {
-          mock(stdout: "#{@arp_output}\n", exit_code: 0)
-        }
-        File.stub(read: conf_file_contents)
-      end
+    # This ip is set on the sample-ifconfig-output fixture
+    let(:ip)              { "10.0.3.109" }
+    let(:ifconfig_output) { File.read('spec/fixtures/sample-ifconfig-output') }
+    let(:name)            { 'random-container-name' }
+    let(:cli)             { fire_double('Vagrant::LXC::Container::CLI', :attach => ifconfig_output) }
 
-      it 'gets parsed from `arp` based on lxc mac address' do
+    subject { described_class.new(name, cli) }
+
+    context 'when ip for eth0 gets returned from lxc-attach call' do
+      it 'gets parsed from ifconfig output' do
         subject.assigned_ip.should == ip
-        subject.should have_received(:raw).with('arp', '-n')
+        cli.should have_received(:attach).with('/sbin/ifconfig', '-v', 'eth0', namespaces: 'network')
       end
     end
-
-    pending 'when mac address is not returned from an `arp` call'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -48,6 +48,7 @@ files:
 - lib/vagrant-lxc/action/create.rb
 - lib/vagrant-lxc/action/created.rb
 - lib/vagrant-lxc/action/destroy.rb
+- lib/vagrant-lxc/action/disconnect.rb
 - lib/vagrant-lxc/action/forced_halt.rb
 - lib/vagrant-lxc/action/handle_box_metadata.rb
 - lib/vagrant-lxc/action/is_running.rb
@@ -62,8 +63,7 @@ files:
 - lib/vagrant-lxc/provider.rb
 - lib/vagrant-lxc/version.rb
 - locales/en.yml
-- spec/fixtures/sample-arp-output
-- spec/fixtures/sample-config
+- spec/fixtures/sample-ifconfig-output
 - spec/spec_helper.rb
 - spec/support/unit_example_group.rb
 - spec/unit/action/handle_box_metadata_spec.rb
@@ -83,23 +83,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Linux Containers provider for Vagrant
 test_files:
-- spec/fixtures/sample-arp-output
-- spec/fixtures/sample-config
+- spec/fixtures/sample-ifconfig-output
 - spec/spec_helper.rb
 - spec/support/unit_example_group.rb
 - spec/unit/action/handle_box_metadata_spec.rb

data/spec/fixtures/sample-arp-output

@@ -1,4 +0,0 @@
-Address                  HWtype  HWaddress           Flags Mask            Iface
-120.0.3.30               ether   10:16:3e:c8:f9:b7   C                     lxcbr0
-10.0.3.30                ether   00:16:3e:64:d6:74   C                     lxcbr0
-192.168.25.1             ether   2c:e4:12:95:90:45   C                     wlan0

data/spec/fixtures/sample-config

@@ -1,47 +0,0 @@
-lxc.network.type=veth
-lxc.network.link=lxcbr0
-lxc.network.flags=up
-lxc.network.hwaddr = 00:16:3e:64:d6:74
-lxc.rootfs = /var/lib/lxc/a91df47bfc6e/rootfs
-lxc.utsname = a91df47bfc6e
-
-lxc.devttydir = lxc
-lxc.tty = 4
-lxc.pts = 1024
-lxc.mount  = /var/lib/lxc/a91df47bfc6e/fstab
-lxc.arch = amd64
-lxc.cap.drop = sys_module mac_admin mac_override
-lxc.pivotdir = lxc_putold
-
-# uncomment the next line to run the container unconfined:
-#lxc.aa_profile = unconfined
-
-lxc.cgroup.devices.deny = a
-# Allow any mknod (but not using the node)
-lxc.cgroup.devices.allow = c *:* m
-lxc.cgroup.devices.allow = b *:* m
-# /dev/null and zero
-lxc.cgroup.devices.allow = c 1:3 rwm
-lxc.cgroup.devices.allow = c 1:5 rwm
-# consoles
-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
-# /dev/{,u}random
-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
-# rtc
-lxc.cgroup.devices.allow = c 254:0 rwm
-#fuse
-lxc.cgroup.devices.allow = c 10:229 rwm
-#tun
-lxc.cgroup.devices.allow = c 10:200 rwm
-#full
-lxc.cgroup.devices.allow = c 1:7 rwm
-#hpet
-lxc.cgroup.devices.allow = c 10:228 rwm
-#kvm
-lxc.cgroup.devices.allow = c 10:232 rwm