vagrant-unbundled 2.2.0.0 → 2.2.2.0

data/plugins/commands/login/plugin.rb

@@ -14,7 +14,6 @@ module VagrantPlugins
       command(:login) do
         require File.expand_path("../../cloud/auth/login", __FILE__)
         init!
-        $stderr.puts "WARNING: This command has been deprecated in favor of `vagrant cloud auth login`"
         VagrantPlugins::CloudCommand::AuthCommand::Command::Login
       end
 

data/plugins/commands/validate/command.rb

@@ -8,17 +8,32 @@ module VagrantPlugins
       end
 
       def execute
+        options = {}
+
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant validate"
+          o.banner = "Usage: vagrant validate [options]"
+          o.separator ""
+          o.separator "Validates a Vagrantfile config"
+          o.separator ""
+          o.separator "Options:"
+          o.separator ""
+
+          o.on("-p", "--ignore-provider", "Ignores provider config options") do |p|
+            options[:ignore_provider] = p
+          end
         end
 
         # Parse the options
         argv = parse_options(opts)
         return if !argv
 
+        action_env = {}
+        if options[:ignore_provider]
+          action_env[:ignore_provider] = true
+        end
         # Validate the configuration of all machines
         with_target_vms() do |machine|
-          machine.action_raw(:config_validate, Vagrant::Action::Builtin::ConfigValidate)
+          machine.action_raw(:config_validate, Vagrant::Action::Builtin::ConfigValidate, action_env)
         end
 
         @env.ui.info(I18n.t("vagrant.commands.validate.success"))

data/plugins/communicators/ssh/communicator.rb

@@ -69,14 +69,16 @@ module VagrantPlugins
           end
 
           # Got it! Let the user know what we're connecting to.
-          @machine.ui.detail("SSH address: #{ssh_info[:host]}:#{ssh_info[:port]}")
-          @machine.ui.detail("SSH username: #{ssh_info[:username]}")
-          ssh_auth_type = "private key"
-          ssh_auth_type = "password" if ssh_info[:password]
-          @machine.ui.detail("SSH auth method: #{ssh_auth_type}")
-
-          last_message = nil
-          last_message_repeat_at = 0
+          if !@ssh_info_notification
+            @machine.ui.detail("SSH address: #{ssh_info[:host]}:#{ssh_info[:port]}")
+            @machine.ui.detail("SSH username: #{ssh_info[:username]}")
+            ssh_auth_type = "private key"
+            ssh_auth_type = "password" if ssh_info[:password]
+            @machine.ui.detail("SSH auth method: #{ssh_auth_type}")
+            @ssh_info_notification = true
+          end
+
+          previous_messages = {}
           while true
             message  = nil
             begin
@@ -123,14 +125,13 @@ module VagrantPlugins
             if message
               message_at   = Time.now.to_f
               show_message = true
-              if last_message == message
-                show_message = (message_at - last_message_repeat_at) > 10.0
+              if previous_messages[message]
+                show_message = (message_at - previous_messages[message]) > 10.0
               end
 
               if show_message
                 @machine.ui.detail("Warning: #{message} Retrying...")
-                last_message = message
-                last_message_repeat_at = message_at
+                previous_messages[message] = message_at
               end
             end
           end
@@ -311,6 +312,15 @@ module VagrantPlugins
           to: to.to_s
       end
 
+      def reset!
+        if @connection
+          @connection.close
+          @connection = nil
+        end
+        @ssh_info_notification = true # suppress ssh info output
+        wait_for_ready(5)
+      end
+
       protected
 
       # Opens an SSH connection and yields it to a block.

data/plugins/communicators/winrm/communicator.rb

@@ -109,7 +109,7 @@ module VagrantPlugins
 
         @logger.info("WinRM is ready!")
         return true
-      rescue Errors::TransientError => e
+      rescue Errors::TransientError, VagrantPlugins::CommunicatorWinRM::Errors::WinRMNotReady => e
         # We catch a `TransientError` which would signal that something went
         # that might work if we wait and retry.
         @logger.info("WinRM not up: #{e.inspect}")
@@ -121,6 +121,10 @@ module VagrantPlugins
         return false
       end
 
+      def reset!
+        shell(true)
+      end
+
       def shell(reload=false)
         @shell = nil if reload
         @shell ||= create_shell

data/plugins/communicators/winrm/shell.rb

@@ -71,7 +71,13 @@ module VagrantPlugins
       def elevated(command, opts = {}, &block)
         connection.shell(:elevated) do |shell|
           shell.interactive_logon = opts[:interactive] || false
-          execute_with_rescue(shell, command, &block)
+          uname = shell.username
+          begin
+            shell.username = elevated_username
+            execute_with_rescue(shell, command, &block)
+          ensure
+            shell.username = uname
+          end
         end
       end
 
@@ -216,6 +222,24 @@ module VagrantPlugins
           retry_delay: @config.retry_delay,
           retry_limit: @config.max_tries }
       end
+
+      def elevated_username
+        if @elevated_username
+          return @elevated_username
+        end
+        if username.include?("\\")
+          return @elevated_username = username
+        end
+        computername = ""
+        powershell("Write-Output $env:computername") do |type, data|
+          computername << data if type == :stdout
+        end
+        computername.strip!
+        if computername.empty?
+          return @elevated_username = username
+        end
+        @elevated_username = "#{computername}\\#{username}"
+      end
     end #WinShell class
   end
 end

data/plugins/guests/debian/cap/change_host_name.rb

@@ -1,8 +1,15 @@
+require "log4r"
+require_relative "../../linux/cap/network_interfaces"
+
 module VagrantPlugins
   module GuestDebian
     module Cap
       class ChangeHostName
+
+        extend Vagrant::Util::GuestInspection::Linux
+
         def self.change_host_name(machine, name)
+          @logger = Log4r::Logger.new("vagrant::guest::debian::changehostname")
           comm = machine.communicate
 
           if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
@@ -10,11 +17,6 @@ module VagrantPlugins
             comm.sudo <<-EOH.gsub(/^ {14}/, '')
               # Set the hostname
               echo '#{basename}' > /etc/hostname
-              hostname -F /etc/hostname
-
-              if command -v hostnamectl; then
-                hostnamectl set-hostname '#{basename}'
-              fi
 
               # Prepend ourselves to /etc/hosts
               grep -w '#{name}' /etc/hosts || {
@@ -28,6 +30,13 @@ module VagrantPlugins
               # Update mailname
               echo '#{name}' > /etc/mailname
 
+            EOH
+
+            if hostnamectl?(comm)
+              comm.sudo("hostnamectl set-hostname '#{basename}'")
+            else
+              comm.sudo <<-EOH.gsub(/^ {14}/, '')
+              hostname -F /etc/hostname
               # Restart hostname services
               if test -f /etc/init.d/hostname; then
                 /etc/init.d/hostname start || true
@@ -36,11 +45,58 @@ module VagrantPlugins
               if test -f /etc/init.d/hostname.sh; then
                 /etc/init.d/hostname.sh start || true
               fi
-              if test -x /sbin/dhclient ; then
-                /sbin/dhclient -r
-                /sbin/dhclient -nw
-              fi
-            EOH
+              EOH
+            end
+
+            restart_command = nil
+            if systemd?(comm)
+              if systemd_networkd?(comm)
+                @logger.debug("Attempting to restart networking with systemd-networkd")
+                restart_command = "systemctl restart systemd-networkd.service"
+              elsif systemd_controlled?(comm, "NetworkManager.service")
+                @logger.debug("Attempting to restart networking with NetworkManager")
+                restart_command = "systemctl restart NetworkManager.service"
+              end
+            end
+
+            if restart_command
+              comm.sudo(restart_command)
+            else
+              restart_each_interface(machine, @logger)
+            end
+          end
+        end
+
+        protected
+
+        # Due to how most Debian systems and older Ubuntu systems handle restarting
+        # networking, we cannot simply run the networking init script or use the ifup/down
+        # tools to restart all interfaces to renew the machines DHCP lease when setting
+        # its hostname. This method is a workaround for those older systems that
+        # cannoy reliably restart networking. It restarts each individual interface
+        # on its own instead.
+        #
+        # @param [Vagrant::Machine] machine
+        # @param [Log4r::Logger] logger
+        def self.restart_each_interface(machine, logger)
+          comm = machine.communicate
+          interfaces = VagrantPlugins::GuestLinux::Cap::NetworkInterfaces.network_interfaces(machine)
+          nettools = true
+          if systemd?(comm)
+            @logger.debug("Attempting to restart networking with systemctl")
+            nettools = false
+          else
+            @logger.debug("Attempting to restart networking with ifup/down nettools")
+          end
+
+          interfaces.each do |iface|
+            logger.debug("Restarting interface #{iface} on guest #{machine.name}")
+            if nettools
+             restart_command = "ifdown #{iface};ifup #{iface}"
+            else
+             restart_command = "systemctl stop ifup@#{iface}.service;systemctl start ifup@#{iface}.service"
+            end
+            comm.sudo(restart_command)
           end
         end
       end

data/plugins/guests/windows/cap/change_host_name.rb

@@ -1,8 +1,9 @@
+require "log4r"
+
 module VagrantPlugins
   module GuestWindows
     module Cap
       module ChangeHostName
-
         def self.change_host_name(machine, name)
           change_host_name_and_wait(machine, name, machine.config.vm.graceful_halt_timeout)
         end
@@ -11,14 +12,11 @@ module VagrantPlugins
           # If the configured name matches the current name, then bail
           # We cannot use %ComputerName% because it truncates at 15 chars
           return if machine.communicate.test("if ([System.Net.Dns]::GetHostName() -eq '#{name}') { exit 0 } exit 1")
-          
+
           # Rename and reboot host if rename succeeded
           script = <<-EOH
             $computer = Get-WmiObject -Class Win32_ComputerSystem
             $retval = $computer.rename("#{name}").returnvalue
-            if ($retval -eq 0) {
-              shutdown /r /t 5 /f /d p:4:1 /c "Vagrant Rename Computer"
-            }
             exit $retval
           EOH
 
@@ -27,13 +25,7 @@ module VagrantPlugins
             error_class: Errors::RenameComputerFailed,
             error_key: :rename_computer_failed)
 
-          # Don't continue until the machine has shutdown and rebooted
-	  if machine.guest.capability?(:wait_for_reboot)
-            machine.guest.capability(:wait_for_reboot)
-          else
-            # use graceful_halt_timeout only if guest cannot wait for reboot
-            sleep(sleep_timeout)
-	  end
+          machine.guest.capability(:reboot)
         end
       end
     end

data/plugins/guests/windows/cap/reboot.rb

@@ -1,21 +1,51 @@
+require "log4r"
+
 module VagrantPlugins
   module GuestWindows
     module Cap
       class Reboot
-        def self.wait_for_reboot(machine)
-          # Technically it should be possible to make it work with SSH
-          # too, but we don't yet.
-          return if machine.config.vm.communicator != :winrm
+        MAX_REBOOT_RETRY_DURATION = 120
+
+        def self.reboot(machine)
+          @logger = Log4r::Logger.new("vagrant::windows::reboot")
+          reboot_script = "shutdown /r /t 5 /f /d p:4:1 /c \"Vagrant Reboot Computer\""
+
+          comm = machine.communicate
+
+          script  = File.expand_path("../../scripts/reboot_detect.ps1", __FILE__)
+          script  = File.read(script)
+          if comm.test(script, error_check: false, shell: :powershell)
+            @logger.debug("Issuing reboot command for guest")
+            comm.execute(reboot_script, shell: :powershell)
+          else
+            @logger.debug("A reboot is already in progress")
+          end
+
+          @logger.debug("Waiting for machine to finish rebooting")
 
+          wait_remaining = MAX_REBOOT_RETRY_DURATION
+          begin
+            wait_for_reboot(machine)
+          rescue Vagrant::Errors::MachineGuestNotReady, WinRM::WinRMHTTPTransportError => e
+            raise if wait_remaining < 0
+            @logger.warn("Machine not ready, cannot start reboot yet. Trying again")
+            sleep(5)
+            wait_remaining -= 5
+            retry
+          end
+        end
+
+        def self.wait_for_reboot(machine)
           script  = File.expand_path("../../scripts/reboot_detect.ps1", __FILE__)
           script  = File.read(script)
-          while machine.communicate.execute(script, error_check: false) != 0
+
+          while machine.guest.ready? && machine.communicate.execute(script, error_check: false, shell: :powershell) != 0
             sleep 10
           end
 
           # This re-establishes our symbolic links if they were
           # created between now and a reboot
-          machine.communicate.execute("net use", error_check: false)
+          machine.communicate.execute("net use", error_check: false, shell: :powershell)
         end
       end
     end

data/plugins/guests/windows/plugin.rb

@@ -64,6 +64,11 @@ module VagrantPlugins
         Cap::Reboot
       end
 
+      guest_capability(:windows, :reboot) do
+        require_relative "cap/reboot"
+        Cap::Reboot
+      end
+
       guest_capability(:windows, :choose_addressable_ip_addr) do
         require_relative "cap/choose_addressable_ip_addr"
         Cap::ChooseAddressableIPAddr

data/plugins/kernel_v2/config/vm.rb

@@ -582,7 +582,7 @@ module VagrantPlugins
         @__synced_folders
       end
 
-      def validate(machine)
+      def validate(machine, ignore_provider=nil)
         errors = _detected_errors
 
         if !box && !clone && !machine.provider_options[:box_optional]
@@ -737,9 +737,13 @@ module VagrantPlugins
 
         # Validate only the _active_ provider
         if machine.provider_config
-          provider_errors = machine.provider_config.validate(machine)
-          if provider_errors
-            errors = Vagrant::Config::V2::Util.merge_errors(errors, provider_errors)
+          if !ignore_provider
+            provider_errors = machine.provider_config.validate(machine)
+            if provider_errors
+              errors = Vagrant::Config::V2::Util.merge_errors(errors, provider_errors)
+            end
+          else
+            machine.ui.warn(I18n.t("vagrant.config.vm.ignore_provider_config"))
           end
         end
 

data/plugins/providers/docker/action/host_machine_sync_folders.rb

@@ -45,7 +45,7 @@ module VagrantPlugins
 
         def setup_synced_folders(host_machine, env)
           # Write the host machine SFID if we have one
-          id_path   = env[:machine].data_dir.join("host_machine_sfid")
+          id_path = env[:machine].data_dir.join("host_machine_sfid")
           if !id_path.file?
             host_sfid = SecureRandom.uuid
             id_path.open("w") do |f|
@@ -109,8 +109,7 @@ module VagrantPlugins
 
               # If we specify exact then we know what we're doing
               if !data[:docker__exact]
-                data[:guestpath] =
-                  "/var/lib/docker/docker_#{Time.now.to_i}_#{rand(100000)}"
+                data[:guestpath] = "/var/lib/docker/docker_#{id}"
               end
 
               # Add this synced folder onto the new config if we haven't

data/plugins/providers/hyperv/provider.rb

@@ -38,6 +38,7 @@ module VagrantPlugins
         # This method will load in our driver, so we call it now to
         # initialize it.
         machine_id_changed
+        @logger = Log4r::Logger.new("vagrant::hyperv::provider")
       end
 
       def action(name)
@@ -83,16 +84,27 @@ module VagrantPlugins
         "Hyper-V (#{id})"
       end
 
+      # @return [Hash]
       def ssh_info
         # We can only SSH into a running machine
         return nil if state.id != :running
 
         # Read the IP of the machine using Hyper-V APIs
-        network = @driver.read_guest_ip
-        return nil if !network["ip"]
+        guest_ip = nil
+
+        begin
+          network_info = @driver.read_guest_ip
+          guest_ip = network_info["ip"]
+        rescue Errors::PowerShellError
+          @logger.warn("Failed to read guest IP.")
+        end
+
+        return nil if !guest_ip
+
+        @logger.debug("IP: #{guest_ip}")
 
         {
-          host: network["ip"],
+          host: guest_ip,
           port: 22,
         }
       end