vagrant-libvirt 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24d1c8176e644a03b313514b4f507fa6732a7f16
-  data.tar.gz: 8230dcd9f90c3f22c1877a31a52cb185ec04e84d
+  metadata.gz: 4fe4ab377dd5768297a0cb9741ee25e889b2d57b
+  data.tar.gz: 3aa4b4af095858c8fdf2b44860c4435d0a42ad19
 SHA512:
-  metadata.gz: ad12e81a184aad835859c3812ba631c2469d08db9eb82585c677f3c6ea2b906a099ec1d1bbe5edb51239d58d03d1c6d11c498ba9f0c8483ce0cb09fcadd0b80f
-  data.tar.gz: fe5b77722c4665f9d319b4bf2f7ee9150ad774f4f0a83cac560a09021bc8964e7f5b0c7ec023aff2ee4a7ebb47df831f6ffc2b2a69b5a43d5fbff43d116693f0
+  metadata.gz: 05011cb3bd79c255dc215abfd05726738b95fa4c81cfecbe3a30c0d93b56ab3a898bca198502464440a7677345a60494a5d1a264dffdf1e5b05cad20a5aa2d72
+  data.tar.gz: ad8badd8f73e38d599a7ca614e362efa2202da9226c5c99f885178687873f3108b0dd3ca0749062bbff273e6bb804470ebf5759a280ea117f6db1c3a0168dbd1

data/.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y libvirt-dev
+  - gem update --system 2.4.8
   - gem install bundler --version $BUNDLER_VERSION
 install: bundle _${BUNDLER_VERSION}_ install
 script: bundle _${BUNDLER_VERSION}_ exec rspec --color --format documentation

data/Gemfile

@@ -13,6 +13,10 @@ group :development do
   else
     gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant.git'
   end
+
+  gem 'vagrant-spec', :github => 'mitchellh/vagrant-spec',
+    tag: ENV['VAGRANT_SPEC_VERSION'] || "9bba7e1228379c0a249a06ce76ba8ea7d276afbe"
+
   gem 'pry'
 end
 

data/README.md

@@ -1,4 +1,5 @@
 # Vagrant Libvirt Provider
+[![Build Status](https://travis-ci.org/pradels/vagrant-libvirt.svg)](https://travis-ci.org/pradels/vagrant-libvirt)
 
 This is a [Vagrant](http://www.vagrantup.com) plugin that adds an
 [Libvirt](http://libvirt.org) provider to Vagrant, allowing Vagrant to
@@ -28,6 +29,8 @@ welcome and can help a lot :-)
   	- [Reload behavior](#reload-behavior-1)
 - [CDROMs](#cdroms)
 - [Input](#input)
+- [PCI device passthrough](#pci-device-passthrough)
+- [CPU Features](#cpu-features)
 - [No box and PXE boot](#no-box-and-pxe-boot)
 - [SSH Access To VM](#ssh-access-to-vm)
 - [Forwarded Ports](#forwarded-ports)
@@ -78,12 +81,12 @@ missing development libraries for libxslt, libxml2 and libvirt.
 
 In Ubuntu, Debian, ...
 ```
-$ sudo apt-get install libxslt-dev libxml2-dev libvirt-dev zlib1g-dev
+$ sudo apt-get install libxslt-dev libxml2-dev libvirt-dev zlib1g-dev ruby-dev
 ```
 
 In RedHat, Centos, Fedora, ...
 ```
-# yum install libxslt-devel libxml2-devel libvirt-devel libguestfs-tools-c
+# yum install libxslt-devel libxml2-devel libvirt-devel libguestfs-tools-c ruby-devel
 ```
 
 If have problem with installation - check your linker. It should be ld.gold:
@@ -100,12 +103,13 @@ sudo ln -fs /usr/bin/ld.gold /usr/bin/ld
 After installing the plugin (instructions above), the quickest way to get
 started is to add Libvirt box and specify all the details manually within
 a `config.vm.provider` block. So first, add Libvirt box using any name you
-want. This is just an example of Libvirt CentOS 6.4 box available:
+want. This is just an example of Libvirt CentOS 7 box available in
+ https://atlas.hashicorp.com :
 
 ```
-vagrant box add fedora21 http://citozin.com/fedora21.box
+vagrant init fedora/23-cloud-base
 # or
-vagrant box add centos64 http://citozin.com/centos64.box
+vagrant init centos/7
 ```
 
 ### Create Vagrantfile
@@ -187,7 +191,9 @@ end
 * `memory` - Amount of memory in MBytes. Defaults to 512 if not set.
 * `cpus` - Number of virtual cpus. Defaults to 1 if not set.
 * `nested` - [Enable nested virtualization](https://github.com/torvalds/linux/blob/master/Documentation/virtual/kvm/nested-vmx.txt). Default is false.
-* `cpu_mode` - [CPU emulation mode](https://libvirt.org/formatdomain.html#elementsCPU). Defaults to 'host-model' if not set. Allowed values: host-model, host-passthrough.
+* `cpu_mode` - [CPU emulation mode](https://libvirt.org/formatdomain.html#elementsCPU). Defaults to 'host-model' if not set. Allowed values: host-model, host-passthrough, custom.
+* `cpu_model` - CPU Model. Defaults to 'qemu64' if not set. This can really only be used when setting `cpu_mode` to `custom`.
+* `cpu_fallback` - Whether to allow libvirt to fall back to a CPU model close to the specified model if features in the guest CPU are not supported on the host. Defaults to 'allow' if not set. Allowed values: `allow`, `forbid`.
 * `loader` - Sets path to custom UEFI loader.
 * `volume_cache` - Controls the cache mechanism. Possible values are "default", "none", "writethrough", "writeback", "directsync" and "unsafe". [See driver->cache in libvirt documentation](http://libvirt.org/formatdomain.html#elementsDisks).
 * `kernel` - To launch the guest with a kernel residing on host filesystems. Equivalent to qemu `-kernel`.
@@ -196,20 +202,26 @@ end
 * `cmd_line` - Arguments passed on to the guest kernel initramfs or initrd to use. Equivalent to qemu `-append`.
 * `graphics_type` - Sets the protocol used to expose the guest display.  Defaults to `vnc`.  Possible values are "sdl", "curses", "none", "gtk", "vnc" or "spice".
 * `graphics_port` - Sets the port for the display protocol to bind to.  Defaults to 5900.
-* `graphics_ip` - Sets the IP for the display protocol to bind to.  Defaults to "127.0.0.0.1".
+* `graphics_ip` - Sets the IP for the display protocol to bind to.  Defaults to "127.0.0.1".
 * `graphics_passwd` - Sets the password for the display protocol. Working for vnc and spice. by default working without passsword.
 * `graphics_autoport` - Sets autoport for graphics, libvirt in this case ignores graphics_port value, Defaults to 'yes'. Possible value are "yes" and "no"
 * `keymap` - Set keymap for vm. default: en-us
+* `kvm_hidden` - [Hide the hypervisor from the guest](https://libvirt.org/formatdomain.html#elementsFeatures). Useful for GPU passthrough on stubborn drivers. Default is false.
 * `video_type` - Sets the graphics card type exposed to the guest.  Defaults to "cirrus".  [Possible values](http://libvirt.org/formatdomain.html#elementsVideo) are "vga", "cirrus", "vmvga", "xen", "vbox", or "qxl".
 * `video_vram` - Used by some graphics card types to vary the amount of RAM dedicated to video.  Defaults to 9216.
-* `machine` - Sets machine type. Equivalent to qemu `-machine`. Use `qemu-system-x86_64 -machine help` to get a list of supported machines.
+* `machine_type` - Sets machine type. Equivalent to qemu `-machine`. Use `qemu-system-x86_64 -machine help` to get a list of supported machines.
 * `machine_arch` - Sets machine architecture. This helps libvirt to determine the correct emulator type. Possible values depend on your version of qemu. For possible values, see which emulator executable `qemu-system-*` your system provides. Common examples are `aarch64`, `alpha`, `arm`, `cris`, `i386`, `lm32`, `m68k`, `microblaze`, `microblazeel`, `mips`, `mips64`, `mips64el`, `mipsel`, `moxie`, `or32`, `ppc`, `ppc64`, `ppcemb`, `s390x`, `sh4`, `sh4eb`, `sparc`, `sparc64`, `tricore`, `unicore32`, `x86_64`, `xtensa`, `xtensaeb`.
 * `machine_virtual_size` - Sets the disk size in GB for the machine overriding the default specified in the box. Allows boxes to defined with a minimal size disk by default and to be grown to a larger size at creation time. Will ignore sizes smaller than the size specified by the box metadata. Note that currently there is no support for automatically resizing the filesystem to take advantage of the larger disk.
+* `emulator_path` - Explicitly select which device model emulator to use by providing the path, e.g. `/usr/bin/qemu-system-x86_64`. This is especially useful on systems that fail to select it automatically based on `machine_arch` which then results in a capability error.
 * `boot` - Change the boot order and enables the boot menu. Possible options are "hd", "network", "cdrom". Defaults to "hd" with boot menu disabled. When "network" is set without "hd", only all NICs will be tried; see below for more detail.
 * `nic_adapter_count` - Defaults to '8'. Only use case for increasing this count is for VMs that virtualize switches such as Cumulus Linux. Max value for Cumulus Linux VMs is 33.
 * `uuid` - Force a domain UUID. Defaults to autogenerated value by libvirt if not set.
 * `suspend_mode` - What is done on vagrant suspend. Possible values: 'pause', 'managedsave'. Pause mode executes a la `virsh suspend`, which just pauses execution of a VM, not freeing resources. Managed save mode does a la `virsh managedsave` which frees resources suspending a domain.
-
+* `tpm_model` - The model of the TPM to which you wish to connect.
+* `tpm_type` - The type of TPM device to which you are connecting.
+* `tpm_path` - The path to the TPM device on the host system.
+* `dtb` - The device tree blob file, mostly used for non-x86 platforms. In case the device tree isn't added in-line to the kernel, it can be manually specified here.
+* `autostart` - Automatically start the domain when the host boots. Defaults to 'false'.
 
 
 Specific domain settings can be set for each domain separately in multi-VM
@@ -266,6 +278,9 @@ On vagrant reload the following domain specific attributes are updated in define
 * `keymap` - Updated.
 * `video_type` - Updated.
 * `video_vram` - Updated.
+* `tpm_model` - Updated.
+* `tpm_type` - Updated.
+* `tpm_path` - Updated.
 
 
 ## Networks
@@ -301,26 +316,26 @@ An examples of network interface definitions:
   # Guest 1
   config.vm.define :test_vm1 do |test_vm1|
     test_vm1.vm.network :private_network,
-          :libvirt__tunnel_type => 'server',
-          # default is 127.0.0.1 if omitted
-          # :libvirt__tunnel_ip => '127.0.0.1',
-          :libvirt__tunnel_port => '11111'
+      :libvirt__tunnel_type => 'server',
+      # default is 127.0.0.1 if omitted
+      # :libvirt__tunnel_ip => '127.0.0.1',
+      :libvirt__tunnel_port => '11111'
 
   # Guest 2
   config.vm.define :test_vm2 do |test_vm2|
     test_vm2.vm.network :private_network,
-          :libvirt__tunnel_type => 'client',
-          # default is 127.0.0.1 if omitted
-          # :libvirt__tunnel_ip => '127.0.0.1',
-          :libvirt__tunnel_port => '11111'
+      :libvirt__tunnel_type => 'client',
+      # default is 127.0.0.1 if omitted
+      # :libvirt__tunnel_ip => '127.0.0.1',
+      :libvirt__tunnel_port => '11111'
 
 
   # Public Network
   config.vm.define :test_vm1 do |test_vm1|
     test_vm1.vm.network :public_network,
-          :dev => "virbr0",
-          :mode => "bridge",
-          :type => "bridge"
+      :dev => "virbr0",
+      :mode => "bridge",
+      :type => "bridge"
   end
 ```
 
@@ -395,6 +410,9 @@ starts with 'libvirt__' string. Here is a list of those options:
 * `:libvirt__tunnel_local_ip` - Sets the local IP used by the udp tunnel
     interface type. It populates the ip entry of the `<local address=XXX">` section of
     the interface xml configuration. _(This feature only works in libvirt 1.2.20 and higher)_
+* `:libvirt__guest_ipv6` - Enable or disable guest-to-guest IPv6 communication.
+    See [here](https://libvirt.org/formatnetwork.html#examplesPrivate6), and [here](http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=705e67d40b09a905cd6a4b8b418d5cb94eaa95a8) for for more information.
+* `:libvirt__iface_name` - Define a name for the private network interface. With this feature one can [simulate physical link failures](https://github.com/pradels/vagrant-libvirt/pull/498)
 * `:mac` - MAC address for the interface.
 * `:model_type` - parameter specifies the model of the network adapter when you create a domain value by default virtio KVM believe possible values, see the documentation for libvirt
 
@@ -424,6 +442,7 @@ configurable at the provider level.
 
 * `management_network_name` - Name of libvirt network to which all VMs will be connected. If not specified the default is 'vagrant-libvirt'.
 * `management_network_address` - Address of network to which all VMs will be connected. Must include the address and subnet mask. If not specified the default is '192.168.121.0/24'.
+* `management_network_guest_ipv6` - Enable or disable guest-to-guest IPv6 communication. See [here](https://libvirt.org/formatnetwork.html#examplesPrivate6), and [here](http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=705e67d40b09a905cd6a4b8b418d5cb94eaa95a8) for for more information.
 
 You may wonder how vagrant-libvirt knows the IP address a VM received.
 Libvirt doesn't provide a standard way to find out the IP address of a running
@@ -502,6 +521,77 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+## PCI device passthrough
+
+You can specify multiple PCI devices to passthrough to the VM via `libvirt.pci`. Available options are listed below. Note that all options are required:
+
+* `bus` - The bus of the PCI device
+* `slot` - The slot of the PCI device
+* `function` - The function of the PCI device
+
+You can extract that information from output of `lspci` command. First characters of each line are in format `[<bus>]:[<slot>].[<func>]`. Example
+
+```
+$ lspci| grep NVIDIA
+03:00.0 VGA compatible controller: NVIDIA Corporation GK110B [GeForce GTX TITAN Black] (rev a1)
+```
+
+In that case `bus` is `0x03`, `slot` is `0x00` and `function` is `0x0`.
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provider :libvirt do |libvirt|
+    libvirt.pci :bus => '0x06', :slot => '0x12', :function => '0x5'
+
+    # Add another one if it is neccessary
+    libvirt.pci :bus => '0x03', :slot => '0x00', :function => '0x0'
+  end
+end
+```
+
+## CPU features
+
+You can specify CPU feature policies via `libvirt.cpu_feature`. Available options are
+listed below. Note that both options are required:
+
+* `name` - The name of the feature for the chosen CPU (see libvirts `cpu_map.xml`)
+* `policy` - The policy for this feature (one of `force`, `require`, `optional`, `disable` and `forbid` - see libvirt documentation)
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provider :libvirt do |libvirt|
+    # The feature will not be supported by virtual CPU.
+    libvirt.cpu_feature :name => 'hypervisor', :policy => 'disable'
+    # Guest creation will fail unless the feature is supported by host CPU.
+    libvirt.cpu_feature :name => 'vmx', :policy => 'require'
+    # The virtual CPU will claim the feature is supported regardless of it being supported by host CPU.
+    libvirt.cpu_feature :name => 'pdpe1gb', :policy => 'force'
+  end
+end
+```
+
+## USB device passthrough
+
+You can specify multiple USB devices to passthrough to the VM via `libvirt.usb`. The device can be specified by the following options:
+
+* `bus` - The USB bus ID, e.g. "1"
+* `device` - The USB device ID, e.g. "2"
+* `vendor` - The USB devices vendor ID (VID), e.g. "0x1234"
+* `product` - The USB devices product ID (PID), e.g. "0xabcd"
+
+At least one of these has to be specified, and `bus` and `device` may only be used together.
+
+The example values above match the device from the following output of `lsusb`:
+
+```
+Bus 001 Device 002: ID 1234:abcd Example device
+```
+
+Additionally, the following options can be used:
+
+* `startupPolicy` - Is passed through to libvirt and controls if the device has to exist.
+                    libvirt currently allows the following values: "mandatory", "requisite", "optional".
+
 ## No box and PXE boot
 
 There is support for PXE booting VMs with no disks as well as PXE booting VMs with blank disks. There are some limitations:
@@ -554,6 +644,8 @@ you want the forwarded port to be accessible from outside the Vagrant
 host.  In this case you should also set the `host_ip` option to `'*'`
 since it defaults to `'localhost'`.
 
+You can also provide a custom adapter to forward from by 'adapter' option. Default is 'eth0'.
+
 ## Synced Folders
 
 vagrant-libvirt supports bidirectional synced folders via nfs or 9p and
@@ -570,6 +662,12 @@ it an setting the type, e.g.
 
     config.vm.synced_folder './', '/vagrant', type: '9p', disabled: false, accessmode: "squash", owner: "vagrant"
 
+    or
+
+    config.vm.synced_folder './', '/vagrant', type: '9p', disabled: false, accessmode: "mapped", mount: false
+
+For 9p shares, a `mount: false` option allows to define synced folders without mounting them at boot.
+
 **SECURITY NOTE:** for remote libvirt, nfs synced folders requires a bridged public network interface and you must connect to libvirt via ssh.
 
 
@@ -591,6 +689,32 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+## TPM Devices
+
+Modern versions of Libvirt support connecting to TPM devices on the host
+system. This allows you to enable Trusted Boot Extensions, among other
+features, on your guest VMs.
+
+In general, you will only need to modify the `tpm_path` variable in your guest
+configuration. However, advanced usage, such as the application of a Software
+TPM, may require modifying the `tpm_model` and `tpm_type` variables.
+
+The TPM options will only be used if you specify a TPM path. Declarations of
+any TPM options without specifying a path will result in those options being
+ignored.
+
+Here is an example of using the TPM options:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provider :libvirt do |libvirt|
+    libvirt.tpm_model = 'tpm-tis'
+    libvirt.tpm_type = 'passthrough'
+    libvirt.tpm_path = '/dev/tpm0'
+  end
+end
+```
+
 ## Box Format
 
 You can view an example box in the [example_box/directory](https://github.com/pradels/vagrant-libvirt/tree/master/example_box). That directory also contains instructions on how to build a box.
@@ -621,10 +745,10 @@ $ cd vagrant-libvirt
 $ bundle install
 ```
 
-Once you have the dependencies, verify the unit tests pass with `rake`:
+Once you have the dependencies, verify the unit tests pass with `rspec`:
 
 ```
-$ bundle exec rake
+$ bundle exec rspec spec/
 ```
 
 If those pass, you're ready to start developing the plugin. You can test

data/lib/vagrant-libvirt/action/create_domain.rb

@@ -33,7 +33,10 @@ module VagrantPlugins
           @name = env[:domain_name]
           @uuid = config.uuid
           @cpus = config.cpus.to_i
+          @cpu_features = config.cpu_features
           @cpu_mode = config.cpu_mode
+          @cpu_model = config.cpu_model
+          @cpu_fallback = config.cpu_fallback
           @loader = config.loader
           @machine_type = config.machine_type
           @machine_arch = config.machine_arch
@@ -44,7 +47,9 @@ module VagrantPlugins
           @domain_volume_cache = config.volume_cache
           @kernel = config.kernel
           @cmd_line = config.cmd_line
+          @emulator_path = config.emulator_path
           @initrd = config.initrd
+          @dtb = config.dtb
           @graphics_type = config.graphics_type
           @graphics_autoport = config.graphics_autoport
           @graphics_port = config.graphics_port
@@ -57,6 +62,11 @@ module VagrantPlugins
           @video_type = config.video_type
           @video_vram = config.video_vram
           @keymap = config.keymap
+          @kvm_hidden = config.kvm_hidden
+
+          @tpm_model = config.tpm_model
+          @tpm_type = config.tpm_type
+          @tpm_path = config.tpm_path
 
           # Boot order
           @boot_order = config.boot_order
@@ -69,6 +79,12 @@ module VagrantPlugins
           # Input
           @inputs = config.inputs
 
+          # PCI device passthrough
+          @pcis = config.pcis
+
+          # USB device passthrough
+          @usbs = config.usbs
+
           config = env[:machine].provider_config
           @domain_type = config.driver
 
@@ -139,6 +155,9 @@ module VagrantPlugins
           end
           env[:ui].info(" -- Domain type:       #{@domain_type}")
           env[:ui].info(" -- Cpus:              #{@cpus}")
+          @cpu_features.each do |cpu_feature|
+            env[:ui].info(" -- CPU Feature:       name=#{cpu_feature[:name]}, policy=#{cpu_feature[:policy]}")
+          end
           env[:ui].info(" -- Memory:            #{@memory_size / 1024}M")
           env[:ui].info(" -- Management MAC:    #{@management_network_mac}")
           env[:ui].info(" -- Loader:            #{@loader}")
@@ -157,6 +176,7 @@ module VagrantPlugins
           env[:ui].info(" -- Video Type:        #{@video_type}")
           env[:ui].info(" -- Video VRAM:        #{@video_vram}")
           env[:ui].info(" -- Keymap:            #{@keymap}")
+          env[:ui].info(" -- TPM Path:          #{@tpm_path}")
 
           @boot_order.each do |device|
             env[:ui].info(" -- Boot device:        #{device}")
@@ -180,9 +200,24 @@ module VagrantPlugins
           @cdroms.each do |cdrom|
             env[:ui].info(" -- CDROM(#{cdrom[:dev]}):        #{cdrom[:path]}")
           end
+
           @inputs.each do |input|
             env[:ui].info(" -- INPUT:             type=#{input[:type]}, bus=#{input[:bus]}")
           end
+
+          @pcis.each do |pci|
+            env[:ui].info(" -- PCI passthrough:   #{pci[:bus]}:#{pci[:slot]}.#{pci[:function]}")
+          end
+
+          @usbs.each do |usb|
+            usb_dev = []
+            usb_dev.push("bus=#{usb[:bus]}") if usb[:bus]
+            usb_dev.push("device=#{usb[:device]}") if usb[:device]
+            usb_dev.push("vendor=#{usb[:vendor]}") if usb[:vendor]
+            usb_dev.push("product=#{usb[:product]}") if usb[:product]
+            env[:ui].info(" -- USB passthrough:   #{usb_dev.join(', ')}")
+          end
+
           env[:ui].info(" -- Command line : #{@cmd_line}")
 
           # Create libvirt domain.

data/lib/vagrant-libvirt/action/create_network_interfaces.rb

@@ -69,6 +69,7 @@ module VagrantPlugins
             @network_name = iface_configuration[:network_name]
             @mac = iface_configuration.fetch(:mac, false)
             @model_type = iface_configuration.fetch(:model_type, @nic_model_type)
+	    @device_name = iface_configuration.fetch(:iface_name, false)
             template_name = 'interface'
             # Configuration for public interfaces which use the macvtap driver
             if iface_configuration[:iface_type] == :public_network

data/lib/vagrant-libvirt/action/create_networks.rb

@@ -58,6 +58,7 @@ module VagrantPlugins
                 created:          false,
                 active:           false,
                 autostart:        false,
+                guest_ipv6:       @options[:guest_ipv6] || 'yes',
                 libvirt_network:  nil
               }
 
@@ -270,6 +271,7 @@ module VagrantPlugins
           @network_bridge_name = @interface_network[:bridge_name]
           @network_address = @interface_network[:ip_address]
           @network_netmask = @interface_network[:netmask]
+          @guest_ipv6 = @interface_network[:guest_ipv6]
 
           @network_forward_mode = @options[:forward_mode]
           if @options[:forward_device]

data/lib/vagrant-libvirt/action/forward_ports.rb

@@ -38,7 +38,7 @@ module VagrantPlugins
         def forward_ports
           @env[:forwarded_ports].each do |fp|
             message_attributes = {
-              adapter: 'eth0',
+              adapter: fp[:adapter] || 'eth0',
               guest_port: fp[:guest],
               host_port: fp[:host]
             }
@@ -98,7 +98,7 @@ module VagrantPlugins
             PasswordAuthentication=no
             ForwardX11=#{ssh_info[:forward_x11] ? 'yes' : 'no'}
           ) + ssh_info[:private_key_path].map do |pk|
-              "IdentityFile=#{pk}"
+              "IdentityFile='\"#{pk}\"'"
             end).map { |s| s.prepend('-o ') }.join(' ')
 
           options += " -o ProxyCommand=\"#{ssh_info[:proxy_command]}\"" if machine.provider_config.connect_via_ssh