vagrant-libvirt 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 354aaf9e080970fc3b9b0c6c2896f0a84bfc5c97
-  data.tar.gz: 7aca0e64a6714b9ef17456cda7ac91677fe6c9b1
+  metadata.gz: ba233a0a466eeb2f28c391c799b1f3bb95f8299a
+  data.tar.gz: eb0fb23c0bbca79c7c30d39e5b1f813ceb78c3c5
 SHA512:
-  metadata.gz: a9e8b0f86701dd6ddfe6d060ce4c6c90c0e0a8ac78e3128f964c31a8bec2d44dc73ed56e0e6d6b114988fbe40c67953ee30b46cbf7e90ec3651d1c0637d7a365
-  data.tar.gz: 8b8b59bc7eb122a2d56fa72d1ea412fd59974152d76a00652a8782456dae65b229fbfc9c8a21775f10d1b8fd1115db1f9a5cf948d425c0fe386bf1d758590373
+  metadata.gz: 69f3a3f978ebdcc97186caa6bc73642b1fe023f0925bbcda6a343d15a4384f8a79dd8ab17c900d12d6fad99168b83f9ccf59823ef85a7d6784dbb955c8cea6a1
+  data.tar.gz: d850270fcf613717d7e1365ae0d786e35edc137bd6cb02c63307c84f536c927897743dd1202c90ac895ed0c59edcb55de45ba55433e293fcbdad0dafe5e90114

data/.travis.yml

@@ -0,0 +1,20 @@
+---
+language: ruby
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y libvirt-dev
+  - gem install bundler --version $BUNDLER_VERSION
+install: bundle _${BUNDLER_VERSION}_ install
+script: bundle _${BUNDLER_VERSION}_ exec rspec --color --format documentation
+notifications:
+  email: false
+rvm:
+  - 2.0.0
+env:
+  global:
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+  matrix:
+    - VAGRANT_VERSION=v1.5.4 BUNDLER_VERSION=1.5.3
+    - VAGRANT_VERSION=v1.6.5 BUNDLER_VERSION=1.6.9
+    - VAGRANT_VERSION=v1.7.0 BUNDLER_VERSION=1.7.9
+    - VAGRANT_VERSION=       BUNDLER_VERSION=1.7.9

data/Gemfile

@@ -7,7 +7,12 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant.git'
+  if ENV['VAGRANT_VERSION']
+    gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant.git',
+      tag: ENV['VAGRANT_VERSION']
+  else
+    gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant.git'
+  end
   gem 'pry'
 end
 

data/README.md

@@ -7,6 +7,35 @@ control and provision machines via Libvirt toolkit.
 **Note:** Actual version is still a development one. Feedback is
 welcome and can help a lot :-)
 
+- [Features](#)
+- [Future work](#)
+- [Installation](#)
+  - [Possible problems with plugin installation on Linux](#)
+- [Vagrant Project Preparation](#)
+  - [Add Box](#)
+  - [Create Vagrantfile](#)
+  - [Start VM](#)
+  - [How Project Is Created](#)
+  - [Libvirt Configuration](#)
+  - [Provider Options](#)
+  - [Domain Specific Options](#)
+- [Networks](#)
+  - [Private Network Options](#)
+  - [Public Network Options](#)
+  - [Management Network](#)
+- [Additional Disks](#)
+- [CDROMs](#)
+- [Input](#)
+- [No box and PXE boot](#)
+- [SSH Access To VM](#)
+- [Forwarded Ports](#)
+- [Synced Folders](#)
+- [Customized Graphics](#)
+- [Box Format](#)
+- [Create Box](#)
+- [Development](#)
+- [Contributing](#)
+
 ## Features
 
 * Control local Libvirt hypervisors.
@@ -22,6 +51,7 @@ welcome and can help a lot :-)
 * Snapshots via [sahara](https://github.com/jedi4ever/sahara).
 * Package caching via [vagrant-cachier](http://fgrehm.viewdocs.io/vagrant-cachier/).
 * Use boxes from other Vagrant providers via [vagrant-mutate](https://github.com/sciurus/vagrant-mutate).
+* Support VMs with no box for PXE boot purposes (Vagrant 1.6 and up)
 
 ## Future work
 
@@ -155,7 +185,8 @@ 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` - What cpu mode to use for nested virtualization. Defaults to 'host-model' if not set.
+* `cpu_mode` - [What cpu type to emulate](https://libvirt.org/formatdomain.html#elementsCPU). Defaults to 'host-model' if not set. Allowed values: host-model, host-passthrough.
+* `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`.
 * `initrd` - To specify the initramfs/initrd to use for the guest. Equivalent to qemu `-initrd`.
@@ -170,7 +201,9 @@ end
 * `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_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`.
-* `boot` - Change the boot order and enables the boot menu. Possible options are "hd" or "network". Defaults to "hd" with boot menu disabled.
+* `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.
+* `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.
 
 
 Specific domain settings can be set for each domain separately in multi-VM
@@ -194,7 +227,8 @@ Vagrant.configure("2") do |config|
 
 The following example shows part of a Vagrantfile that enables the VM to
 boot from a network interface first and a hard disk second. This could be
-used to run VMs that are meant to be a PXE booted machines.
+used to run VMs that are meant to be a PXE booted machines. Be aware that
+if `hd` is not specified as a boot option, it will never be tried.
 
 ```ruby
 Vagrant.configure("2") do |config|
@@ -212,7 +246,16 @@ Vagrant.configure("2") do |config|
 ## Networks
 
 Networking features in the form of `config.vm.network` support private networks
-concept.
+concept. It supports both the virtual network switch routing types and the point to
+point Guest OS to Guest OS setting using UDP/Mcast/TCP tunnel interfaces.
+
+http://wiki.libvirt.org/page/VirtualNetworking
+
+https://libvirt.org/formatdomain.html#elementsNICSTCP
+
+http://libvirt.org/formatdomain.html#elementsNICSMulticast
+
+http://libvirt.org/formatdomain.html#elementsNICSUDP _(in libvirt v1.2.20 and higher)_
 
 Public Network interfaces are currently implemented using the macvtap driver. The macvtap
 driver is only available with the Linux Kernel version >= 2.6.24. See the following libvirt
@@ -220,14 +263,33 @@ documentation for the details of the macvtap usage.
 
 http://www.libvirt.org/formatdomain.html#elementsNICSDirect
 
+
 An examples of network interface definitions:
 
 ```ruby
-  # Private network
+  # Private network using virtual network switching
   config.vm.define :test_vm1 do |test_vm1|
     test_vm1.vm.network :private_network, :ip => "10.20.30.40"
   end
 
+  # Private network. Point to Point between 2 Guest OS using a TCP tunnel
+  # 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'
+
+  # 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'
+
+
   # Public Network
   config.vm.define :test_vm1 do |test_vm1|
     test_vm1.vm.network :public_network,
@@ -289,9 +351,29 @@ starts with 'libvirt__' string. Here is a list of those options:
 * `:libvirt__forward_device` - Name of interface/device, where network should
   be forwarded (NATed or routed). Used only when creating new network. By
   default, all physical interfaces are used.
+* `:libvirt__tunnel_type` - Set to 'udp' if using UDP unicast tunnel mode (libvirt v1.2.20 or higher).
+  Set this to either "server" or "client" for tcp tunneling. Set this to 'mcast' if using multicast
+  tunneling. This configuration type uses tunnels to
+  generate point to point connections between Guests. Useful for Switch VMs like
+  Cumulus Linux. No virtual switch setting like "libvirt__network_name" applies with
+  tunnel interfaces and will be ignored if configured.
+* `:libvirt__tunnel_ip` - Sets the source IP of the libvirt tunnel interface. By
+  default this is `127.0.0.1` for TCP and UDP tunnels and `239.255.1.1` for Multicast
+  tunnels. It populates the address field in the `<source address="XXX">` of the
+  interface xml configuration.
+* `:libvirt__tunnel_port` - Sets the source port the tcp/udp/mcast tunnel
+    with use. This port information is placed in the `<source port=XXX/>` section of
+    interface xml configuration.
+* `:libvirt__tunnel_local_port` - Sets the local port used by the udp tunnel
+    interface type. It populates the port field in the `<local port=XXX">` section of the
+    interface xml configuration. _(This feature only works in libvirt 1.2.20 and higher)_
+* `: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)_
 * `: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
 
+
 When the option `:libvirt__dhcp_enabled` is to to 'false' it shouldn't matter
 whether the virtual network contains a DHCP server or not and vagrant-libvirt
 should not fail on it. The only situation where vagrant-libvirt should fail
@@ -336,7 +418,7 @@ You can create and attach additional disks to a VM via `libvirt.storage :file`.
 * `type` - Type of disk image to create. Defaults to *qcow2*.
 * `bus` - Type of bus to connect device to. Defaults to *virtio*.
 * `cache` - Cache mode to use, e.g. `none`, `writeback`, `writethrough` (see the [libvirt documentation for possible values](http://libvirt.org/formatdomain.html#elementsDisks) or [here](https://www.suse.com/documentation/sles11/book_kvm/data/sect1_chapter_book_kvm.html) for a fuller explanation). Defaults to *default*.
-* `allow_existing` - Set to true if you want to allow the VM to use a pre-existing disk.  This is useful for sharing disks between VMs, e.g. in order to simulate shared SAN storage. Shared disks removed only manualy.If not exists - will created. If exists - using existed.
+* `allow_existing` - Set to true if you want to allow the VM to use a pre-existing disk.  This is useful for sharing disks between VMs, e.g. in order to simulate shared SAN storage. Shared disks removed only manually. If not exists - will created. If exists - using existed.
 
 The following example creates two additional disks.
 
@@ -369,6 +451,64 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+## Input
+
+You can specify multiple inputs to the VM via `libvirt.input`. Available options are
+listed below. Note that both options are required:
+
+* `type` - The type of the input
+* `bus` - The bust of the input
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provider :libvirt do |libvirt|
+    # this is the default
+    # libvirt.input :type => "mouse", :bus => "ps2"
+
+    # very useful when having mouse issues when viewing VM via VNC
+    libvirt.input :type => "tablet", :bus => "usb"
+  end
+end
+```
+
+## 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:
+
+* Requires Vagrant 1.6.0 or newer
+* No provisioning scripts are ran
+* No network configuration is being applied to the VM
+* No SSH connection can be made
+* ```vagrant halt``` will only work cleanly if the VM handles ACPI shutdown signals
+
+In short, VMs without a box can be created, halted and destroyed but all other functionality cannot be used.
+
+An example for a PXE booted VM with no disks whatsoever:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.define :pxeclient do |pxeclient|
+    pxeclient.vm.provider :libvirt do |domain|
+      domain.boot 'network'
+    end
+  end
+end
+```
+
+And an example for a PXE booted VM with no box but a blank disk which will boot from this HD if the NICs fail to PXE boot:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.define :pxeclient do |pxeclient|
+    pxeclient.vm.provider :libvirt do |domain|
+      domain.storage :file, :size => '100G', :type => 'qcow2'
+      domain.boot 'network'
+      domain.boot 'hd'
+    end
+  end
+end
+```
+
 ## SSH Access To VM
 
 vagrant-libvirt supports vagrant's [standard ssh settings](https://docs.vagrantup.com/v2/vagrantfile/ssh_settings.html).

data/example_box/Vagrantfile

@@ -39,7 +39,7 @@ Vagrant.configure("2") do |config|
     libvirt.driver = "kvm"
 
     # The name of the server, where libvirtd is running.
-    libvirt.host = "localhost"
+    # libvirt.host = "localhost"
 
     # If use ssh tunnel to connect to Libvirt.
     libvirt.connect_via_ssh = false

data/example_box/metadata.json

@@ -1,5 +1,5 @@
 {
   "provider"     : "libvirt",
   "format"       : "qcow2",
-  "virtual_size" : 40
+  "virtual_size" : 16 
 }

data/lib/vagrant-libvirt.rb

@@ -1,5 +1,4 @@
 require 'pathname'
-require 'vagrant-libvirt/plugin'
 
 module VagrantPlugins
   module ProviderLibvirt
@@ -8,22 +7,11 @@ module VagrantPlugins
     autoload :Errors, lib_path.join('errors')
     autoload :Util, lib_path.join('util')
 
-    # Hold connection handler so there is no need to connect more times than
-    # one. This can be annoying when there are more machines to create, or when
-    # doing state action first and then some other.
-    #
-    # TODO Don't sure if this is the best solution
-    @@libvirt_connection = nil
-    def self.libvirt_connection
-      @@libvirt_connection
-    end
-
-    def self.libvirt_connection=(conn)
-      @@libvirt_connection = conn
-    end
-
     def self.source_root
       @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
     end
   end
 end
+
+# make sure base module class defined before loading plugin
+require 'vagrant-libvirt/plugin'

data/lib/vagrant-libvirt/action.rb

@@ -19,32 +19,40 @@ module VagrantPlugins
       def self.action_up
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use ConnectLibvirt
           b.use Call, IsCreated do |env, b2|
             # Create VM if not yet created.
             if !env[:result]
               b2.use SetNameOfDomain
-              b2.use HandleStoragePool
-              b2.use HandleBox
-              b2.use HandleBoxImage
-              b2.use CreateDomainVolume
-              b2.use CreateDomain
-
-              b2.use Provision
-              b2.use PrepareNFSValidIds
-              b2.use SyncedFolderCleanup
-              b2.use SyncedFolders
-              b2.use PrepareNFSSettings
-              b2.use ShareFolders
-              b2.use CreateNetworks
-              b2.use CreateNetworkInterfaces
-
-              b2.use StartDomain
-              b2.use WaitTillUp
-
-              b2.use ForwardPorts
-              b2.use SetHostname
-              # b2.use SyncFolders
+              if !env[:machine].box
+                b2.use CreateDomain
+                b2.use CreateNetworks
+                b2.use CreateNetworkInterfaces
+                b2.use SetBootOrder
+                b2.use StartDomain
+              else
+                b2.use HandleStoragePool
+                b2.use HandleBox
+                b2.use HandleBoxImage
+                b2.use CreateDomainVolume
+                b2.use CreateDomain
+
+                b2.use Provision
+                b2.use PrepareNFSValidIds
+                b2.use SyncedFolderCleanup
+                b2.use SyncedFolders
+                b2.use PrepareNFSSettings
+                b2.use ShareFolders
+                b2.use CreateNetworks
+                b2.use CreateNetworkInterfaces
+                b2.use SetBootOrder
+
+                b2.use StartDomain
+                b2.use WaitTillUp
+
+                b2.use ForwardPorts
+                b2.use SetHostname
+                # b2.use SyncFolders
+              end
             else
               b2.use action_start
             end
@@ -58,7 +66,6 @@ module VagrantPlugins
       def self.action_start
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use ConnectLibvirt
           b.use Call, IsRunning do |env, b2|
             # If the VM is running, then our work here is done, exit
             next if env[:result]
@@ -70,27 +77,35 @@ module VagrantPlugins
                 next
               end
 
-              # VM is not running or suspended.
+              if !env[:machine].box
+                # With no box, we just care about network creation and starting it
+                b3.use CreateNetworks
+                b3.use SetBootOrder
+                b3.use StartDomain
+              else
+                # VM is not running or suspended.
 
-              b3.use Provision
+                b3.use Provision
 
-              # Ensure networks are created and active
-              b3.use CreateNetworks
+                # Ensure networks are created and active
+                b3.use CreateNetworks
+                b3.use SetBootOrder
 
-              b3.use PrepareNFSValidIds
-              b3.use SyncedFolderCleanup
-              b3.use SyncedFolders
+                b3.use PrepareNFSValidIds
+                b3.use SyncedFolderCleanup
+                b3.use SyncedFolders
 
-              # Start it..
-              b3.use StartDomain
+                # Start it..
+                b3.use StartDomain
 
-              # Machine should gain IP address when comming up,
-              # so wait for dhcp lease and store IP into machines data_dir.
-              b3.use WaitTillUp
+                # Machine should gain IP address when comming up,
+                # so wait for dhcp lease and store IP into machines data_dir.
+                b3.use WaitTillUp
 
-              b3.use ForwardPorts
-              b3.use PrepareNFSSettings
-              b3.use ShareFolders
+                b3.use ForwardPorts
+                b3.use PrepareNFSSettings
+                b3.use ShareFolders
+             end
             end
           end
         end
@@ -101,7 +116,6 @@ module VagrantPlugins
       def self.action_halt
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use ConnectLibvirt
           b.use ClearForwardedPorts
           b.use Call, IsCreated do |env, b2|
             if !env[:result]
@@ -144,7 +158,6 @@ module VagrantPlugins
       def self.action_package
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use ConnectLibvirt
           b.use PackageDomain
         end
       end
@@ -157,9 +170,10 @@ module VagrantPlugins
           b.use Call, IsCreated do |env, b2|
             if !env[:result]
               # Try to remove stale volumes anyway
-              b2.use ConnectLibvirt
               b2.use SetNameOfDomain
-              b2.use RemoveStaleVolume
+              if env[:machine].box
+                b2.use RemoveStaleVolume
+              end
               if !env[:result]
                 b2.use MessageNotCreated
               end
@@ -167,11 +181,11 @@ module VagrantPlugins
               next
             end
 
-            b2.use ConnectLibvirt
             b2.use ClearForwardedPorts
             # b2.use PruneNFSExports
             b2.use DestroyDomain
             b2.use DestroyNetworks
+            b2.use ProvisionerCleanup
           end
         end
       end
@@ -186,7 +200,6 @@ module VagrantPlugins
               next
             end
 
-            b2.use ConnectLibvirt
             b2.use Call, IsRunning do |env2, b3|
               if !env2[:result]
                 b3.use MessageNotRunning
@@ -209,7 +222,6 @@ module VagrantPlugins
               next
             end
 
-            b2.use ConnectLibvirt
             b2.use Call, IsRunning do |env2, b3|
               if !env2[:result]
                 b3.use MessageNotRunning
@@ -234,7 +246,6 @@ module VagrantPlugins
               next
             end
 
-            b2.use ConnectLibvirt
             b2.use Call, IsRunning do |env2, b3|
               if !env2[:result]
                 b3.use MessageNotRunning
@@ -257,7 +268,6 @@ module VagrantPlugins
               next
             end
 
-            b2.use ConnectLibvirt
             b2.use Call, IsSuspended do |env2, b3|
               if !env2[:result]
                 b3.use MessageNotSuspended
@@ -269,31 +279,9 @@ module VagrantPlugins
         end
       end
 
-      # This action is called to read the state of the machine. The resulting
-      # state is expected to be put into the `:machine_state_id` key.
-      def self.action_read_state
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use ConnectLibvirt
-          b.use ReadState
-        end
-      end
-
-      # This action is called to read the SSH info of the machine. The
-      # resulting state is expected to be put into the `:machine_ssh_info`
-      # key.
-      def self.action_read_ssh_info
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use ConnectLibvirt
-          b.use ReadSSHInfo
-        end
-      end
-
       def self.action_read_mac_addresses
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
-          b.use ConnectLibvirt
           b.use ReadMacAddresses
         end
       end
@@ -308,7 +296,6 @@ module VagrantPlugins
               next
             end
 
-            b2.use ConnectLibvirt
             b2.use Call, IsRunning do |env2, b3|
               if !env2[:result]
                 b3.use MessageNotRunning
@@ -323,7 +310,6 @@ module VagrantPlugins
       end
 
       action_root = Pathname.new(File.expand_path('../action', __FILE__))
-      autoload :ConnectLibvirt, action_root.join('connect_libvirt')
       autoload :PackageDomain, action_root.join('package_domain')
       autoload :CreateDomain, action_root.join('create_domain')
       autoload :CreateDomainVolume, action_root.join('create_domain_volume')
@@ -351,11 +337,10 @@ module VagrantPlugins
       autoload :PrepareNFSValidIds, action_root.join('prepare_nfs_valid_ids')
       autoload :PruneNFSExports, action_root.join('prune_nfs_exports')
 
-      autoload :ReadSSHInfo, action_root.join('read_ssh_info')
       autoload :ReadMacAddresses, action_root.join('read_mac_addresses')
-      autoload :ReadState, action_root.join('read_state')
       autoload :ResumeDomain, action_root.join('resume_domain')
       autoload :SetNameOfDomain, action_root.join('set_name_of_domain')
+      autoload :SetBootOrder, action_root.join('set_boot_order')
 
       # I don't think we need it anymore
       autoload :ShareFolders, action_root.join('share_folders')
@@ -370,6 +355,7 @@ module VagrantPlugins
       autoload :HandleBox, 'vagrant/action/builtin/handle_box'
       autoload :SyncedFolders, 'vagrant/action/builtin/synced_folders'
       autoload :SyncedFolderCleanup, 'vagrant/action/builtin/synced_folder_cleanup'
+      autoload :ProvisionerCleanup, 'vagrant/action/builtin/provisioner_cleanup'
     end
   end
 end