vagrant-lxd 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61672c78ba393c4f34973d8d0f56a76568dcb3be
-  data.tar.gz: b0c08820b88572b7fc94fa67559d4c129f06f647
+  metadata.gz: 5b7a90200673f156589bed529f7a173e7950798d
+  data.tar.gz: 2e266432e3978370153b9788740ab7619fb61687
 SHA512:
-  metadata.gz: 4b0cca7c0d4fa3c8c9c6f5931a6db8e5ed1988fada9085461a1c2eedfcd2785e729f2812c0aa7c210f2916d277018c57883f52f6457f6aaea42c4285bf876cf4
-  data.tar.gz: dc7da8f906ccf8ca2e81ca3d2b43c6c3cde6cf4cd9b3b58e0c2c6420c2d4dc45b68a5335602bb7a3d3a339654ef1015fe0dc0f42b026ac3fa25bb1d8507ee29b
+  metadata.gz: c69f93fad75e816cc856e75783b040bd38188468d7a4f8f098eddfb0f592e22d5fbdb23dacc430f23b72f48c07aaabc409246fbbbe8096dbb0ea999285ad821c
+  data.tar.gz: e77b010f6287d9aa119f535e845859cbc85ee0a16269ccacd6abedd6f884bba82e1dc076f7d230ec0d2169d3796cee56a091b5ab69e46d8b5d67ea8edc2a21b8

data/Gemfile.lock

@@ -23,8 +23,8 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxd (0.1.2)
-      hyperkit (~> 1.1.0)
+    vagrant-lxd (0.1.3)
+      hyperkit (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -145,4 +145,4 @@ DEPENDENCIES
   vagrant-lxd!
 
 BUNDLED WITH
-   1.15.3
+   1.16.1

data/README.md

@@ -80,6 +80,8 @@ Vagrant.configure('2') do |config|
     lxd.api_endpoint = 'https://127.0.0.1:8443'
     lxd.timeout = 10
     lxd.name = nil
+    lxd.nesting = false
+    lxd.privileged = false
     lxd.ephemeral = false
   end
 end
@@ -119,6 +121,21 @@ container called "my-container", use the `vagrant lxd attach` command:
     $ vagrant lxd attach default my-container
     ==> default: Attaching to container 'my-container'...
 
+### Nested Containers
+
+In order to run Linux containers on an LXD-backed machine, it must be
+created with the `nesting` and `privileged` properties set to `true`.
+These correspond to the `security.nesting` and `security.privileged`
+configuration items for LXD, respectively. Refer to LXD's [container
+configuration documentation][docs] for details.
+
+    config.vm.provider 'lxd' do |lxd|
+      lxd.nesting = true
+      lxd.privileged = true
+    end
+
+[docs]: https://lxd.readthedocs.io/en/latest/containers/
+
 ## Hacking
 
 To run Vagrant with the plugin automatically loaded, you can use the

data/lib/vagrant-lxd/config.rb

@@ -23,12 +23,16 @@ module VagrantLXD
   class Config < Vagrant.plugin('2', :config)
     attr_accessor :api_endpoint
     attr_accessor :name
+    attr_accessor :nesting
+    attr_accessor :privileged
     attr_accessor :ephemeral
     attr_accessor :timeout
 
     def initialize
       @name = UNSET_VALUE
       @timeout = UNSET_VALUE
+      @nesting = UNSET_VALUE
+      @privileged = UNSET_VALUE
       @ephemeral = UNSET_VALUE
       @api_endpoint = UNSET_VALUE
     end
@@ -47,7 +51,7 @@ module VagrantLXD
       end
 
       unless timeout == UNSET_VALUE
-        if not timeout.is_a? Fixnum
+        if not timeout.is_a? Integer
           errors << "Invalid `timeout' (value must be an integer): #{timeout.inspect}"
         elsif timeout < 1
           errors << "Invalid `timeout' (value must be positive): #{timeout.inspect}"
@@ -62,6 +66,14 @@ module VagrantLXD
         end
       end
 
+      unless [UNSET_VALUE, true, false].include? nesting
+        errors << "Invalid `nesting' (value must be true or false): #{nesting.inspect}"
+      end
+
+      unless [UNSET_VALUE, true, false].include? privileged
+        errors << "Invalid `privileged' (value must be true or false): #{privileged.inspect}"
+      end
+
       unless [UNSET_VALUE, true, false].include? ephemeral
         errors << "Invalid `ephemeral' (value must be true or false): #{ephemeral.inspect}"
       end
@@ -74,6 +86,14 @@ module VagrantLXD
         @name = nil
       end
 
+      if nesting == UNSET_VALUE
+        @nesting = false
+      end
+
+      if privileged == UNSET_VALUE
+        @privileged = false
+      end
+
       if ephemeral == UNSET_VALUE
         @ephemeral = false
       end

data/lib/vagrant-lxd/driver.rb

@@ -88,6 +88,8 @@ module VagrantLXD
     NOT_CREATED = Vagrant::MachineState::NOT_CREATED_ID
 
     attr_reader :api_endpoint
+    attr_reader :nesting
+    attr_reader :privileged
     attr_reader :ephemeral
     attr_reader :name
     attr_reader :timeout
@@ -96,6 +98,8 @@ module VagrantLXD
       @machine = machine
       @timeout = machine.provider_config.timeout
       @api_endpoint = machine.provider_config.api_endpoint
+      @nesting = machine.provider_config.nesting
+      @privileged = machine.provider_config.privileged
       @ephemeral = machine.provider_config.ephemeral
       @name = machine.provider_config.name
       @logger = Log4r::Logger.new('vagrant::lxd')
@@ -365,7 +369,10 @@ module VagrantLXD
     end
 
     def config
-      config = {}
+      config = {
+        :'security.nesting' => nesting,
+        :'security.privileged' => privileged,
+      }
 
       # Set "raw.idmap" if the host's sub{u,g}id configuration allows it.
       # This allows sharing folders via LXD (see synced_folder.rb).

data/lib/vagrant-lxd/version.rb

@@ -20,7 +20,7 @@
 module VagrantLXD
   module Version
     NAME = 'vagrant-lxd'
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
     DESCRIPTION = 'Vagrant LXD provider'
   end
 end

data/vagrant-lxd.gemspec

@@ -28,12 +28,12 @@ Gem::Specification.new do |spec|
   spec.description   = 'A Vagrant plugin that allows management of containers using LXD.'
   spec.authors       = ['Evan Hanson']
   spec.email         = ['evanh@catalyst.net.nz']
-  spec.license       = 'GPLv3'
+  spec.license       = 'GPL-3.0'
   spec.homepage      = 'https://gitlab.com/catalyst-it/vagrant-lxd'
   spec.require_paths = ['lib']
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
 
-  spec.add_runtime_dependency 'hyperkit', '~> 1.1.0'
+  spec.add_runtime_dependency 'hyperkit', '~> 1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxd
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Evan Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyperkit
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 description: A Vagrant plugin that allows management of containers using LXD.
 email:
 - evanh@catalyst.net.nz
@@ -52,7 +52,7 @@ files:
 - vagrant-lxd.gemspec
 homepage: https://gitlab.com/catalyst-it/vagrant-lxd
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []