vagrant-unbundled 1.9.5.1 → 1.9.7.1

data/plugins/kernel_v2/config/vm_provisioner.rb

@@ -9,6 +9,15 @@ module VagrantPlugins
       # @return [String]
       attr_reader :name
 
+      # Internal unique name for this provisioner
+      # Set to the given :name if exists, otherwise
+      # it's set as a UUID.
+      #
+      # Note: This is for internal use only.
+      #
+      # @return [String]
+      attr_reader :id
+
       # The type of the provisioner that should be registered
       # as a plugin.
       #
@@ -35,6 +44,7 @@ module VagrantPlugins
         @logger = Log4r::Logger.new("vagrant::config::vm::provisioner")
         @logger.debug("Provisioner defined: #{name}")
 
+        @id = name || SecureRandom.uuid
         @config  = nil
         @invalid = false
         @name    = name

data/plugins/providers/docker/driver/compose.rb

@@ -20,7 +20,7 @@ module VagrantPlugins
         #
         # @param [Vagrant::Machine] machine Machine instance for this driver
         def initialize(machine)
-          if !Vagrant::Util::Which.which("vagrant-compose")
+          if !Vagrant::Util::Which.which("docker-compose")
             raise Errors::DockerComposeNotInstalledError
           end
           super()

data/plugins/providers/docker/provider.rb

@@ -144,7 +144,7 @@ module VagrantPlugins
         if network["Ports"][port_name].respond_to?(:first)
           port_info = network["Ports"][port_name].first
         else
-          ip = network["IpAddress"]
+          ip = network["IPAddress"]
           port = @machine.config.ssh.guest_port
           if !ip.to_s.empty?
             port_info = {

data/plugins/providers/hyperv/action/import.rb

@@ -48,7 +48,7 @@ module VagrantPlugins
             end
           end
 
-          vmcx_support = env[:machine].provider.driver.execute("has_vmcx_support.ps1", {})
+          vmcx_support = env[:machine].provider.driver.execute("has_vmcx_support.ps1", {})['result']
           if vmcx_support
             vm_dir.each_child do |f|
               if f.extname.downcase == '.vmcx'

data/plugins/providers/virtualbox/action.rb

@@ -245,14 +245,13 @@ module VagrantPlugins
         end
       end
 
-      # This is the action that is primarily responsible for saving a snapshot
+      # This is the action that is primarily responsible for restoring a snapshot
       def self.action_snapshot_restore
         Vagrant::Action::Builder.new.tap do |b|
           b.use CheckVirtualbox
           b.use Call, Created do |env, b2|
             if !env[:result]
-              b2.use MessageNotCreated
-              next
+              raise Vagrant::Errors::VMNotCreatedError
             end
 
             b2.use CheckAccessible

data/plugins/providers/virtualbox/driver/version_4_3.rb

@@ -609,9 +609,14 @@ module VagrantPlugins
         end
 
         def share_folders(folders)
+          is_solaris = begin
+                         "SunOS" == read_guest_property("/VirtualBox/GuestInfo/OS/Product")
+                       rescue
+                         false
+                       end
           folders.each do |folder|
             hostpath = folder[:hostpath]
-            if Vagrant::Util::Platform.windows?
+            if Vagrant::Util::Platform.windows? && is_solaris
               hostpath = Vagrant::Util::Platform.windows_unc_path(hostpath)
             end
             args = ["--name",

data/plugins/providers/virtualbox/driver/version_5_0.rb

@@ -613,8 +613,19 @@ module VagrantPlugins
         end
 
         def share_folders(folders)
+          is_solaris = begin
+                         "SunOS" == read_guest_property("/VirtualBox/GuestInfo/OS/Product")
+                       rescue
+                         false
+                       end
           folders.each do |folder|
-            hostpath = Vagrant::Util::Platform.windows_path(folder[:hostpath])
+            # NOTE: Guest additions on Solaris guests do not properly handle
+            # UNC style paths so prevent conversion (See GH-7264)
+            if is_solaris
+              hostpath = folder[:hostpath]
+            else
+              hostpath = Vagrant::Util::Platform.windows_path(folder[:hostpath])
+            end
             args = ["--name",
               folder[:name],
               "--hostpath",

data/plugins/provisioners/ansible/cap/guest/freebsd/ansible_install.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
         module FreeBSD
           module AnsibleInstall
 
-            def self.ansible_install(machine, install_mode, ansible_version)
+            def self.ansible_install(machine, install_mode, ansible_version, pip_args)
               if install_mode != :default
                 raise Ansible::Errors::AnsiblePipInstallIsNotSupported
               else

data/plugins/provisioners/ansible/cap/guest/suse/ansible_install.rb

@@ -6,7 +6,7 @@ module VagrantPlugins
         module SUSE
           module AnsibleInstall
 
-            def self.ansible_install(machine, install_mode, ansible_version)
+            def self.ansible_install(machine, install_mode, ansible_version, pip_args)
               if install_mode != :default
                 raise Ansible::Errors::AnsiblePipInstallIsNotSupported
               else

data/plugins/provisioners/ansible/provisioner/host.rb

@@ -249,11 +249,8 @@ module VagrantPlugins
           # Don't access user's known_hosts file, except when host_key_checking is enabled.
           ssh_options << "-o UserKnownHostsFile=/dev/null" unless config.host_key_checking
 
-          # Set IdentitiesOnly=yes to avoid authentication errors when the host has more than 5 ssh keys.
-          # Notes:
-          #  - Solaris/OpenSolaris/Illumos uses SunSSH which doesn't support the IdentitiesOnly option.
-          #  - this could be improved by sharing logic with lib/vagrant/util/ssh.rb
-          ssh_options << "-o IdentitiesOnly=yes" unless Vagrant::Util::Platform.solaris?
+          # Compare to lib/vagrant/util/ssh.rb
+          ssh_options << "-o IdentitiesOnly=yes" if !Vagrant::Util::Platform.solaris? && @ssh_info[:keys_only]
 
           # Multiple Private Keys
           unless !config.inventory_path && @ssh_info[:private_key_path].size == 1

data/plugins/provisioners/docker/config.rb

@@ -4,9 +4,11 @@ module VagrantPlugins
   module DockerProvisioner
     class Config < Vagrant.plugin("2", :config)
       attr_reader :images
+      attr_accessor :post_install_provisioner
 
       def initialize
         @images = Set.new
+        @post_install_provisioner = nil
 
         @__build_images   = []
         @__containers     = Hash.new { |h, k| h[k] = {} }
@@ -38,6 +40,15 @@ module VagrantPlugins
         @images += images.map(&:to_s)
       end
 
+      def post_install_provision(name, **options, &block)
+        # Abort
+        raise DockerError, :wrong_provisioner if options[:type] == "docker"
+
+        proxy = VagrantPlugins::Kernel_V2::VMConfig.new
+        proxy.provision(name, **options, &block)
+        @post_install_provisioner = proxy.provisioners.first
+      end
+
       def run(name, **options)
         @__containers[name.to_s] = options.dup
       end

data/plugins/provisioners/docker/installer.rb

@@ -8,10 +8,12 @@ module VagrantPlugins
       # This handles verifying the Docker installation, installing it if it was
       # requested, and so on. This method will raise exceptions if things are
       # wrong.
+      # @return [Boolean] - false if docker cannot be detected on machine, else
+      #                     true if docker installs correctly or is installed
       def ensure_installed
         if !@machine.guest.capability?(:docker_installed)
           @machine.ui.warn(I18n.t("vagrant.docker_cant_detect"))
-          return
+          return false
         end
 
         if !@machine.guest.capability(:docker_installed)
@@ -26,6 +28,8 @@ module VagrantPlugins
         if @machine.guest.capability?(:docker_configure_vagrant_user)
           @machine.guest.capability(:docker_configure_vagrant_user)
         end
+
+        true
       end
     end
   end

data/plugins/provisioners/docker/provisioner.rb

@@ -19,7 +19,16 @@ module VagrantPlugins
         @logger = Log4r::Logger.new("vagrant::provisioners::docker")
 
         @logger.info("Checking for Docker installation...")
-        @installer.ensure_installed
+        if @installer.ensure_installed
+          if !config.post_install_provisioner.nil?
+            @logger.info("Running post setup provision script...")
+            env = {
+                  callable: method(:run_provisioner),
+                  provisioner: config.post_install_provisioner,
+                  machine: machine}
+            machine.env.hook(:run_provisioner, env)
+          end
+        end
 
         # Attempt to start service if not running
         @client.start_service
@@ -40,6 +49,14 @@ module VagrantPlugins
           @client.run(config.containers)
         end
       end
+
+      def run_provisioner(env)
+        klass  = Vagrant.plugin("2").manager.provisioners[env[:provisioner].type]
+        result = klass.new(env[:machine], env[:provisioner].config)
+        result.config.finalize!
+
+        result.provision
+      end
     end
   end
 end

data/plugins/provisioners/salt/provisioner.rb

@@ -184,6 +184,20 @@ module VagrantPlugins
         end
       end
 
+      # Get command-line options for masterless provisioning
+      def get_masterless
+        options = ""
+
+        if @config.masterless
+          options = " --local"
+          if @config.minion_id
+            options += " --id #{@config.minion_id}"
+          end
+        end
+
+        return options
+      end
+
       # Copy master and minion configs to VM
       def upload_configs
         if @config.minion_config
@@ -335,16 +349,12 @@ module VagrantPlugins
 
       def call_highstate
         if @config.run_highstate
-          local=""
-          if @config.masterless
-            local=" --local"
-          end
           @machine.env.ui.info "Calling state.highstate... (this may take a while)"
           if @config.install_master
             unless @config.masterless?
               @machine.communicate.sudo("salt '*' saltutil.sync_all")
             end
-            @machine.communicate.sudo("salt '*' state.highstate --verbose #{local}#{get_loglevel}#{get_colorize}#{get_pillar}") do |type, data|
+            @machine.communicate.sudo("salt '*' state.highstate --verbose#{get_masterless}#{get_loglevel}#{get_colorize}#{get_pillar}") do |type, data|
             if @config.verbose
                 @machine.env.ui.info(data.rstrip)
             end
@@ -355,7 +365,7 @@ module VagrantPlugins
               unless @config.masterless?
                 @machine.communicate.execute("C:\\salt\\salt-call.bat saltutil.sync_all", opts)
               end
-              @machine.communicate.execute("C:\\salt\\salt-call.bat state.highstate --retcode-passthrough #{local}#{get_loglevel}#{get_colorize}#{get_pillar}", opts) do |type, data|
+              @machine.communicate.execute("C:\\salt\\salt-call.bat state.highstate --retcode-passthrough#{get_masterless}#{get_loglevel}#{get_colorize}#{get_pillar}", opts) do |type, data|
                 if @config.verbose
                   @machine.env.ui.info(data.rstrip)
                 end
@@ -364,7 +374,7 @@ module VagrantPlugins
               unless @config.masterless?
                 @machine.communicate.sudo("salt-call saltutil.sync_all")
               end
-              @machine.communicate.sudo("salt-call state.highstate --retcode-passthrough #{local}#{get_loglevel}#{get_colorize}#{get_pillar}") do |type, data|
+              @machine.communicate.sudo("salt-call state.highstate --retcode-passthrough#{get_masterless}#{get_loglevel}#{get_colorize}#{get_pillar}") do |type, data|
                 if @config.verbose
                   @machine.env.ui.info(data.rstrip)
                 end

data/plugins/synced_folders/rsync/command/rsync_auto.rb

@@ -48,6 +48,9 @@ module VagrantPlugins
           paths = {}
           ignores = []
           with_target_vms(argv) do |machine|
+            next if machine.state.id == :not_created
+            cwd = machine.env.cwd.to_s
+
             if machine.provider.capability?(:proxy_machine)
               proxy = machine.provider.capability(:proxy_machine)
               if proxy
@@ -70,6 +73,21 @@ module VagrantPlugins
             folders = cached[:rsync]
             next if !folders || folders.empty?
 
+            # NOTE: This check is required with boot2docker since all containers
+            # share the same virtual machine. This prevents rsync-auto from
+            # syncing all known containers with rsync to the boot2docker vm
+            # and only syncs the current working dirs folders.
+            sync_folders = {}
+            folders.each do |id, folder_opts|
+              if cwd != folder_opts[:hostpath]
+                machine.ui.info(I18n.t("vagrant.rsync_auto_remove_folder",
+                                    folder: folder_opts[:hostpath]))
+              else
+                sync_folders[id] = folder_opts
+              end
+            end
+            folders = sync_folders
+
             # Get the SSH info for this machine so we can do an initial
             # sync to the VM.
             ssh_info = machine.ssh_info

data/plugins/synced_folders/unix_mount_helpers.rb

@@ -50,7 +50,7 @@ module VagrantPlugins
                 command: gid_command,
                 output: output[:stderr]
               ) { |type, data| output[type] << data if output[type] }
-              mount_gid = output[:stdout].split(':').at(2)
+              mount_gid = output[:stdout].split(':').at(2).to_s.chomp
               self.class_variable_get(:@@logger).debug("Owner group ID (lookup): #{options[:group]} -> #{mount_gid}")
             rescue Vagrant::Errors::VirtualBoxMountFailed
               if options[:owner] == options[:group]

data/templates/commands/init/Vagrantfile.erb

@@ -11,7 +11,7 @@ Vagrant.configure("2") do |config|
   # https://docs.vagrantup.com.
 
   # Every Vagrant development environment requires a box. You can search for
-  # boxes at https://atlas.hashicorp.com/search.
+  # boxes at https://vagrantcloud.com/search.
   config.vm.box = "<%= box_name %>"
   <% if box_version -%>
   config.vm.box_version = "<%= box_version %>"
@@ -69,13 +69,6 @@ Vagrant.configure("2") do |config|
   # View the documentation for the provider you are using for more
   # information on available options.
 
-  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
-  # such as FTP and Heroku are also available. See the documentation at
-  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
-  # config.push.define "atlas" do |push|
-  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
-  # end
-
   # Enable provisioning with a shell script. Additional provisioners such as
   # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
   # documentation for more information about their specific syntax and use.

data/templates/locales/en.yml

@@ -22,6 +22,9 @@ en:
       Successfully added box '%{name}' (v%{version}) for '%{provider}'!
     box_adding_direct: |-
       Box file was not detected as metadata. Adding it directly...
+    box_add_url_warn: |-
+      It looks like you attempted to add a box with a URL for the name...
+      Instead, use box_url instead of box for box URLs.
     box_downloading: |-
       Downloading: %{url}
     box_download_error: |-
@@ -162,6 +165,10 @@ en:
       description of what they do.
 
       %{list}
+    moved_cwd: |-
+      This machine used to live in %{old_wd} but it's now at %{current_wd}.
+      Depending on your current provider you may need to change the name of
+      the machine to run it as a different machine.
     guest_deb_installing_smb: |-
       Installing SMB "mount.cifs"...
     global_status_footer: |-
@@ -211,6 +218,8 @@ en:
       have specified `rsync_auto` to be false.
     rsync_auto_path: |-
       Watching: %{path}
+    rsync_auto_remove_folder: |-
+      Not syncing %{folder} as it is not part of the current working directory.
     rsync_auto_rsync_error: |-
       There was an error while executing rsync. The error is shown below.
       This may not be critical since rsync sometimes fails, but if this message
@@ -380,7 +389,7 @@ en:
         provider. Double-check your requested provider to verify you didn't
         simply misspell it.
 
-        If you're adding a box from HashiCorp's Atlas, make sure the box is
+        If you're adding a box from HashiCorp's Vagrant Cloud, make sure the box is
         released.
 
         Name: %{name}
@@ -399,7 +408,7 @@ en:
       box_add_short_not_found: |-
         The box '%{name}' could not be found or
         could not be accessed in the remote catalog. If this is a private
-        box on HashiCorp's Atlas, please verify you're logged in via
+        box on HashiCorp's Vagrant Cloud, please verify you're logged in via
         `vagrant login`. Also, please double-check the name. The expanded
         URL and error message are shown below:
 
@@ -564,12 +573,12 @@ en:
 
         %{versions}
       box_server_not_set: |-
-        A URL to an Atlas server is not set, so boxes cannot be added with a
+        A URL to a Vagrant Cloud server is not set, so boxes cannot be added with a
         shorthand ("mitchellh/precise64") format. You may also be seeing this
         error if you meant to type in a path to a box file which doesn't exist
         locally on your system.
 
-        To set a URL to an Atlas server, set the `VAGRANT_SERVER_URL`
+        To set a URL to a Vagrant Cloud server, set the `VAGRANT_SERVER_URL`
         environmental variable. Or, if you meant to use a file path, make sure
         the path to the file is valid.
       box_update_multi_provider: |-
@@ -1156,6 +1165,17 @@ en:
         (probably for one of your shared folders). This is an extremely rare
         error case and most likely indicates an unusual configuration of the
         guest system. Please report a bug with your Vagrantfile and debug log.
+      snapshot_force: |-
+        You must include the `--force` option to replace an existing snapshot.
+      snapshot_not_supported: |-
+        This provider doesn't support snapshots.
+
+        This may be intentional or this may be a bug. If this provider
+        should support snapshots, then please report this as a bug to the
+        maintainer of the provider.
+      snapshot_not_found: |-
+        The snapshot name `%{snapshot_name}` was not found for the
+        virtual machine `%{machine}`.
       ssh_authentication_failed: |-
         SSH authentication failed! This is typically caused by the public/private
         keypair for the SSH user not being properly set on the guest VM. Please
@@ -1537,7 +1557,7 @@ en:
         unexpected errors. To learn more about this, and the options that are available,
         please refer to the Vagrant documentation:
 
-          https://www.vagrantup.com/docs/other/wsl
+          https://www.vagrantup.com/docs/other/wsl.html
       wsl_virtualbox_windows_access: |-
         Vagrant is unable to use the VirtualBox provider from the Windows Subsystem for
         Linux without access to the Windows environment. Enabling this access must be
@@ -1545,7 +1565,7 @@ en:
         on enabing Windows access and using VirtualBox from the Windows Subsystem for
         Linux, please refer to the Vagrant documentation:
 
-          https://www.vagrantup.com/docs/other/wsl
+          https://www.vagrantup.com/docs/other/wsl.html
 #-------------------------------------------------------------------------------
 # Translations for config validation errors
 #-------------------------------------------------------------------------------
@@ -2343,6 +2363,9 @@ en:
           Please check https://docs.ansible.com/intro_installation.html#control-machine-requirements
 
       docker:
+        wrong_provisioner: |-
+          The Docker post-install provisioner cannot also take a Docker post-install
+          provisioner
         not_running: "Docker is not running on the guest VM."
         install_failed: "Docker installation failed."