vagrant-lxc 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1dddc38d13d5bbf1413f5cfbe0a668416096636
-  data.tar.gz: 646adccd342594104746e82741a0661a3c8a87d4
+  metadata.gz: ac8726c09c9ffb849e24a02ddc77e19933177f61
+  data.tar.gz: 6d46c754650c72a3437723209b37934186c10682
 SHA512:
-  metadata.gz: 7aec9d4adc32aa37d0c3371e412698057fda1e05701c0f50ac7fe31bc3b72fd89a1a98b68947a92cb828c539ebf09c53d5a428ebf2e31c18c7423e3b5eb83554
-  data.tar.gz: 0a0593325da1a0b775d79251099647580583955d52cc6eda41b7c1bdad1f62680b24c0e867b010e238960861ce124996568a8436968fc33eb80f84ec06e5f787
+  metadata.gz: 4a4c71775855fc653c039cee3c13749751f3954388c8d78309093241867c7dce5a1dc33c61fbdfb61c51e611674c87273e0f2acce0cdc291049edaf0a8feb039
+  data.tar.gz: 9a33dfee5ec2abe7d0fe6a8f02a24ea0c92526fcf7820c1717b789789ed57754f711d9158b7527f717cc16a7f3d95635049ba46fd0c546e66b6b724c4e8b01a9

data/CHANGELOG.md

@@ -1,3 +1,36 @@
+## [1.1.0](https://github.com/fgrehm/vagrant-lxc/compare/v1.0.1...1.1.0) (Jan 14, 2015)
+
+BACKWARDS INCOMPATIBILITIES:
+
+  - Support for Vagrant versions prior to 1.5 have been removed. The plugin now targets
+    Vagrant 1.7+ but it _might_ work on 1.5+.
+
+FEATURES:
+
+  - New experimental support for private networking [[GH-298]] / [[GH-120]].
+  - Support for formatted overlayfs path [[GH-329]]
+
+
+[GH-298]: https://github.com/fgrehm/vagrant-lxc/pull/298
+[GH-120]: https://github.com/fgrehm/vagrant-lxc/issues/120
+[GH-329]: https://github.com/fgrehm/vagrant-lxc/pull/329
+
+IMPROVEMENTS:
+
+  - The provider will now have a higher priority over the VirtualBox provider
+    in case VirtualBox is installed alongside lxc dependecies.
+  - Show an user friendly message when trying to use the plugin on non-Linux
+    environments.
+
+BUG FIXES:
+
+  - Allow backingstore options to be used along with the sudo wrapper script [[GH-310]]
+  - Trim automatically generated container names to 64 chars [[GH-337]]
+
+[GH-337]: https://github.com/fgrehm/vagrant-lxc/issues/337
+[GH-310]: https://github.com/fgrehm/vagrant-lxc/issues/310
+
+
 ## [1.0.1](https://github.com/fgrehm/vagrant-lxc/compare/v1.0.0...v1.0.1) (Oct 15, 2014)
 
 IMPROVEMENTS:

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.7.2'
   gem 'guard'
   gem 'guard-rspec'
   gem 'rb-inotify'

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/fgrehm/vagrant-cachier.git
-  revision: 6f275353b82ab57ada04c79f6fb2befce0395c77
+  revision: 9f6b615e84364b851939a8e7ee8229fc0d276c73
   specs:
-    vagrant-cachier (0.7.2)
+    vagrant-cachier (1.1.0)
 
 GIT
   remote: https://github.com/fgrehm/vagrant-pristine.git
@@ -12,7 +12,7 @@ GIT
 
 GIT
   remote: https://github.com/mitchellh/vagrant-spec.git
-  revision: c0dafc996165bf1628b672dd533f1858ff66fe4a
+  revision: 1df5a3af81cb7cce568b2eac52b8f6822bcb1d8e
   specs:
     vagrant-spec (0.0.1)
       childprocess (~> 0.5.0)
@@ -22,25 +22,30 @@ GIT
 
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: 0a5f6bb77e6a61b56c96057de94f5f8c6868e27c
+  revision: 1cd667b243f4a263cd5322b6455165cc676b6f7f
+  tag: v1.7.2
   specs:
-    vagrant (1.6.4.dev)
-      bundler (>= 1.5.2, < 1.7.0)
+    vagrant (1.7.2)
+      bundler (>= 1.5.2, < 1.8.0)
       childprocess (~> 0.5.0)
       erubis (~> 2.7.0)
+      hashicorp-checkpoint (~> 0.1.1)
       i18n (~> 0.6.0)
-      listen (~> 2.7.1)
+      listen (~> 2.8.0)
       log4r (~> 1.1.9, < 1.1.11)
       net-scp (~> 1.1.0)
+      net-sftp (~> 2.1)
       net-ssh (>= 2.6.6, < 2.10.0)
+      nokogiri (= 1.6.3.1)
       rb-kqueue (~> 0.2.0)
+      rest-client (>= 1.6.0, < 2.0)
       wdm (~> 0.1.0)
       winrm (~> 1.1.3)
 
 PATH
   remote: .
   specs:
-    vagrant-lxc (1.0.1)
+    vagrant-lxc (1.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -49,40 +54,47 @@ GEM
       gyoku (>= 0.4.0)
       nokogiri
     builder (3.2.2)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    childprocess (0.5.3)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
-    coveralls (0.7.0)
+    coveralls (0.7.1)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
       term-ansicolor
       thor
     diff-lcs (1.2.5)
-    docile (1.1.3)
+    docile (1.1.5)
     erubis (2.7.0)
-    ffi (1.9.3)
+    ffi (1.9.6)
     formatador (0.2.5)
     gssapi (1.0.3)
       ffi (>= 1.0.1)
-    guard (2.6.1)
+    guard (2.11.1)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
       pry (>= 0.9.12)
+      shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-rspec (4.2.9)
+    guard-compat (1.2.0)
+    guard-rspec (4.5.0)
       guard (~> 2.1)
-      rspec (>= 2.14, < 4.0)
-    gyoku (1.1.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    gyoku (1.2.2)
       builder (>= 2.1.2)
-    httpclient (2.4.0)
+    hashicorp-checkpoint (0.1.4)
+    hitimes (1.2.2)
+    httpclient (2.6.0.1)
     httpi (0.9.7)
       rack
-    i18n (0.6.9)
-    listen (2.7.7)
+    i18n (0.6.11)
+    listen (2.8.5)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -91,38 +103,46 @@ GEM
     logging (1.8.2)
       little-plugger (>= 1.1.3)
       multi_json (>= 1.8.4)
-    lumberjack (1.0.6)
+    lumberjack (1.0.9)
     method_source (0.8.2)
-    mime-types (2.3)
+    mime-types (2.4.3)
     mini_portile (0.6.0)
     multi_json (1.10.1)
+    nenv (0.1.1)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
     net-ssh (2.9.1)
-    nokogiri (1.6.2.1)
+    netrc (0.10.2)
+    nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     nori (1.1.5)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    notiffany (0.0.2)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
-    rake (10.3.2)
+    rack (1.6.0)
+    rake (10.4.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.3)
       ffi (>= 0.5.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    rest-client (1.7.2)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
       rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.0)
-    rspec-expectations (2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.0)
+    rspec-mocks (2.99.2)
     rubyntlm (0.1.1)
     savon (0.9.5)
       akami (~> 1.0)
@@ -132,18 +152,20 @@ GEM
       nokogiri (>= 1.4.0)
       nori (~> 1.0)
       wasabi (~> 1.0)
-    simplecov (0.8.2)
+    shellany (0.0.1)
+    simplecov (0.9.1)
       docile (~> 1.1.0)
-      multi_json
+      multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    slop (3.5.0)
+    slop (3.6.0)
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.18.1)
-    timers (1.1.0)
-    tins (1.3.0)
-    uuidtools (2.1.4)
+    timers (4.0.1)
+      hitimes
+    tins (1.3.3)
+    uuidtools (2.1.5)
     vagrant-omnibus (1.4.1)
     wasabi (1.0.0)
       nokogiri (>= 1.4.0)

data/README.md

@@ -2,47 +2,38 @@
 
 [![Build Status](https://travis-ci.org/fgrehm/vagrant-lxc.png?branch=master)](https://travis-ci.org/fgrehm/vagrant-lxc) [![Gem Version](https://badge.fury.io/rb/vagrant-lxc.png)](http://badge.fury.io/rb/vagrant-lxc) [![Code Climate](https://codeclimate.com/github/fgrehm/vagrant-lxc.png)](https://codeclimate.com/github/fgrehm/vagrant-lxc) [![Coverage Status](https://coveralls.io/repos/fgrehm/vagrant-lxc/badge.png?branch=master)](https://coveralls.io/r/fgrehm/vagrant-lxc) [![Gittip](http://img.shields.io/gittip/fgrehm.svg)](https://www.gittip.com/fgrehm/) [![Gitter chat](https://badges.gitter.im/fgrehm/vagrant-lxc.png)](https://gitter.im/fgrehm/vagrant-lxc)
 
-[LXC](http://lxc.sourceforge.net/) provider for [Vagrant](http://www.vagrantup.com/) 1.1+
+[LXC](http://lxc.sourceforge.net/) provider for [Vagrant](http://www.vagrantup.com/) 1.6+
 
 This is a Vagrant plugin that allows it to control and provision Linux Containers
 as an alternative to the built in VirtualBox provider for Linux hosts. Check out
 [this blog post](http://fabiorehm.com/blog/2013/04/28/lxc-provider-for-vagrant/)
 to see it in action.
 
-**NOTICE:** The master branch is targetting an initial beta for 1.0.0, for the
-latest stable version of the plugin, please check the [0.8-stable](https://github.com/fgrehm/vagrant-lxc/tree/0.8-stable)
-branch.
-
 
 ## Features
 
 * Provides the same workflow as the Vagrant VirtualBox provider
 * Port forwarding via [`redir`](http://linux.die.net/man/1/redir)
-
-As of now, it does not support public / private networks, but [private networks](https://github.com/fgrehm/vagrant-lxc/issues/120)
-will be coming along with the final 1.0.0 release.
+* Private networking via [`pipework`](https://github.com/jpetazzo/pipework)
 
 ## Requirements
 
-* [Vagrant 1.1+](http://www.vagrantup.com/downloads.html)
+* [Vagrant 1.5+](http://www.vagrantup.com/downloads.html) (tested with 1.7.2)
 * lxc 0.7.5+
 * `redir` (if you are planning to use port forwarding)
+* `brctl` (if you are planning to use private networks, on Ubuntu this means `apt-get install bridge-utils`)
 * A [kernel != 3.5.0-17.28](https://github.com/fgrehm/vagrant-lxc/wiki/Troubleshooting#wiki-im-unable-to-restart-containers)
 
 The plugin is known to work better and pretty much out of the box on Ubuntu 14.04+
 hosts and installing the dependencies on it basically means a `apt-get install lxc lxc-templates cgroup-lite redir`
-and a `apt-get update && apt-get dist-upgrade` to upgrade the kernel. For Debian
-hosts you'll need to follow the instructions described on the [Wiki](https://github.com/fgrehm/vagrant-lxc/wiki/Usage-on-debian-hosts)
-and old lxc versions (like 0.7.5 shipped with Ubuntu 12.04 by default) might require
-[additional configurations to work](#backingstore-options).
+(older LXC versions like 0.7.5 shipped with Ubuntu 12.04 by default might require
+[additional configurations to work](#backingstore-options)). For setting up other
+types of hosts please have a look at the [Wiki](https://github.com/fgrehm/vagrant-lxc/wiki).
 
 If you are on a Mac or Windows machine, you might want to have a look at [this](http://the.taoofmac.com/space/HOWTO/Vagrant)
 blog post for some ideas on how to set things up or check out [this other repo](https://github.com/fgrehm/vagrant-lxc-vbox-hosts)
 for a set of Vagrant VirtualBox machines ready for vagrant-lxc usage.
 
-**NOTE: Some users have been experiencing networking issues and right now you might need to
-disable checksum offloading as described on [this comment](https://github.com/fgrehm/vagrant-lxc/issues/153#issuecomment-26441273)**
-
 
 ## Installation
 
@@ -58,27 +49,25 @@ vagrant init fgrehm/precise64-lxc
 vagrant up --provider=lxc
 ```
 
-_Set the `VAGRANT_DEFAULT_PROVIDER` environmental variable to `lxc` in order to
-avoid typing `--provider=lxc` all the time._
-
+_More information about skipping the `--provider` argument can be found at the
+"DEFAULT PROVIDER" section of [Vagrant docs](https://docs.vagrantup.com/v2/providers/basic_usage.html)_
 
 ## Base boxes
 
-Base boxes can be found on [VagrantCloud](https://vagrantcloud.com/search?provider=lxc)
+Base boxes can be found on [Atlas](https://atlas.hashicorp.com/boxes/search?provider=lxc)
 and some scripts to build your own are available at [fgrehm/vagrant-lxc-base-boxes](https://github.com/fgrehm/vagrant-lxc-base-boxes).
 
 If you want to build your own boxes, please have a look at [`BOXES.md`](https://github.com/fgrehm/vagrant-lxc/tree/master/BOXES.md)
 for more information.
 
-
 ## Advanced configuration
 
-If you want, you can modify container configurations from within your Vagrantfile
-using the [provider block](http://docs.vagrantup.com/v2/providers/configuration.html):
+You can modify container configurations from within your Vagrantfile using the
+[provider block](http://docs.vagrantup.com/v2/providers/configuration.html):
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.box = "quantal64"
+  config.vm.box = "fgrehm/trusty64-lxc"
   config.vm.provider :lxc do |lxc|
     # Same effect as 'customize ["modifyvm", :id, "--memory", "1024"]' for VirtualBox
     lxc.customize 'cgroup.memory.limit_in_bytes', '1024M'
@@ -92,6 +81,28 @@ prior to starting it.
 
 For other configuration options, please check the [lxc.conf manpages](http://manpages.ubuntu.com/manpages/precise/man5/lxc.conf.5.html).
 
+### Private Networks [EXPERIMENTAL]
+
+Starting with vagrant-lxc 1.1.0, there is some rudimentary support for configuring
+[Private Networks](https://docs.vagrantup.com/v2/networking/private_network.html)
+by leveraging the [pipework](https://github.com/jpetazzo/pipework) project.
+
+On its current state, there is a requirement for setting the bridge name that
+will be created and will allow your machine to comunicate with the container
+
+For example:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.network "private_network", ip: "192.168.2.100", lxc__bridge_name: 'vlxcbr1'
+end
+```
+
+Will create a new `veth` device for the container and will set up (or reuse)
+a `vlxcbr1` bridge between your machine and the `veth` device. Once the last
+vagrant-lxc container attached to the bridge gets `vagrant halt`ed, the plugin
+will delete the bridge.
+
 ### Container naming
 
 By default vagrant-lxc will attempt to generate a unique container name
@@ -109,6 +120,9 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+_Please note that there is a 64 chars limit and the container name will be
+trimmed down to that to ensure we can always bring the container up.
+
 ### Backingstore options
 
 Support for setting `lxc-create`'s backingstore option (`-B` and related) can be
@@ -139,12 +153,12 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-### Avoiding `sudo` passwords
+## Avoiding `sudo` passwords
 
 This plugin requires **a lot** of `sudo`ing since [user namespaces](https://wiki.ubuntu.com/UserNamespace)
-are not supported on mainstream kernels. To work around that, you can use the
-`vagrant lxc sudoers` command which will create a file under `/etc/sudoers.d/vagrant-lxc-<VERSION>`
-whitelisting all commands required by `vagrant-lxc` to run.
+is not supported yet. To work around that, you can use the `vagrant lxc sudoers`
+command which will create a file under `/etc/sudoers.d/vagrant-lxc` whitelisting
+all commands required by `vagrant-lxc` to run.
 
 If you are interested on what will be generated by that command, please check
 [this code](lib/vagrant-lxc/command/sudoers.rb).

data/lib/vagrant-lxc/action.rb

@@ -8,23 +8,15 @@ require 'vagrant-lxc/action/fetch_ip_with_lxc_attach'
 require 'vagrant-lxc/action/fetch_ip_from_dnsmasq_leases'
 require 'vagrant-lxc/action/forced_halt'
 require 'vagrant-lxc/action/forward_ports'
+require 'vagrant-lxc/action/gc_private_network_bridges'
 require 'vagrant-lxc/action/handle_box_metadata'
 require 'vagrant-lxc/action/prepare_nfs_settings'
 require 'vagrant-lxc/action/prepare_nfs_valid_ids'
+require 'vagrant-lxc/action/private_networks'
 require 'vagrant-lxc/action/remove_temporary_files'
 require 'vagrant-lxc/action/setup_package_files'
 require 'vagrant-lxc/action/warn_networks'
 
-unless Vagrant::Backports.vagrant_1_3_or_later?
-  require 'vagrant-backports/action/wait_for_communicator'
-end
-unless Vagrant::Backports.vagrant_1_5_or_later?
-  require 'vagrant-backports/ui'
-  require 'vagrant-backports/action/handle_box'
-  require 'vagrant-backports/action/message'
-  require 'vagrant-backports/action/is_state'
-end
-
 module Vagrant
   module LXC
     module Action
@@ -57,18 +49,14 @@ module Vagrant
           b.use Builtin::Provision
           b.use Builtin::EnvSet, :port_collision_repair => true
           b.use Builtin::HandleForwardedPortCollisions
-          if Vagrant::Backports.vagrant_1_4_or_later?
-            b.use PrepareNFSValidIds
-            b.use Builtin::SyncedFolderCleanup
-            b.use Builtin::SyncedFolders
-            b.use PrepareNFSSettings
-          else
-            require 'vagrant-lxc/backports/action/share_folders'
-            b.use ShareFolders
-          end
+          b.use PrepareNFSValidIds
+          b.use Builtin::SyncedFolderCleanup
+          b.use Builtin::SyncedFolders
+          b.use PrepareNFSSettings
           b.use Builtin::SetHostname
           b.use WarnNetworks
           b.use ForwardPorts
+          b.use PrivateNetworks
           b.use Boot
           b.use Builtin::WaitForCommunicator
         end
@@ -139,6 +127,7 @@ module Vagrant
 
             b2.use ClearForwardedPorts
             b2.use RemoveTemporaryFiles
+            b2.use GcPrivateNetworkBridges
             b2.use Builtin::Call, Builtin::GracefulHalt, :stopped, :running do |env2, b3|
               if !env2[:result]
                 b3.use ForcedHalt
@@ -158,16 +147,13 @@ module Vagrant
               next
             end
 
-            # 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 Builtin::ConfigValidate
                 b3.use Builtin::EnvSet, :force_halt => true
                 b3.use action_halt
                 b3.use Destroy
-                if Vagrant::Backports.vagrant_1_3_or_later?
-                  b3.use Builtin::ProvisionerCleanup
-                end
+                b3.use Builtin::ProvisionerCleanup
               else
                 b3.use Builtin::Message, I18n.t("vagrant_lxc.messages.will_not_destroy")
               end