vagrant-unbundled 2.2.9.0 → 2.2.10.0

data/plugins/providers/virtualbox/plugin.rb

@@ -54,7 +54,12 @@ module VagrantPlugins
         Cap::ValidateDiskExt
       end
 
-      provider_capability(:virtualbox, :get_default_disk_ext) do
+      provider_capability(:virtualbox, :default_disk_exts) do
+        require_relative "cap/validate_disk_ext"
+        Cap::ValidateDiskExt
+      end
+
+      provider_capability(:virtualbox, :set_default_disk_ext) do
         require_relative "cap/validate_disk_ext"
         Cap::ValidateDiskExt
       end
@@ -63,6 +68,16 @@ module VagrantPlugins
         require_relative "cap"
         Cap
       end
+
+      synced_folder_capability(:virtualbox, "mount_options") do
+        require_relative "cap/mount_options"
+        Cap::MountOptions
+      end
+
+      synced_folder_capability(:virtualbox, "mount_type") do
+        require_relative "cap/mount_options"
+        Cap::MountOptions
+      end
     end
 
     autoload :Action, File.expand_path("../action", __FILE__)
@@ -84,6 +99,8 @@ module VagrantPlugins
 
     module Model
       autoload :ForwardedPort, File.expand_path("../model/forwarded_port", __FILE__)
+      autoload :StorageController, File.expand_path("../model/storage_controller", __FILE__)
+      autoload :StorageControllerArray, File.expand_path("../model/storage_controller_array", __FILE__)
     end
 
     module Util

data/plugins/providers/virtualbox/synced_folder.rb

@@ -33,6 +33,7 @@ module VagrantPlugins
 
         # Go through each folder and mount
         machine.ui.output(I18n.t("vagrant.actions.vm.share_folders.mounting"))
+        fstab_folders = []
         folders.each do |id, data|
           if data[:guestpath]
             # Guest path specified, so mount the folder to specified point

data/plugins/provisioners/container/client.rb

@@ -160,7 +160,7 @@ module VagrantPlugins
         # If the name is the automatically assigned name, then
         # replace the "/" with "-" because "/" is not a valid
         # character for a container name.
-        name = name.gsub("/", "-") if name == config[:original_name]
+        name = name.gsub("/", "-").gsub(":", "-") if name == config[:original_name]
         name
       end
 

data/plugins/provisioners/shell/provisioner.rb

@@ -11,6 +11,8 @@ module VagrantPlugins
 
       DEFAULT_WINDOWS_SHELL_EXT = ".ps1".freeze
 
+      CMD_WINDOWS_SHELL_EXT = ".bat".freeze
+
       def provision
         args = ""
         if config.args.is_a?(String)
@@ -138,14 +140,7 @@ module VagrantPlugins
           @machine.communicate.tap do |comm|
             env = config.env.map{|k,v| comm.generate_environment_export(k, v)}.join(';')
 
-            remote_ext = File.extname(upload_path.to_s)
-            if remote_ext.empty?
-              remote_ext = File.extname(path.to_s)
-              if remote_ext.empty?
-                remote_ext = @machine.config.winssh.shell == "cmd" ? ".bat" : ".ps1"
-              end
-            end
-
+            remote_ext = get_windows_ext(path)
             remote_path = add_extension(upload_path, remote_ext)
 
             if remote_ext == ".bat"
@@ -203,7 +198,7 @@ module VagrantPlugins
           @machine.communicate.tap do |comm|
             # Make sure that the upload path has an extension, since
             # having an extension is critical for Windows execution
-            winrm_upload_path = add_extension(upload_path, DEFAULT_WINDOWS_SHELL_EXT)
+            winrm_upload_path = add_extension(upload_path,  get_windows_ext(path))
 
             # Upload it
             comm.upload(path.to_s, winrm_upload_path)
@@ -267,6 +262,17 @@ module VagrantPlugins
         path + ext
       end
 
+      def get_windows_ext(path)
+        remote_ext = File.extname(upload_path.to_s)
+        if remote_ext.empty?
+          remote_ext = File.extname(path.to_s)
+          if remote_ext.empty?
+            remote_ext = @machine.config.winssh.shell == "cmd" ? CMD_WINDOWS_SHELL_EXT : DEFAULT_WINDOWS_SHELL_EXT
+          end
+        end
+        remote_ext
+      end
+
       # This method yields the path to a script to upload and execute
       # on the remote server. This method will properly clean up the
       # script file if needed.

data/plugins/synced_folders/nfs/synced_folder.rb

@@ -30,7 +30,9 @@ module VagrantPlugins
         if !machine.config.nfs.functional
           return false
         end
-        return true if machine.env.host.capability(:nfs_installed)
+        if machine.env.host.capability?(:nfs_installed)
+          return true if machine.env.host.capability(:nfs_installed)
+        end
         return false if !raise_error
         raise Vagrant::Errors::NFSNotSupported
       end

data/plugins/synced_folders/smb/cap/default_fstab_modification.rb

@@ -0,0 +1,11 @@
+module VagrantPlugins
+  module SyncedFolderSMB
+    module Cap
+      module DefaultFstabModification
+        def self.default_fstab_modification(machine)
+          return false
+        end
+      end
+    end
+  end
+end

data/plugins/synced_folders/smb/cap/mount_options.rb

@@ -0,0 +1,36 @@
+require_relative "../../unix_mount_helpers"
+
+module VagrantPlugins
+  module SyncedFolderSMB
+    module Cap
+      module MountOptions
+        extend VagrantPlugins::SyncedFolder::UnixMountHelpers
+
+        def self.mount_options(machine, name, guest_path, options)
+          mount_options = options.fetch(:mount_options, [])
+          detected_ids = detect_owner_group_ids(machine, guest_path, mount_options, options)
+          mount_uid = detected_ids[:uid]
+          mount_gid = detected_ids[:gid]
+
+          mnt_opts = []
+          if machine.env.host.capability?(:smb_mount_options)
+            mnt_opts += machine.env.host.capability(:smb_mount_options)
+          else
+            mnt_opts << "sec=ntlmssp"
+          end
+
+          mnt_opts << "credentials=/etc/smb_creds_#{name}"
+          mnt_opts << "uid=#{mount_uid}"
+          mnt_opts << "gid=#{mount_gid}"
+          if !ENV['VAGRANT_DISABLE_SMBMFSYMLINKS']
+            mnt_opts << "mfsymlinks"
+          end
+          mnt_opts = merge_mount_options(mnt_opts, options[:mount_options] || [])
+
+          mount_options = mnt_opts.join(",")
+          return mount_options, mount_uid, mount_gid
+        end
+      end
+    end
+  end
+end

data/plugins/synced_folders/smb/plugin.rb

@@ -23,6 +23,16 @@ module VagrantPlugins
         SyncedFolder
       end
 
+      synced_folder_capability("smb", "default_fstab_modification") do
+        require_relative "cap/default_fstab_modification"
+        Cap::DefaultFstabModification
+      end
+
+      synced_folder_capability("smb", "mount_options") do
+        require_relative "cap/mount_options"
+        Cap::MountOptions
+      end
+
       protected
 
       def self.init!

data/plugins/synced_folders/smb/synced_folder.rb

@@ -66,7 +66,7 @@ module VagrantPlugins
             if machine.env.host.capability?(:smb_validate_password)
               Vagrant::Util::CredentialScrubber.sensitive(smb_password)
               auth_success = machine.env.host.capability(:smb_validate_password,
-                smb_username, smb_password)
+                machine, smb_username, smb_password)
             end
 
             break if auth_success

data/plugins/synced_folders/unix_mount_helpers.rb

@@ -100,6 +100,20 @@ module VagrantPlugins
           EOH
       end
 
+      def merge_mount_options(base, overrides)
+        base = base.join(",").split(",")
+        overrides = overrides.join(",").split(",")
+        b_kv = Hash[base.map{|item| item.split("=", 2) }]
+        o_kv = Hash[overrides.map{|item| item.split("=", 2) }]
+        merged = {}.tap do |opts|
+          (b_kv.keys + o_kv.keys).uniq.each do |key|
+            opts[key] = o_kv.fetch(key, b_kv[key])
+          end
+        end
+        merged.map do |key, value|
+          [key, value].compact.join("=")
+        end
+      end
     end
   end
 end

data/templates/guests/arch/systemd_networkd/network_dhcp.erb

@@ -0,0 +1,6 @@
+[Match]
+Name=<%= options[:device] %>
+
+[Network]
+Description=A basic DHCP ethernet connection
+DHCP=ipv4

data/templates/guests/arch/systemd_networkd/network_static.erb

@@ -0,0 +1,9 @@
+[Match]
+Name=<%= options[:device] %>
+
+[Network]
+Description=A basic static ethernet connection
+Address=<%= options[:ip]%>/<%= options[:netmask] %>
+<% if options[:gateway] -%>
+Gateway=<%= options[:gateway] %>
+<% end -%>

data/templates/guests/arch/systemd_networkd/network_static6.erb

@@ -0,0 +1,9 @@
+[Match]
+Name=<%= options[:device] %>
+
+[Network]
+Description=A basic static ethernet connection
+Address=<%= options[:ip]%>/<%= options[:netmask] %>
+<% if options[:gateway] -%>
+Gateway=<%= options[:gateway] %>
+<% end -%>

data/templates/guests/linux/etc_fstab.erb

@@ -0,0 +1,6 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant. Do not modify.
+<% folders.each do |opts| %>
+<%= opts[:name] %> <%= opts[:mount_point] %> <%= opts[:mount_type] %> <%= opts[:mount_options] || 'default' %> <%= opts[:dump] || 0 %> <%= opts[:fsck] || 0 %>
+<%end%>
+#VAGRANT-END

data/templates/locales/en.yml

@@ -127,6 +127,7 @@ en:
       Warning: Chef run list is empty. This may not be what you want.
     cli_interrupt: |-
       Exiting due to interrupt.
+    cloud_init_waiting: Waiting for cloud init to finish running
     container_pulling_single: |-
       -- Image: %{name}
     container_building_single: |-
@@ -164,6 +165,10 @@ en:
       -- Detected newer image for container '%{name}', restarting...
     docker_starting_containers: |-
       Starting Docker containers...
+    hyperv_enable_enhanced_session: |-
+      Setting VM Enhanced session transport type to HvSocket
+    hyperv_disable_enhanced_session: |-
+      Setting VM Enhanced session transport type to disabled/default (VMBus)
     inserted_key: |-
       Key inserted! Disconnecting and reconnecting using new SSH key...
     inserting_insecure_detected: |-
@@ -788,6 +793,11 @@ en:
         Additionally, the created environment must be started with a provider
         matching this provider. For example, if you're using VirtualBox,
         the clone environment must also be using VirtualBox.
+      cloud_init_not_found: |-
+        cloud-init is not found. Please ensure that cloud-init is installed and 
+        available on path for guest '%{guest_name}'.
+      cloud_init_command_failed: |- 
+        cloud init command '%{cmd}' failed on guest '%{guest_name}'.
       command_deprecated: |-
         The command 'vagrant %{name}' has been deprecated and is no longer functional
         within Vagrant.
@@ -832,6 +842,9 @@ en:
         they'll have to be destroyed manually.
 
         Path: %{path}
+      create_iso_host_cap_not_found: |-
+        Vagrant cannot create an iso due to the host capability for creating isos not existing.
+        Vagrant will now exit.
       destroy_requires_force: |-
         Destroy doesn't have a TTY to ask for confirmation. Please pass the
         `--force` flag to force a destroy, otherwise attach a TTY so that
@@ -939,6 +952,18 @@ en:
         ("%{value}") could not be found. Please verify that the plugin is
         installed which implements this host and that the value you used
         for `config.vagrant.host` is correct.
+      iso_build_failed: |-
+        Failed to build iso image. The following command returned an error:
+
+        %{cmd}
+
+        Stdout from the command:
+
+        %{stdout}
+
+        Stderr from the command:
+
+        %{stderr}
       hyperv_virtualbox_error: |-
         Hyper-V and VirtualBox cannot be used together and will result in a
         system crash. Vagrant will now exit. Please disable Hyper-V if you wish
@@ -1435,6 +1460,11 @@ en:
         usually indicates that SSH within the guest machine was unable to
         properly start up. Please boot the VM in GUI mode to check whether
         it is booting properly.
+      ssh_no_exit_status: |-
+        The SSH command completed, but Vagrant did not receive an exit status.
+        This indicates that the command was terminated unexpectedly. Please
+        check that the VM has sufficient memory to run the command and that no
+        processes were killed by the guest operating system.
       ssh_no_route: |-
         While attempting to connect with SSH, a "no route to host" (EHOSTUNREACH)
         error was received. Please verify your network settings are correct
@@ -1663,11 +1693,30 @@ en:
         4.2.14 contains a critical bug which prevents it from working with
         Vagrant. VirtualBox 4.2.16+ fixes this problem. Please upgrade
         VirtualBox.
+      virtualbox_disks_controller_not_found: |-
+        Vagrant expected to find a storage controller called '%{name}',
+        but there is no controller with this name attached to the current VM.
+        If you have changed or removed any storage controllers, please restore
+        them to their previous configuration.
+      virtualbox_disks_no_supported_controllers: |-
+        Vagrant was unable to detect a disk controller with any of the
+        following supported types:
+
+        %{supported_types}
+
+        Please add one of the supported controller types in order to use the
+        disk configuration feature.
       virtualbox_disks_defined_exceed_limit: |-
-        VirtualBox only allows up to 30 disks to be attached to a single guest using the SATA Controller,
-        including the primray disk.
-
-        Please ensure only up to 30 disks are configured for your guest.
+        VirtualBox only allows up to %{limit} disks to be attached to the
+        storage controller '%{name}'. Please remove some disks from your disk
+        configuration, or attach a new storage controller.
+      virtualbox_disks_primary_not_found: |-
+        Vagrant was not able to detect a primary disk attached to the main
+        controller. Vagrant Disks requires that the primary disk be attached
+        to the first port of the main controller in order to manage it.
+      virtualbox_disks_unsupported_controller: |-
+        An disk operation was attempted on the controller '%{controller_name}',
+        but Vagrant doesn't support this type of disk controller.
       virtualbox_guest_property_not_found: |-
         Could not find a required VirtualBox guest property:
           %{guest_property}
@@ -1829,6 +1878,11 @@ en:
 #-------------------------------------------------------------------------------
     config:
       disk:
+        dvd_type_file_required:
+          A 'file' option is required when defining a disk of type ':dvd' for guest '%{machine}'.
+        dvd_type_primary: |-
+          Disks of type ':dvd' cannot be defined as a primary disks. Please
+          remove the 'primary' argument for disk '%{name}' on guest '%{machine}'.
         invalid_ext: |-
           Disk type '%{ext}' is not a valid disk extention for '%{name}'. Please pick one of the following supported disk types: %{exts}
         invalid_type: |-
@@ -1941,12 +1995,14 @@ en:
           Checksum type specified but "box_download_checksum" is blank
         box_download_checksum_notblank: |-
           Checksum specified but must also specify "box_download_checksum_type"
+        box_empty: "Box value for guest '%{machine_name}' is an empty string."
         box_missing: "A box must be specified."
         box_download_options_type: |-
           Found "box_download_options" specified as type '%{type}', should be a Hash
         box_download_options_not_converted: |-
           Something went wrong converting VM config `box_download_options`. Value for provided key '%{missing_key}' is invalid type. Should be String or Bool
         clone_and_box: "Only one of clone or box can be specified."
+        config_type: "Found '%{option}' specified as type '%{given}', should be '%{required}'"
         hostname_invalid_characters: |-
           The hostname set for the VM '%{name}' should only contain letters, numbers,
           hyphens or dots. It cannot start with a hyphen or dot.
@@ -1954,8 +2010,21 @@ en:
           Ignoring provider config for validation...
         multiple_primary_disks_error: |-
           There are more than one primary disks defined for guest '%{name}'. Please ensure that only one disk has been defined as a primary disk.
+        multiple_disk_files_error: |-
+          The following disk files are used multiple times in the disk
+          configuration for the VM '%{name}':
+
+          %{disk_files}
+
+          Each disk file may only be attached to a VM once.
         multiple_disk_names_error: |-
-          Duplicate disk names defined: '%{name}'. Disk names must be unique.
+          The following disks names are defined multiple times in the disk
+          configuration for the VM '%{name}':
+
+          %{disk_names}
+
+          Disk names must be unique.
+        multiple_networks_set_hostname: "Multiple networks have set `:hostname`"
         name_invalid: |-
           The sub-VM name '%{name}' is invalid. Please don't use special characters.
         network_ip_ends_in_one: |-
@@ -1974,6 +2043,7 @@ en:
           Forwarded port definitions require a "host" and "guest" value
         network_type_invalid: |-
           Network type '%{type}' is invalid. Please use a valid network type.
+        network_with_hostname_must_set_ip: "Network specified with `:hostname` must provide a static ip"
         provisioner_not_found: |-
           The '%{name}' provisioner could not be found.
         shared_folder_guestpath_duplicate: |-
@@ -2205,14 +2275,17 @@ en:
 # Translations for Vagrant middleware actions
 #-------------------------------------------------------------------------------
     cap:
+      cleanup_disks:
+        disk_cleanup: |-
+          Disk '%{name}' no longer exists in Vagrant config. Removing and closing medium from guest...
+        disk_not_found: |-
+          Disk '%{name}' could not be found, and could not be properly removed. Please remove this disk manually if it still exists
       configure_disks:
-        start: "Configuring storage mediums..."
+        create_disk: |-
+          Disk '%{name}' not found in guest. Creating and attaching disk to guest...
         floppy_not_supported: "Floppy disk configuration not yet supported. Skipping disk '%{name}'..."
-        dvd_not_supported: "DVD disk configuration not yet supported. Skipping disk '%{name}'..."
         shrink_size_not_supported: |-
           VirtualBox does not support shrinking disk sizes. Cannot shrink '%{name}' disks size.
-        create_disk: |-
-          Disk '%{name}' not found in guest. Creating and attaching disk to guest...
         resize_disk: |-
           Disk '%{name}' needs to be resized. Resizing disk...
         recovery_from_resize: |-
@@ -2221,6 +2294,35 @@ en:
           If Vagrant fails to reattach the original disk, it is recommended that you open the VirtualBox GUI and navigate to the current guests settings for '%{name}' and look at the 'storage' section. Here is where you can reattach a missing disk if Vagrant fails to do so...
         recovery_attached_disks: |-
           Disk has been reattached. Vagrant will now continue on an raise the exception receieved
+        start: "Configuring storage mediums..."
+    cloud_init:
+      content_type_not_set: |-
+        'content_type' must be defined for a cloud_init config. Guest '%{machine}'
+        has not defined a 'content_type' for its cloud_init config. Valid options
+        supported by Vagrant are listed below:
+
+        %{accepted_types}
+      incorrect_content_type: |-
+        Content-type "%{content_type}" is not supported by Vagrant and
+        cloud-init on machine '%{machine}'. Valid options supported by Vagrant are
+        listed below:
+
+        %{accepted_types}
+      incorrect_inline_type: |-
+        The inline config cloud_init option for guest '%{machine}' is of type '%{type}', but
+        should be a String.
+      incorrect_path_type: |-
+        The path '%{path}' given for guest '%{machine}' is of type '%{type}'.
+        Config option 'path' must be a String.
+      incorrect_type_set: |-
+        The type '%{type}' defined for a cloud_init config with guest '%{machine}'
+        is not a valid type. Currently, Vagrant only supports type: '%{default_type}'.
+      path_and_inline_set: |-
+        Guest '%{machine}' defines both a 'path' and 'inline' for its cloud_init config,
+        however only one config option should be defined for cloud_init.
+      path_invalid: |-
+        The path '%{path}' defined for guest '%{machine}' cloud_init config was
+        not found on the system.
     actions:
       runner:
         waiting_cleanup: "Waiting for cleanup before exiting..."
@@ -2293,6 +2395,8 @@ en:
           create_master:
             failure: |-
               Failed to create lock-file for master VM creation for box %{box}.
+        cloud_init_user_data_setup: |-
+          Preparing user data for cloud-init...
         customize:
           failure: |-
             A customization command failed:
@@ -2609,7 +2713,7 @@ en:
         missing_provisioner_name: |-
           Could not find provisioner name `%{name}` defined for machine `%{machine_name}` to run provisioner "%{provisioner_name}" `%{action}`.
         wrong_type: |-
-          Provisioner option `%{opt}` is not set as a valid type. Must be a string.
+          Provisioner option `%{opt}` is not set as a valid type. Must be a %{type}.
       chef:
         chef_not_detected: |-
           The chef binary (either `chef-solo` or `chef-client`) was not found on
@@ -2673,7 +2777,7 @@ en:
         server_url_required: |-
           Chef server provisioning requires that the `config.chef.chef_server_url` be set to the
           URL of your chef server. Examples include "http://12.12.12.12:4000" and
-          "http://myserver.com:4000" (the port of course can be different, but 4000 is the default)
+          "http://example.com:4000" (the port of course can be different, but 4000 is the default)
         server_validation_key_required: |-
           Chef server provisioning requires that the `config.chef.validation_key_path` configuration
           be set to a path on your local machine of the validation key used to register the
@@ -2894,3 +2998,9 @@ en:
     pushes:
       file:
         no_destination: "File destination must be specified."
+    
+    autocomplete:
+      installed: |-
+        Autocomplete installed at paths:
+        - %{paths}
+      not_installed: "Autocomplete not installed"