vagrant-lxc 0.8.0 → 1.0.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee93b037eb8ad8145d874a64f28a585bba51ab3f
-  data.tar.gz: 41040fa650a3be3ec3bf59c9f8eed18a9a84cdfa
+  metadata.gz: 51c1ffd96f522003bc67e527711bbb7c3e47581e
+  data.tar.gz: 13fe22e65136a8409f05bf321202d05952d185c8
 SHA512:
-  metadata.gz: 48855758f0ed808c6caa4a5c48852811c128e0ab223204f2b01b5091695475e541d15283a3588d1202b795460e1d02086d1c622a2148d4a9adddfdde252460a0
-  data.tar.gz: 25e57b7957bec28488416a534313cf431147c88cf131549b163b37ec823f427f00beef8ffa716d7f1f01ffaf477035c219e925b8f5b3ca12f9a8e8be6d5eff24
+  metadata.gz: 4910e182e07740f92222861344cd4f87bd092361dde180639e59aaae37762d314ff24402d268d03359db9519ccc5b465dc4c0b5d570d8bc4e4793b50fa57c662
+  data.tar.gz: 81d2ace93c821bf408730e76d06efa94dcf7e8358d794a72324d42a9d90d791dd4549531923662cfa10df13b6fc9d5cf8333460352009e2dee158a99e2d797ec

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.1.1
 matrix:
   allow_failures:
-    - rvm: 2.0.0
+    - rvm: 2.1.1
 script: "bundle exec rake ci"

data/BOXES.md

@@ -4,20 +4,11 @@ Although the official documentation says it is only supported for VirtualBox
 environments, you can use the [`vagrant package`](http://docs.vagrantup.com/v2/cli/package.html)
 command to export a `.box` file from an existing vagrant-lxc container.
 
-There is also a set of [bash scripts](https://github.com/fgrehm/vagrant-lxc/tree/master/boxes)
+There is also a set of [bash scripts](https://github.com/fgrehm/vagrant-lxc-base-boxes)
 that you can use to build base boxes as needed. By default it won't include any
 provisioning tool and you can pick the ones you want by providing some environment
-variables.
-
-For example:
-
-```
-git clone https://github.com/fgrehm/vagrant-lxc.git
-cd vagrant-lxc/boxes
-PUPPET=1 CHEF=1 sudo -E ./build-ubuntu-box.sh precise amd64
-```
-
-Will build a Ubuntu Precise x86_64 box with latest Puppet and Chef pre-installed, please refer to the scripts for more information.
+variables. Please refer to the [base boxes repository](https://github.com/fgrehm/vagrant-lxc-base-boxes)
+for more information.
 
 ## "Anatomy" of a box
 
@@ -26,19 +17,20 @@ on knowing what makes a base box for vagrant-lxc, here's what's needed:
 
 ### Expected `.box` contents
 
-| FILE            | DESCRIPTION |
-| ---             | ---         |
-| `lxc-template`  | Script responsible for creating and setting up the container (used with `lxc-create`), a ["generic script"]() is provided along with project's source. |
-| `rootfs.tar.gz` | Compressed container rootfs tarball (need to remeber to pass in `--numeric-owner` when creating it) |
-| `lxc.conf`      | |
-| `metadata.json` | |
+| FILE            | REQUIRED? | DESCRIPTION |
+| ---             | ---       | ---         |
+| `metadata.json` | Yes       | Required by Vagrant |
+| `rootfs.tar.gz` | Yes       | Compressed container rootfs tarball (need to remeber to pass in `--numeric-owner` when creating it) |
+| `lxc-template`  | No, a ["generic script"](scripts/lxc-template) is provided by the plugin if it doesn't exist on the base box | Script responsible for creating and setting up the container (used with `lxc-create`). |
+| `lxc-config`    | No        | Box specific configuration to be _appended_ to the system's generated container config file |
+| `lxc.conf`      | No        | File passed in to `lxc-create -f` |
 
 ### metadata.json
 
 ```json
 {
   "provider": "lxc",
-  "version":  "3",
+  "version":  "1.0.0",
   "built-on": "Sat Sep 21 21:10:00 UTC 2013",
   "template-opts": {
     "--arch":    "amd64",
@@ -51,5 +43,5 @@ on knowing what makes a base box for vagrant-lxc, here's what's needed:
 | ---             | ---       | ---         |
 | `provider`      | Yes       | Required by Vagrant |
 | `version`       | Yes       | Tracks backward incompatibilities |
-| `built-on`      | No        | Date / time when the box was packaged |
-| `template-opts` | No        | Extra options to be passed to the `lxc-template` script provided with the .box package |
+| `built-on`      | No        | Date / time when the box was packaged for the first time |
+| `template-opts` | No        | Extra options to be passed to the `lxc-template` script |

data/CHANGELOG.md

@@ -1,3 +1,52 @@
+## [1.0.0.alpha.1](https://github.com/fgrehm/vagrant-lxc/compare/v0.8.0...v1.0.0.alpha.1) (Mar 04, 2014)
+
+DEPRECATIONS:
+
+  - Support to **all Vagrant versions prior to 1.5 are now deprecated**, there is a
+    [small layer](lib/vagrant-backports) that ensures compatibility with versions
+    starting with 1.1.5 but there is no guarantee that it will stick for too long.
+  - Boxes released prior to this version are now deprecated and won't be available
+    after the final 1.0.0 release.
+  - `--auth-key` argument is no longer provided to `lxc-template`. This will cause
+    all official base boxes prior to 09/28/2013 to break.
+
+FEATURES:
+
+  - New `vagrant lxc sudoers` command for creating a policy for users in order to
+    avoid `sudo` passwords [[GH-237]] / [[GH-257]]
+  - Support for NFS and rsync synced folders.
+  - Support for synced folder mount options allowing for using read only synced
+    folders [[GH-193]]
+
+[GH-237]: https://github.com/fgrehm/vagrant-lxc/issues/237
+[GH-257]: https://github.com/fgrehm/vagrant-lxc/pull/257
+[GH-193]: https://github.com/fgrehm/vagrant-lxc/issues/193
+
+IMPROVEMENTS:
+
+  - `lxc-template` is now optional for base boxes and are bundled with the plugin,
+    allowing us to roll out updates without the need to rebuild boxes [[GH-254]]
+  - Set container's `utsname` to `config.vm.hostname` by default [[GH-253]]
+  - Added libvirt dnsmasq leases file to the lookup paths [[GH-251]]
+  - Improved compatibility with Vagrant 1.4 / 1.5 including the ability
+    to use `rsync` and `nfs` shared folders to work around synced folders
+    permission problems. More information can be found on the following
+    issues: [[GH-151]] [[GH-191]] [[GH-241]] [[GH-242]]
+  - Warn in case `:group` or `:owner` are specified for synced folders [[GH-196]]
+  - Acceptance specs are now powered by `vagrant-spec` [[GH-213]]
+  - Base boxes creation scripts were moved out to https://github.com/fgrehm/vagrant-lxc-base-boxes.
+
+[GH-254]: https://github.com/fgrehm/vagrant-lxc/issues/254
+[GH-196]: https://github.com/fgrehm/vagrant-lxc/issues/196
+[GH-251]: https://github.com/fgrehm/vagrant-lxc/pull/251
+[GH-253]: https://github.com/fgrehm/vagrant-lxc/pull/253
+[GH-151]: https://github.com/fgrehm/vagrant-lxc/issues/151
+[GH-213]: https://github.com/fgrehm/vagrant-lxc/issues/213
+[GH-191]: https://github.com/fgrehm/vagrant-lxc/issues/191
+[GH-241]: https://github.com/fgrehm/vagrant-lxc/issues/241
+[GH-242]: https://github.com/fgrehm/vagrant-lxc/issues/242
+
+
 ## [0.8.0](https://github.com/fgrehm/vagrant-lxc/compare/v0.7.0...v0.8.0) (Feb 26, 2014)
 
 FEATURES:

data/CONTRIBUTING.md

@@ -1,14 +1,17 @@
 ### Please read before contributing
 
+* If you have an issue with base boxes, please create it on https://github.com/fgrehm/vagrant-lxc-base-boxes,
+  this repository is for the Vagrant plugin only.
+
 * Try not to post questions in the issues tracker. I will probably answer you
   but I'll most likely close the issue right away and will continue the discussion
   with the issue closed. If you have any questions about the plugin, make sure
   you go through the [Wiki](https://github.com/fgrehm/vagrant-lxc/wiki) pages
   first (specially the [Troubleshooting Section](https://github.com/fgrehm/vagrant-lxc/wiki/Troubleshooting))
   and if you still need answers please ask a question on [Stack Overflow](http://stackoverflow.com/questions/tagged/vagrant-lxc)
-  using the `vagrant-lxc` tag on it so that I get notified :)
+  using the `vagrant` / `lxc` tag on it so that I get notified :)
 
-* Please do a small search on the issues tracker before submitting your issue to
+* Please do a search on the issues tracker before submitting your issue to
   check if it was already reported / fixed.
 
 * When reporting a bug, please include **all** information that you can get

data/Gemfile

@@ -1,24 +1,23 @@
 source 'https://rubygems.org'
 
-gemspec
-
 group :development do
-  gem 'vagrant',          github: 'mitchellh/vagrant'
-  gem 'vagrant-cachier',  github: 'fgrehm/vagrant-cachier'
-  gem 'vagrant-pristine', github: 'fgrehm/vagrant-pristine'
-  gem 'vagrant-omnibus'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.5.1'
   gem 'guard'
   gem 'guard-rspec'
   gem 'rb-inotify'
 end
 
-
 group :development, :test do
   gem 'rake'
-  # Update https://github.com/fgrehm/vagrant-lxc/issues/111 once we are able to
-  # upgrade to a newer release
-  gem 'rspec',       '~> 2.13.0'
-  gem 'rspec-fire',  require: 'rspec/fire'
-  gem 'rspec-spies', require: false
-  gem 'coveralls',   require: false
+  gem 'rspec',        '2.99.0.beta2'
+  gem 'coveralls',    require: (ENV['COVERAGE'] == 'true')
+  gem 'vagrant-spec', git: 'https://github.com/mitchellh/vagrant-spec.git'
+end
+
+group :plugins do
+  acceptance = (ENV['ACCEPTANCE'] == 'true')
+  gem 'vagrant-cachier',  git: 'https://github.com/fgrehm/vagrant-cachier.git',  require: !acceptance
+  gem 'vagrant-pristine', git: 'https://github.com/fgrehm/vagrant-pristine.git', require: !acceptance
+  gem 'vagrant-omnibus',  require: !acceptance
+  gemspec
 end

data/Gemfile.lock

@@ -1,40 +1,55 @@
 GIT
-  remote: git://github.com/fgrehm/vagrant-cachier.git
-  revision: a9f41c5f01297773f209c0525400e22704b40c93
+  remote: https://github.com/fgrehm/vagrant-cachier.git
+  revision: 2df1e319408a7e6f1c6e75d48e36591199e98527
   specs:
-    vagrant-cachier (0.5.0)
+    vagrant-cachier (0.6.1.dev)
 
 GIT
-  remote: git://github.com/fgrehm/vagrant-pristine.git
-  revision: 4638491786943bfbf6f115b1fc379f069963fe46
+  remote: https://github.com/fgrehm/vagrant-pristine.git
+  revision: 503dbc47848c81d0fbfa6840491856f518d244a1
   specs:
     vagrant-pristine (0.3.0)
 
 GIT
-  remote: git://github.com/mitchellh/vagrant.git
-  revision: a92e03cf4ce936243d3959b7b5603262a234a58d
+  remote: https://github.com/mitchellh/vagrant-spec.git
+  revision: aae28ee57071cdd121ca782c6e0709a5c650a4be
   specs:
-    vagrant (1.3.6.dev)
-      childprocess (~> 0.3.7)
+    vagrant-spec (0.0.1)
+      childprocess (~> 0.5.0)
+      log4r (~> 1.1.9)
+      rspec (~> 2.14)
+      thor (~> 0.18.1)
+
+GIT
+  remote: https://github.com/mitchellh/vagrant.git
+  revision: 6977e93ba98fd19112b1fed74dafb8619f581984
+  tag: v1.5.1
+  specs:
+    vagrant (1.5.1)
+      bundler (~> 1.5.2)
+      childprocess (~> 0.5.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
-      log4r (~> 1.1.9)
+      listen (~> 2.4.0)
+      log4r (~> 1.1.9, < 1.1.11)
       net-scp (~> 1.1.0)
-      net-ssh (~> 2.6.6)
+      net-ssh (>= 2.6.6, < 2.8.0)
+      rb-kqueue (~> 0.2.0)
+      wdm (~> 0.1.0)
 
 PATH
   remote: .
   specs:
-    vagrant-lxc (0.8.0)
+    vagrant-lxc (1.0.0.alpha.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    childprocess (0.3.9)
+    childprocess (0.5.1)
       ffi (~> 1.0, >= 1.0.11)
-    coderay (1.0.9)
+    coderay (1.1.0)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
@@ -42,64 +57,65 @@ GEM
       term-ansicolor
       thor
     diff-lcs (1.2.5)
+    docile (1.1.3)
     erubis (2.7.0)
     ffi (1.9.3)
     formatador (0.2.4)
-    guard (2.2.3)
+    guard (2.4.0)
       formatador (>= 0.2.4)
       listen (~> 2.1)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-rspec (3.1.0)
-      guard (>= 1.8)
-      rspec (~> 2.13)
-    i18n (0.6.5)
-    listen (2.2.0)
+    guard-rspec (4.2.8)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    i18n (0.6.9)
+    listen (2.4.1)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     log4r (1.1.10)
     lumberjack (1.0.4)
     method_source (0.8.2)
-    mime-types (2.0)
-    multi_json (1.8.2)
+    mime-types (2.1)
+    multi_json (1.9.0)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.8)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    net-ssh (2.7.0)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
+    rake (10.1.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.2)
       ffi (>= 0.5.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rspec (2.99.0.beta2)
+      rspec-core (= 2.99.0.beta2)
+      rspec-expectations (= 2.99.0.beta2)
+      rspec-mocks (= 2.99.0.beta2)
+    rspec-core (2.99.0.beta2)
+    rspec-expectations (2.99.0.beta2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-fire (1.3.0)
-      rspec (>= 2.11, < 4)
-    rspec-mocks (2.13.1)
-    rspec-spies (2.1.4)
-      rspec (~> 2.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.4.6)
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
+    rspec-mocks (2.99.0.beta2)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.5.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
     thor (0.18.1)
     timers (1.1.0)
-    tins (0.13.0)
-    vagrant-omnibus (1.1.2)
+    tins (1.0.0)
+    vagrant-omnibus (1.3.1)
+    wdm (0.1.0)
 
 PLATFORMS
   ruby
@@ -110,11 +126,10 @@ DEPENDENCIES
   guard-rspec
   rake
   rb-inotify
-  rspec (~> 2.13.0)
-  rspec-fire
-  rspec-spies
+  rspec (= 2.99.0.beta2)
   vagrant!
   vagrant-cachier!
   vagrant-lxc!
   vagrant-omnibus
   vagrant-pristine!
+  vagrant-spec!

data/README.md

@@ -9,20 +9,31 @@ 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 / Limitations
+## Usage with Vagrant 1.5
+
+Usage with the recently released Vagrant 1.5 is only possible by [building the
+plugin from sources](https://github.com/fgrehm/vagrant-lxc/wiki/Development#wiki-installing-the-plugin-from-source).
+The 1.0.0.beta1 version of the plugin that will ship with the changes required
+is expected to be released by April, 2014.
+
+
+## Features
 
 * Provides the same workflow as the Vagrant VirtualBox provider
 * Port forwarding via [`redir`](http://linux.die.net/man/1/redir)
-* Does not support public / private networks
-* Assumes you have a `lxcbr0` bridge configured on your host similar to [Ubuntu's built-in](https://help.ubuntu.com/lts/serverguide/lxc.html#lxcbr0)
 
+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 _soon_.
 
 ## Requirements
 
-* [Vagrant 1.1+](http://downloads.vagrantup.com/)
+* [Vagrant 1.1+](http://www.vagrantup.com/downloads.html)
 * lxc 0.7.5+
-* redir (if you are planning to use port forwarding)
+* `redir` (if you are planning to use port forwarding)
 * 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 12.04+
@@ -50,26 +61,23 @@ vagrant plugin install vagrant-lxc
 ```
 
 
-## Usage
+## Quick start
 
-After installing, add a [base box](#base-boxes) using any name you want, for example:
+On Vagrant 1.5+:
 
 ```
-vagrant box add quantal64 http://bit.ly/vagrant-lxc-quantal64-2013-10-23
+vagrant init fgrehm/precise64-lxc
+vagrant up --provider=lxc
 ```
 
-Then create a Vagrantfile that looks like the following, changing the box name
-to the one you've just added:
+On Vagrant < 1.5:
 
-```ruby
-Vagrant.configure("2") do |config|
-  config.vm.box = "quantal64"
-end
+```
+vagrant init precise64 http://bit.ly/vagrant-lxc-precise64-2013-10-23
+vagrant up --provider=lxc
 ```
 
-And finally run `vagrant up --provider=lxc`.
-
-If you are using Vagrant 1.2+ you can also set `VAGRANT_DEFAULT_PROVIDER`
+If you are using Vagrant 1.2+ you can also set the `VAGRANT_DEFAULT_PROVIDER`
 environmental variable to `lxc` in order to avoid typing `--provider=lxc` all
 the time.
 
@@ -93,7 +101,7 @@ vagrant-lxc will then write out `lxc.cgroup.memory.limit_in_bytes='1024M'` to th
 container config file (usually kept under `/var/lib/lxc/<container>/config`)
 prior to starting it.
 
-For other configuration options, please check the [lxc.conf manpages](http://manpages.ubuntu.com/manpages/quantal/man5/lxc.conf.5.html).
+For other configuration options, please check the [lxc.conf manpages](http://manpages.ubuntu.com/manpages/precise/man5/lxc.conf.5.html).
 
 ### Container naming
 
@@ -117,16 +125,22 @@ end
 ### 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. Have a look at the [Wiki](https://github.com/fgrehm/vagrant-lxc/wiki/Avoiding-'sudo'-passwords)
-to find out how to work around that specially if you are running an OS with `sudo`
-< 1.8.4 (like Ubuntu 12.04) as you might be affected by a bug.
+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-<USER>`
+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/commands/sudoers.rb#L58-L81).
+
+_vagrant-lxc < 1.0.0 users, please check this [Wiki page](https://github.com/fgrehm/vagrant-lxc/wiki/Avoiding-%27sudo%27-passwords)_
 
 ### Base boxes
 
-Please check [the wiki](https://github.com/fgrehm/vagrant-lxc/wiki/Base-boxes)
-for a list of [pre built](https://github.com/fgrehm/vagrant-lxc/wiki/Base-boxes#available-boxes)
-base boxes and have a look at [`BOXES.md`](https://github.com/fgrehm/vagrant-lxc/tree/master/BOXES.md)
-for more information on building your own.
+Base boxes can be found on [VagrantCloud](https://vagrantcloud.com/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.
 
 
 ## More information