vagrant-lxd 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f0c237e8739d6719e33f8029c849927f5650a47
-  data.tar.gz: 3eb61ce7502ba73752e2e6eb5c86eba965dc5b42
+  metadata.gz: 304c1f8ee64a31435d51d95726660fd666f3febd
+  data.tar.gz: 46cc574e2ad04aa6604e929c8046e10accabc81c
 SHA512:
-  metadata.gz: 6a5a7434615e6a4b6928f3601c2277987ac0e24516b18da7102723059929908b72c30695f21cb4e411877a920bb929cca70744178f5cae0921081dec9689cc49
-  data.tar.gz: 8ebaad06c6a85d84c5da97d44196558f651a321acc26e049642785a757c0d3f66599d009a82b89ee2aaddbb11752034a45e72f07185d0ffa5d5ec286f397494c
+  metadata.gz: e6a49fa60209a54a54ce4de1714281bfc760ad75a80898a34d300e935b35fca7d51397f473229ffc2f037403601a7ccf8dfb583fe88aa8c6d9e32e0bbbd46b4b
+  data.tar.gz: ef6b64e67ecbbe673819096205b28bcba675c9162137efd550803810b8d54228fc1ccd49616cdabab705ee89092a2d0b26e91f343a0f3fc875471afe2ee71245

data/.gitlab-ci.yml

@@ -3,7 +3,7 @@ image: "ruby:2.3"
 before_script:
   - apt-get -y update
   - apt-get -y upgrade
-  - gem install bundler --no-ri --no-rdoc
+  - gem install bundler
   - bundle install -j $(nproc) --path vendor/bundle
 
 spec:

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/mitchellh/vagrant.git
-  revision: 7927c39da90dae3f5be79e36ad9df3b4ad834ac1
+  revision: c6b42a04cd1ca9f0936714ee6a44b4c7c001fdeb
   specs:
     vagrant (2.2.4.dev)
       bcrypt_pbkdf (~> 1.0.0)
@@ -27,7 +27,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxd (0.3.2)
+    vagrant-lxd (0.3.3)
       hyperkit (~> 1.2.0)
 
 GEM
@@ -50,7 +50,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     ed25519 (1.2.4)
     erubis (2.7.0)
-    fakefs (0.18.0)
+    fakefs (0.19.1)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     ffi (1.10.0)

data/README.md

@@ -90,7 +90,7 @@ Vagrant.configure('2') do |config|
 end
 ```
 
-### Shared Folders
+### Synced Folders
 
 In order to use shared folders, you must first add your user ID to the
 host machine's subuid(5) and subgid(5) files:
@@ -115,6 +115,19 @@ the default with the `vagrant_uid` and `vagrant_gid` settings.
       lxd.vagrand_gid = 1000 # defaults to vagrant_uid
     end
 
+#### Disk Device Configuration
+
+Synced folders are mounted as [disk devices][disk] within the guest. You
+can configure them by adding settings to folder's `config` hash, which
+is passed through to LXD. The hash values should all be strings:
+
+    config.vm.synced_folder '/foo', '/bar', config: {
+      readonly: 'true',
+      recursive: 'false',
+    }
+
+[disk]: https://lxd.readthedocs.io/en/latest/containers/#type-disk
+
 ### Shared LXD Containers
 
 It's possible to share a single LXD container between multiple Vagrant

data/lib/vagrant-lxd/action.rb

@@ -140,9 +140,9 @@ module VagrantLXD
               c.use CheckForSyncedFolderSupport
               c.use LXD.action(:create)
               c.use Provision
-              c.use LXD.action(:resume)
               c.use SetHostname
               c.use SyncedFolders
+              c.use LXD.action(:resume)
               c.use WaitForCommunicator
             when :running
               c.use Message, :info, 'Machine is already running.'
@@ -224,9 +224,9 @@ module VagrantLXD
               c.use CheckForSyncedFolderSupport
               c.use LXD.action(:configure)
               c.use Provision
-              c.use LXD.action(:resume)
               c.use SetHostname
               c.use SyncedFolders
+              c.use LXD.action(:resume)
               c.use WaitForCommunicator
             else
               c.use Message, :error, "Machine cannot be resumed while #{env[:machine_state]}."

data/lib/vagrant-lxd/driver.rb

@@ -80,6 +80,14 @@ module VagrantLXD
       error_key 'lxd_duplicate_attachment_failure'
     end
 
+    class DiskMountFailure < Vagrant::Errors::VagrantError
+      error_key 'lxd_disk_mount_failure'
+    end
+
+    class DiskUnmountFailure < Vagrant::Errors::VagrantError
+      error_key 'lxd_disk_unmount_failure'
+    end
+
     class SnapshotNotFound < Vagrant::Errors::VagrantError
       error_key 'snapshot_not_found'
     end
@@ -150,9 +158,12 @@ module VagrantLXD
     def mount(name, options)
       container = @lxd.container(machine_id)
       devices = container[:devices].to_hash
-      devices[name] = { type: 'disk', path: options[:guestpath], source: options[:hostpath] }
+      devices[name] = { type: 'disk', path: options[:guestpath], source: options[:hostpath] }.merge(options[:config])
       container[:devices] = devices
       @lxd.update_container(machine_id, container)
+    rescue Hyperkit::BadRequest => e
+      @machine.ui.error 'Failed to mount synced folder'
+      fail DiskMountFailure, machine_name: @machine.name, guestpath: options[:guestpath], reason: e.reason
     end
 
     def mounted?(name, options)
@@ -173,6 +184,9 @@ module VagrantLXD
       devices.delete(name.to_sym)
       container[:devices] = devices
       @lxd.update_container(machine_id, container)
+    rescue Hyperkit::BadRequest => e
+      @machine.ui.error 'Failed to unmount synced folder'
+      fail DiskUnmountFailure, machine_name: @machine.name, guestpath: options[:guestpath], reason: e.reason
     end
 
     def attach(container)

data/lib/vagrant-lxd/synced_folder.rb

@@ -38,6 +38,8 @@ module VagrantLXD
 
     # TODO Figure out the proper way to mount folders before
     # provisioning without using `#prepare` (which is deprecated).
+    # TODO Umount existing devices if they go missing from the
+    # Vagrantfile (either via deletion or setting disabled: true).
     def prepare(machine, folders, opts)
       enable(machine, folders, opts)
     end
@@ -52,10 +54,22 @@ module VagrantLXD
         @driver.mounted?(name, folder)
       end
 
+      # Sanity check folder configs and bail if something's wrong.
+      folders.each do |name, folder|
+        validate_folder(folder)
+      end
+
+      # Ensure all folders have a config hash.
+      folders.each do |name, folder|
+        folder[:config] ||= {}
+        folder[:config] = Hash[folder[:config].map { |k, v| [k.to_sym, v.to_s] }]
+      end
+
       if folders.any?
         machine.ui.info 'Mounting shared folders...'
         folders.reject { |_, f| f[:disabled] }.each do |name, folder|
-          machine.ui.detail "#{folder[:guestpath]} => #{folder[:hostpath]}"
+          details = config_summary(folder[:config])
+          machine.ui.detail "#{folder[:guestpath]} => #{folder[:hostpath]} #{details}".strip
           @driver.mount(name, folder)
         end
       end
@@ -72,5 +86,29 @@ module VagrantLXD
         end
       end
     end
+
+  protected
+
+    def validate_folder(folder)
+      config = folder.fetch(:config) { Hash.new }
+
+      unless config.is_a? Hash
+        fail Vagrant::Errors::ConfigInvalid, errors: "Invalid synced_folder `config' (value must be a hash)"
+      end
+
+      unless config.keys.all? { |x| x.is_a? String or x.is_a? Symbol }
+        fail Vagrant::Errors::ConfigInvalid, errors: "Invalid synced_folder `config' (hash keys must be strings)"
+      end
+
+      unless config.values.all? { |x| x.is_a? String or x == true or x == false }
+        fail Vagrant::Errors::ConfigInvalid, errors: "Invalid synced_folder `config' (hash values must be strings)"
+      end
+    end
+
+    def config_summary(config)
+      if config.is_a? Hash and config.any?
+        "(#{config.map { |k, v| "#{k}=#{v.inspect}" }.join(', ')})"
+      end
+    end
   end
 end

data/lib/vagrant-lxd/version.rb

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

data/templates/locales/en.yml

@@ -110,6 +110,20 @@ en:
         
         The LXD logs may contain more information about the cause of this failure.
         
+      lxd_disk_mount_failure: |-
+        The provider was unable to mount a disk device at %{guestpath} 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_disk_unmount_failure: |-
+        The provider was unable to unmount a disk device at %{guestpath} 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.
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxd
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Evan Hanson