vagrant-lxd 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 654ad77a94d17f40d4f528b4e3b3c9240e6da694
-  data.tar.gz: f61890ef2aaa6f42d2df0c50c17d8d3e4aa6a976
+  metadata.gz: 1f0c237e8739d6719e33f8029c849927f5650a47
+  data.tar.gz: 3eb61ce7502ba73752e2e6eb5c86eba965dc5b42
 SHA512:
-  metadata.gz: 88d1f8cf94ebbdc2f06746ea8125339cad299de715b757fa8204ebebe1f72606d2e7ad9860f24a5e12f96a2a97a43696c77fa1594e0f05ec7804f746b0e784d7
-  data.tar.gz: 53ffb9cb0d78df23a42d2f5a10915f7a919609dc75ec39569b69b71f62f05e69739a5abca8049ee9ebe101f4612edc58e85a40494f57dfa0eb43fb1427f903bb
+  metadata.gz: 6a5a7434615e6a4b6928f3601c2277987ac0e24516b18da7102723059929908b72c30695f21cb4e411877a920bb929cca70744178f5cae0921081dec9689cc49
+  data.tar.gz: 8ebaad06c6a85d84c5da97d44196558f651a321acc26e049642785a757c0d3f66599d009a82b89ee2aaddbb11752034a45e72f07185d0ffa5d5ec286f397494c

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: 45766ad00e5567fe6706a84fe07ba922b442dc34
+  revision: 7927c39da90dae3f5be79e36ad9df3b4ad834ac1
   specs:
-    vagrant (2.2.2.dev)
+    vagrant (2.2.4.dev)
       bcrypt_pbkdf (~> 1.0.0)
       childprocess (~> 0.6.0)
       ed25519 (~> 1.2.4)
@@ -13,12 +13,12 @@ GIT
       log4r (~> 1.1.9, < 1.1.11)
       net-scp (~> 1.2.0)
       net-sftp (~> 2.1)
-      net-ssh (~> 5.0.0)
+      net-ssh (~> 5.1.0)
       rb-kqueue (~> 0.2.0)
       rest-client (>= 1.6.0, < 3.0)
       ruby_dep (<= 1.3.1)
       rubyzip (~> 1.2.2)
-      vagrant_cloud (~> 2.0.0)
+      vagrant_cloud (~> 2.0.2)
       wdm (~> 0.1.0)
       winrm (~> 2.1)
       winrm-elevated (~> 1.1)
@@ -27,13 +27,13 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxd (0.3.1)
+    vagrant-lxd (0.3.2)
       hyperkit (~> 1.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -44,16 +44,16 @@ GEM
     builder (3.2.3)
     childprocess (0.6.3)
       ffi (~> 1.0, >= 1.0.11)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     diff-lcs (1.3)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     ed25519 (1.2.4)
     erubis (2.7.0)
     fakefs (0.18.0)
-    faraday (0.15.3)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.25)
+    ffi (1.10.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
@@ -86,14 +86,14 @@ GEM
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (5.0.2)
+    net-ssh (5.1.0)
     netrc (0.11.0)
     nori (2.6.0)
     public_suffix (3.0.3)
-    rake (12.3.1)
+    rake (12.3.2)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     rb-kqueue (0.2.5)
       ffi (>= 0.5.0)
     rest-client (2.0.2)
@@ -128,10 +128,10 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    vagrant_cloud (2.0.1)
+    vagrant_cloud (2.0.2)
       rest-client (~> 2.0.2)
     wdm (0.1.1)
-    winrm (2.3.0)
+    winrm (2.3.1)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -140,10 +140,10 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.1.0)
+    winrm-elevated (1.1.1)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.3.1)
+    winrm-fs (1.3.2)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
@@ -162,4 +162,4 @@ DEPENDENCIES
   vagrant-lxd!
 
 BUNDLED WITH
-   1.16.4
+   2.0.1

data/lib/vagrant-lxd/driver.rb

@@ -22,6 +22,7 @@ require 'hyperkit'
 require 'securerandom'
 require 'tempfile'
 require 'timeout'
+require 'monitor'
 require 'vagrant/machine_state'
 require 'vagrant-lxd/config'
 
@@ -29,6 +30,8 @@ module VagrantLXD
   class Driver
     include Vagrant::Util
 
+    extend MonitorMixin
+
     USER_AGENT = "#{Version::DESCRIPTION} #{Version::VERSION} (#{Hyperkit::Default.user_agent})"
 
     IMAGE_PROPERTIES = { description: "#{Version::DESCRIPTION} #{Version::VERSION}" }
@@ -57,6 +60,10 @@ module VagrantLXD
       error_key 'lxd_container_configuration_failure'
     end
 
+    class ContainerDeletionFailure < Vagrant::Errors::VagrantError
+      error_key 'lxd_container_deletion_failure'
+    end
+
     class ImageCreationFailure < ContainerCreationFailure
       error_key 'lxd_image_creation_failure'
     end
@@ -224,19 +231,21 @@ module VagrantLXD
     def create
       if in_state? NOT_CREATED
         machine_id = generate_machine_id
-        file, fingerprint = prepare_image_file
-
-        begin
-          image = @lxd.image(fingerprint)
-          @logger.debug 'Using image: ' << image.inspect
-        rescue Hyperkit::NotFound
-          image = @lxd.create_image_from_file(file)
-          @logger.debug 'Created image: ' << image.inspect
+        file, fingerprint = Driver.synchronize { prepare_image_file }
+
+        Driver.synchronize do
           begin
-            @lxd.update_image(fingerprint, properties: IMAGE_PROPERTIES)
-            @lxd.create_image_alias(fingerprint, machine_id, IMAGE_PROPERTIES)
-          rescue Hyperkit::Error
-            @logger.error 'Failed to set description for image: ' << e.reason
+            image = @lxd.image(fingerprint)
+            @logger.debug 'Using image: ' << image.inspect
+          rescue Hyperkit::NotFound
+            image = @lxd.create_image_from_file(file)
+            @logger.debug 'Created image: ' << image.inspect
+            begin
+              @lxd.update_image(fingerprint, properties: IMAGE_PROPERTIES)
+              @lxd.create_image_alias(fingerprint, machine_id, IMAGE_PROPERTIES)
+            rescue Hyperkit::Error
+              @logger.error 'Failed to set description for image: ' << e.reason
+            end
           end
         end
 
@@ -333,6 +342,15 @@ module VagrantLXD
       @lxd.delete_container(machine_id)
     rescue Hyperkit::NotFound
       @logger.warn "Container '#{machine_id}' not found, unable to destroy"
+    rescue Hyperkit::Error => e
+      @machine.ui.error 'Failed to delete container'
+      @logger.warn "Could not delete container '#{machine_id}': " << e.reason
+      fail ContainerDeletionFailure, machine_name: @machine.name, reason:
+        if e.reason =~ /(Error cleaning up [^:]+:) (.+)/m
+          "#{$1}\n#{$2}"
+        else
+          e.reason
+        end
     end
 
     def delete_image
@@ -476,7 +494,7 @@ module VagrantLXD
     rescue Exception => e
       @machine.ui.error 'Failed to create LXD image for container'
       @logger.error 'Error preparing LXD image: ' << e.message << "\n" << e.backtrace.join("\n")
-      fail ImageCreationFailure, machine_name: @machine.name, error_message: e.message
+      fail ImageCreationFailure, machine_name: @machine.name, reason: e.message
     ensure
       FileUtils.rm_rf(tmpdir)
     end

data/lib/vagrant-lxd/plugin.rb

@@ -24,7 +24,7 @@ module VagrantLXD
     name Version::NAME
     description Version::DESCRIPTION
 
-    provider(:lxd, box_format: 'lxc', priority: 1) do
+    provider(:lxd, box_format: 'lxc', priority: 1, parallel: true) do
       require_relative 'provider'
       Provider
     end

data/lib/vagrant-lxd/version.rb

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

data/templates/locales/en.yml

@@ -92,23 +92,28 @@ en:
       lxd_container_creation_failure: |-
         The provider was unable to create a container for the '%{machine_name}' VM.
         
-        %{reason}.
+        The underlying error message was: %{reason}
         
         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 underlying error message was: %{reason}
+        
+        The LXD logs may contain more information about the cause of this failure.
+        
+      lxd_container_deletion_failure: |-
+        The provider was unable to delete the container for the '%{machine_name}' VM.
+
+        The underlying error message was: %{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.
         
-        The underlying error message was:
-        
-            %{error_message}
+        The underlying error message was: %{reason}
         
         This may be a bug in the LXD provider. If you think this is the case,
         please submit an issue at:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxd
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Evan Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyperkit