vagrant-lxd 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abc3e26c2ce8d3408a4e4469219404dc24a08d50
-  data.tar.gz: 720aac0252d1af7b40a0d15893fa8aeebaa08bcf
+  metadata.gz: 6f520f19dbe7785aae63572ae288e858e8cb1752
+  data.tar.gz: 36579c91dc77ca0b0cd969af53e2fc7e25586add
 SHA512:
-  metadata.gz: 754310e162e9d5716514c9fa0a938b055c53355553433379c7bc5e484933025a22bbc10c3e1a95e4b6f7c2cc524e3178ede1461a20aebe05f572589a23c3d3b7
-  data.tar.gz: 0dd64052ec2514532ca7d73828048674f6753317d9da5f6be0b53fb89c93ba8b9abe634d176b85a36f5935210afc8d9d0611d542aa1b2d4f51a6eecee3cf4315
+  metadata.gz: 0e4bd0c5fa78d6d87efd722b2486852290367d41f60c706b2cba4d242cff1d0432dc3fd7383d1da600dd2f923191fa8ec4cac14e3acc3eca4925643badbd9356
+  data.tar.gz: c5a7e42a14dd8b1610d2c82c9227c2bc05cbbbc5f4489c6776d62f95d383824083cfea7ef928424d4d84b47ed42b9941fa670e1c8dfc832443de2d456f022e38

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: dbba41a7ec3d87830f9b1895266d6a807c1cd2e0
+  revision: 04f7215b5e3f594368696262920deaf631315e37
   specs:
-    vagrant (2.1.2.dev)
+    vagrant (2.1.3.dev)
       childprocess (~> 0.6.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.5)
@@ -16,8 +16,6 @@ GIT
       rest-client (>= 1.6.0, < 3.0)
       ruby_dep (<= 1.3.1)
       wdm (~> 0.1.0)
-      win32-file (~> 0.8.1)
-      win32-file-security (~> 1.0.10)
       winrm (~> 2.1)
       winrm-elevated (~> 1.1)
       winrm-fs (~> 1.0)
@@ -25,7 +23,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxd (0.2.1)
+    vagrant-lxd (0.3.0)
       hyperkit (~> 1.1.0)
 
 GEM
@@ -45,12 +43,10 @@ GEM
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    fakefs (0.14.1)
+    fakefs (0.14.2)
     faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.23)
-    ffi-win32-extensions (1.0.3)
-      ffi
+    ffi (1.9.25)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
@@ -125,16 +121,6 @@ GEM
       unf_ext
     unf_ext (0.0.7.5)
     wdm (0.1.1)
-    win32-file (0.8.1)
-      ffi
-      ffi-win32-extensions
-      win32-file-stat (>= 1.4.0)
-    win32-file-security (1.0.10)
-      ffi
-      ffi-win32-extensions
-    win32-file-stat (1.5.5)
-      ffi
-      ffi-win32-extensions
     winrm (2.2.3)
       builder (>= 2.1.2)
       erubis (~> 2.7)

data/README.md

@@ -124,6 +124,21 @@ container called "my-container", use the `vagrant lxd attach` command:
     $ vagrant lxd attach default my-container
     ==> default: Attaching to container 'my-container'...
 
+Please note that in order for this feature to work you must ensure that
+Vagrant uses the same SSH key to connect to the machine in all cases.
+The easiest way to do this is to disable Vagrant's default behaviour of
+automatically generating a unique key for each machine by adding the
+following setting in your Vagrantfile:
+
+``` ruby
+  config.vm.insert_key = false
+```
+
+Refer to Vagrant's [documentation][1] for more information about this
+setting.
+
+[1]: https://www.vagrantup.com/docs/vagrantfile/ssh_settings.html
+
 ### Nested Containers
 
 In order to run Linux containers on an LXD-backed machine, it must be

data/lib/vagrant-lxd/action.rb

@@ -222,6 +222,7 @@ module VagrantLXD
             when :frozen, :stopped
               c.use Message, :info, 'Resuming machine...'
               c.use CheckForSyncedFolderSupport
+              c.use LXD.action(:configure)
               c.use LXD.action(:resume)
               c.use SetHostname
               c.use SyncedFolders

data/lib/vagrant-lxd/command.rb

@@ -111,8 +111,10 @@ module VagrantLXD
     end
 
     def detach(args)
+      options = Hash[force: false]
+
       opts = OptionParser.new do |o|
-        o.banner = 'Usage: vagrant lxd detach [machine ...]'
+        o.banner = 'Usage: vagrant lxd detach [-f] [machine ...]'
         o.separator ''
         o.separator 'Disassociates a VM from its LXD container.'
         o.separator ''
@@ -120,6 +122,8 @@ module VagrantLXD
         o.separator 'underlying container. Once detached, the machine can be recreated'
         o.separator 'from scratch with `vagrant up` or associated to a different container'
         o.separator 'by using `vagrant lxd attach`.'
+        o.separator ''
+        o.on('-f', '--force', 'Force detachment')
       end
 
       if args.include?('-h') or args.include?('--help')
@@ -127,6 +131,9 @@ module VagrantLXD
         exit 0
       end
 
+      args.delete('-f')
+      args.delete('--force')
+
       with_target_machines(args) do |machine|
         if machine.id.nil? or machine.state.id == Vagrant::MachineState::NOT_CREATED_ID
           machine.ui.warn "Machine is not attached to a container, skipping..."

data/lib/vagrant-lxd/driver.rb

@@ -51,6 +51,10 @@ module VagrantLXD
       error_key 'lxd_container_creation_failure'
     end
 
+    class ContainerConfigurationFailure < Vagrant::Errors::VagrantError
+      error_key 'lxd_container_configuration_failure'
+    end
+
     class ImageCreationFailure < ContainerCreationFailure
       error_key 'lxd_image_creation_failure'
     end
@@ -238,7 +242,7 @@ module VagrantLXD
         @machine.ui.error e.reason
         fail ContainerAlreadyExists, machine_name: @machine.name, container: $1
       else
-        @machine.ui.error "Failed to create container"
+        @machine.ui.error 'Failed to create container'
         fail ContainerCreationFailure, machine_name: @machine.name, reason: e.reason
       end
     end
@@ -286,6 +290,15 @@ module VagrantLXD
       end
     end
 
+    def configure
+      container = @lxd.container(machine_id)
+      container[:config] = container[:config].to_hash.merge(config)
+      @lxd.update_container(machine_id, container)
+    rescue Hyperkit::Error => e
+      @machine.ui.error 'Failed to configure container'
+      fail ContainerConfigurationFailure, machine_name: @machine.name, reason: e.reason
+    end
+
     def info
       if in_state? :running, :frozen
         {

data/lib/vagrant-lxd/version.rb

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

data/templates/locales/en.yml

@@ -96,6 +96,13 @@ en:
         
         The LXD logs may contain more information about the cause of this failure.
         
+      lxd_container_configuration_failure: |-
+        The provider was unable to configure the container for the '%{machine_name}' VM.
+        
+        %{reason}.
+        
+        The LXD logs may contain more information about the cause of this failure.
+        
       lxd_image_creation_failure: |-
         The provider was unable to create an LXD image for the '%{machine_name}' VM.
         

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxd
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Evan Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2018-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyperkit