vagrant-lxd 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ae29284d2a4a870ad54f62da227bfa06e1a879d
-  data.tar.gz: 1a7977adf19891632b59233f7de7bad527ed93b4
+  metadata.gz: 61672c78ba393c4f34973d8d0f56a76568dcb3be
+  data.tar.gz: b0c08820b88572b7fc94fa67559d4c129f06f647
 SHA512:
-  metadata.gz: 94b0882c41cd75aa6caf9f672b7f7353cfb56b9e60762f785f6b9fc23774ee8b2bb4443da86b35f957a52588cffb564a9e4130798498e3f1ab07fe037287fc0b
-  data.tar.gz: 9b1344147ebd312227be8186571ed421bfdc1dc4421a45c09f17bb0008759b2682b23b78c19228ed2901aa58f63f3782edaf78cb364564bf9e7982df6c9b12c1
+  metadata.gz: 4b0cca7c0d4fa3c8c9c6f5931a6db8e5ed1988fada9085461a1c2eedfcd2785e729f2812c0aa7c210f2916d277018c57883f52f6457f6aaea42c4285bf876cf4
+  data.tar.gz: dc7da8f906ccf8ca2e81ca3d2b43c6c3cde6cf4cd9b3b58e0c2c6420c2d4dc45b68a5335602bb7a3d3a339654ef1015fe0dc0f42b026ac3fa25bb1d8507ee29b

data/Gemfile.lock

@@ -23,7 +23,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxd (0.1.1)
+    vagrant-lxd (0.1.2)
       hyperkit (~> 1.1.0)
 
 GEM

data/lib/vagrant-lxd/action.rb

@@ -110,6 +110,7 @@ module VagrantLXD
               c.use HandleBox
               c.use LXD.action(:create)
               c.use LXD.action(:resume)
+              c.use SetHostname
               c.use SyncedFolders
               c.use WaitForCommunicator
               c.use Provision
@@ -191,6 +192,7 @@ module VagrantLXD
             when :frozen, :stopped
               c.use Message, :info, 'Resuming machine...'
               c.use LXD.action(:resume)
+              c.use SetHostname
               c.use SyncedFolders
               c.use WaitForCommunicator
               c.use Provision

data/lib/vagrant-lxd/driver.rb

@@ -241,13 +241,17 @@ module VagrantLXD
       fail OperationTimeout, time_limit: timeout, operation: 'start', machine_id: machine_id
     end
 
-    def halt
+    def halt(force = false)
       if in_state? :running, :frozen
-        @lxd.stop_container(machine_id, timeout: timeout)
+        @lxd.stop_container(machine_id, timeout: timeout, force: force)
       end
     rescue Hyperkit::BadRequest
-      @machine.ui.warn "Container failed to stop within #{timeout} seconds, forcing shutdown..."
-      @lxd.stop_container(machine_id, timeout: timeout, force: true)
+      if force
+        fail OperationTimeout, time_limit: timeout, operation: 'stop', machine_id: machine_id
+      else
+        @machine.ui.warn "Container failed to stop within #{timeout} seconds, forcing shutdown..."
+        halt(true)
+      end
     end
 
     def suspend

data/lib/vagrant-lxd/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Evan Hanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-21 00:00:00.000000000 Z
+date: 2017-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyperkit