vagrant-unbundled 1.8.1.2 → 1.8.4.1

data/plugins/communicators/winrm/shell.rb

@@ -54,20 +54,21 @@ module VagrantPlugins
       end
 
       def powershell(command, &block)
-        # Suppress the progress stream from leaking to stderr
-        command = "$ProgressPreference='SilentlyContinue';\r\n" + command
-        command << "\r\n"
         # Ensure an exit code
-        command << "if ($?) { exit 0 } else { if($LASTEXITCODE) { exit $LASTEXITCODE } else { exit 1 } }"
-        execute_shell(command, :powershell, &block)
+        command += "\r\nif ($?) { exit 0 } else { if($LASTEXITCODE) { exit $LASTEXITCODE } else { exit 1 } }"
+        execute_with_rescue(executor.method("run_powershell_script"), command, &block)
       end
 
       def cmd(command, &block)
-        execute_shell(command, :cmd, &block)
+        execute_with_rescue(executor.method("run_cmd"), command, &block)
       end
 
       def wql(query, &block)
-        execute_shell(query, :wql, &block)
+        retryable(tries: @config.max_tries, on: @@exceptions_to_retry_on, sleep: @config.retry_delay) do
+          handle_output(session.method("run_wql"), query, &block)
+        end
+      rescue => e
+        raise_winrm_exception(e, "run_wql", query)
       end
 
       def upload(from, to)
@@ -82,42 +83,35 @@ module VagrantPlugins
 
       protected
 
-      def execute_shell(command, shell=:powershell, &block)
-        raise Errors::WinRMInvalidShell, shell: shell unless [:powershell, :cmd, :wql].include?(shell)
-
-        begin
-          execute_shell_with_retry(command, shell, &block)
-        rescue => e
-          raise_winrm_exception(e, shell, command)
-        end
+      def execute_with_rescue(method, command, &block)
+        handle_output(method, command, &block)
+      rescue => e
+        raise_winrm_exception(e, method.name, command)
       end
 
-      def execute_shell_with_retry(command, shell, &block)
-        retryable(tries: @config.max_tries, on: @@exceptions_to_retry_on, sleep: @config.retry_delay) do
-          @logger.debug("#{shell} executing:\n#{command}")
-          output = session.send(shell, command) do |out, err|
-            block.call(:stdout, out) if block_given? && out
-            block.call(:stderr, err) if block_given? && err
-          end
+      def handle_output(execute_method, command, &block)
+        output = execute_method.call(command) do |out, err|
+          block.call(:stdout, out) if block_given? && out
+          block.call(:stderr, err) if block_given? && err
+        end
 
-          @logger.debug("Output: #{output.inspect}")
-
-          # Verify that we didn't get a parser error, and if so we should
-          # set the exit code to 1. Parse errors return exit code 0 so we
-          # need to do this.
-          if output[:exitcode] == 0
-            (output[:data] || []).each do |data|
-              next if !data[:stderr]
-              if data[:stderr].include?("ParserError")
-                @logger.warn("Detected ParserError, setting exit code to 1")
-                output[:exitcode] = 1
-                break
-              end
+        @logger.debug("Output: #{output.inspect}")
+
+        # Verify that we didn't get a parser error, and if so we should
+        # set the exit code to 1. Parse errors return exit code 0 so we
+        # need to do this.
+        if output[:exitcode] == 0
+          (output[:data] || []).each do |data|
+            next if !data[:stderr]
+            if data[:stderr].include?("ParserError")
+              @logger.warn("Detected ParserError, setting exit code to 1")
+              output[:exitcode] = 1
+              break
             end
           end
-
-          return output
         end
+
+        return output
       end
 
       def raise_winrm_exception(exception, shell = nil, command = nil)
@@ -170,7 +164,7 @@ module VagrantPlugins
 
         client = ::WinRM::WinRMWebService.new(endpoint, @config.transport.to_sym, endpoint_options)
         client.set_timeout(@config.timeout)
-        client.toggle_nori_type_casting(:off) #we don't want coersion of types
+        client.logger = @logger
         client
       end
 
@@ -178,11 +172,15 @@ module VagrantPlugins
         @session ||= new_session
       end
 
+      def executor
+        @executor ||= session.create_executor
+      end
+
       def endpoint
         case @config.transport.to_sym
         when :ssl
           "https://#{@host}:#{@port}/wsman"
-        when :plaintext
+        when :plaintext, :negotiate
           "http://#{@host}:#{@port}/wsman"
         else
           raise Errors::WinRMInvalidTransport, transport: @config.transport
@@ -194,8 +192,10 @@ module VagrantPlugins
           pass: @password,
           host: @host,
           port: @port,
-          basic_auth_only: true,
-          no_ssl_peer_verification: !@config.ssl_peer_verification }
+          basic_auth_only: @config.basic_auth_only,
+          no_ssl_peer_verification: !@config.ssl_peer_verification,
+          retry_delay: @config.retry_delay,
+          retry_limit: @config.max_tries }
       end
     end #WinShell class
   end

data/plugins/guests/amazon/cap/flavor.rb

@@ -0,0 +1,14 @@
+module VagrantPlugins
+  module GuestAmazon
+    module Cap
+      class Flavor
+        def self.flavor(machine)
+          # Amazon AMI is a frankenstien RHEL, mainly based on 6
+          # Maybe in the future if they incoporate RHEL 7 elements
+          # this should be extended to read /etc/os-release or similar
+          return :rhel
+        end
+      end
+    end
+  end
+end

data/plugins/guests/amazon/guest.rb

@@ -0,0 +1,9 @@
+module VagrantPlugins
+  module GuestAmazon
+    class Guest < Vagrant.plugin("2", :guest)
+      def detect?(machine)
+        machine.communicate.test("grep 'Amazon Linux AMI' /etc/os-release")
+      end
+    end
+  end
+end

data/plugins/guests/amazon/plugin.rb

@@ -0,0 +1,20 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestAmazon
+    class Plugin < Vagrant.plugin("2")
+      name "Amazon Linux guest"
+      description "Amazon linux guest support."
+
+      guest(:amazon, :redhat) do
+        require_relative "guest"
+        Guest
+      end
+
+      guest_capability(:amazon, :flavor) do
+        require_relative "cap/flavor"
+        Cap::Flavor
+      end
+    end
+  end
+end

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

@@ -3,12 +3,21 @@ module VagrantPlugins
     module Cap
       class ChangeHostName
         def self.change_host_name(machine, name)
-          machine.communicate.tap do |comm|
-            # Only do this if the hostname is not already set
-            if !comm.test("sudo hostname | grep '#{name}'")
-              comm.sudo("hostnamectl set-hostname #{name}")
-              comm.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} @' /etc/hosts")
-            end
+          comm = machine.communicate
+
+          if !comm.test("hostname | grep -w '#{name}'")
+            basename = name.split(".", 2)[0]
+            comm.sudo <<-EOH
+hostnamectl set-hostname '#{name}'
+
+# Remove comments and blank lines from /etc/hosts
+sed -i'' -e 's/#.*$//' -e '/^$/d' /etc/hosts
+
+# Prepend ourselves to /etc/hosts
+grep -w '#{name}' /etc/hosts || {
+  sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
+}
+EOH
           end
         end
       end

data/plugins/guests/arch/cap/configure_networks.rb

@@ -1,7 +1,6 @@
-# -*- coding: utf-8 -*-
 require "tempfile"
 
-require "vagrant/util/template_renderer"
+require_relative "../../../../lib/vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestArch
@@ -10,25 +9,45 @@ module VagrantPlugins
         include Vagrant::Util
 
         def self.configure_networks(machine, networks)
-          interfaces = Array.new
-          machine.communicate.sudo("ip -o -0 addr | grep -v LOOPBACK | awk '{print $2}' | sed 's/://'") do |_, result|
-            interfaces = result.split("\n")
+          comm = machine.communicate
+
+          commands   = []
+          interfaces = []
+
+          # The result will be something like:
+          #   eth0\nenp0s8\nenp0s9
+          comm.sudo("ip -o -0 addr | grep -v LOOPBACK | awk '{print $2}' | sed 's/://'") do |_, stdout|
+            interfaces = stdout.split("\n")
           end
 
-          networks.each do |network|
+          networks.each.with_index do |network, i|
             network[:device] = interfaces[network[:interface]]
 
-            entry = TemplateRenderer.render("guests/arch/network_#{network[:type]}", options: network)
+            entry = TemplateRenderer.render("guests/arch/network_#{network[:type]}",
+              options: network,
+            )
 
-            temp = Tempfile.new("vagrant")
-            temp.binmode
-            temp.write(entry)
-            temp.close
+            remote_path = "/tmp/vagrant-network-#{network[:device]}-#{Time.now.to_i}-#{i}"
 
-            machine.communicate.upload(temp.path, "/tmp/vagrant_network")
-            machine.communicate.sudo("mv /tmp/vagrant_network /etc/netctl/#{network[:device]}")
-            machine.communicate.sudo("ip link set #{network[:device]} down && netctl start #{network[:device]} && netctl enable #{network[:device]}")
+            Tempfile.open("vagrant-arch-configure-networks") do |f|
+              f.binmode
+              f.write(entry)
+              f.fsync
+              f.close
+              comm.upload(f.path, remote_path)
+            end
+
+            commands << <<-EOH.gsub(/^ {14}/, '')
+              # Configure #{network[:device]}
+              mv '#{remote_path}' '/etc/netctl/#{network[:device]}'
+              ip link set '#{network[:device]}' down
+              netctl restart '#{network[:device]}'
+              netctl enable '#{network[:device]}'
+            EOH
           end
+
+          # Run all the network modification commands in one communicator call.
+          comm.sudo(commands.join("\n"))
         end
       end
     end

data/plugins/guests/arch/plugin.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
       description "Arch guest support."
 
       guest("arch", "linux") do
-        require File.expand_path("../guest", __FILE__)
+        require_relative "guest"
         Guest
       end
 

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

@@ -3,7 +3,22 @@ module VagrantPlugins
     module Cap
       class ChangeHostName
         def self.change_host_name(machine, name)
-          machine.communicate.sudo("hostnamectl set-hostname #{name}")
+          comm = machine.communicate
+
+          if !comm.test("hostname | grep -w '#{name}'")
+            basename = name.split(".", 2)[0]
+            comm.sudo <<-EOH
+hostnamectl set-hostname '#{name}'
+
+# Remove comments and blank lines from /etc/hosts
+sed -i'' -e 's/#.*$//' -e '/^$/d' /etc/hosts
+
+# Prepend ourselves to /etc/hosts
+grep -w '#{name}' /etc/hosts || {
+  sed -i'' '1i 127.0.0.1\\t#{name}\\t#{basename}' /etc/hosts
+}
+EOH
+          end
         end
       end
     end

data/plugins/guests/atomic/plugin.rb

@@ -1,4 +1,4 @@
-require 'vagrant'
+require "vagrant"
 
 module VagrantPlugins
   module GuestAtomic
@@ -7,7 +7,7 @@ module VagrantPlugins
       description "Atomic Host guest support."
 
       guest("atomic", "fedora") do
-        require File.expand_path("../guest", __FILE__)
+        require_relative "guest"
         Guest
       end
 

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

@@ -3,10 +3,16 @@ module VagrantPlugins
     module Cap
       class ChangeHostName
         def self.change_host_name(machine, name)
-          machine.communicate.tap do |comm|
-            if !comm.test("sudo hostname --fqdn | grep '#{name}'")
-              comm.sudo("hostname #{name.split('.')[0]}")
-            end
+          comm = machine.communicate
+
+          if !comm.test("hostname --fqdn | grep -w '#{name}'")
+            basename = name.split(".", 2)[0]
+            comm.sudo("hostname '#{basename}'")
+
+            # Note that when working with CoreOS, we explicitly do not add the
+            # entry to /etc/hosts because this file does not exist on CoreOS.
+            # We could create it, but the recommended approach on CoreOS is to
+            # use Fleet to manage /etc/hosts files.
           end
         end
       end

data/plugins/guests/coreos/cap/configure_networks.rb

@@ -1,6 +1,6 @@
 require "tempfile"
 
-require "vagrant/util/template_renderer"
+require_relative "../../../../lib/vagrant/util/template_renderer"
 
 module VagrantPlugins
   module GuestCoreOS
@@ -10,64 +10,76 @@ module VagrantPlugins
 
         def self.configure_networks(machine, networks)
           machine.communicate.tap do |comm|
-            # Disable default etcd
-            comm.sudo("systemctl stop etcd")
-
             # Read network interface names
             interfaces = []
-            comm.sudo("ifconfig | grep 'enp0\\|ens' | cut -f1 -d:") do |_, result|
+            comm.sudo("ifconfig | grep '(e[n,t][h,s,p][[:digit:]]([a-z][[:digit:]])?' | cut -f1 -d:") do |_, result|
               interfaces = result.split("\n")
             end
 
-            # Configure interfaces
-            # FIXME: fix matching of interfaces with IP adresses
-            networks.each do |network|
-              comm.sudo("ifconfig #{interfaces[network[:interface].to_i]} #{network[:ip]} netmask #{network[:netmask]}")
-            end
-
             primary_machine_config = machine.env.active_machines.first
             primary_machine = machine.env.machine(*primary_machine_config, true)
 
-            get_ip = lambda do |machine|
-              ip = nil
-              machine.config.vm.networks.each do |type, opts|
-                if type == :private_network && opts[:ip]
-                  ip = opts[:ip]
-                  break
-                end
-              end
-
-              ip
-            end
-
-            primary_machine_ip = get_ip.(primary_machine)
-            current_ip = get_ip.(machine)
+            primary_machine_ip = get_ip(primary_machine)
+            current_ip = get_ip(machine)
             if current_ip == primary_machine_ip
               entry = TemplateRenderer.render("guests/coreos/etcd.service", options: {
-                  my_ip: current_ip
-                })
+                my_ip: current_ip,
+              })
             else
               connection_string = "#{primary_machine_ip}:7001"
               entry = TemplateRenderer.render("guests/coreos/etcd.service", options: {
                 connection_string: connection_string,
-                my_ip: current_ip
+                my_ip: current_ip,
               })
             end
 
-            Tempfile.open("vagrant") do |temp|
-              temp.binmode
-              temp.write(entry)
-              temp.close
-              comm.upload(temp.path, "/tmp/etcd-cluster.service")
+            Tempfile.open("vagrant-coreos-configure-networks") do |f|
+              f.binmode
+              f.write(entry)
+              f.fsync
+              f.close
+              comm.upload(f.path, "/tmp/etcd-cluster.service")
+            end
+
+            # Build a list of commands
+            commands = []
+
+            # Stop default systemd
+            commands << "systemctl stop etcd"
+
+            # Configure interfaces
+            # FIXME: fix matching of interfaces with IP adresses
+            networks.each do |network|
+              iface = interfaces[network[:interface].to_i]
+              commands << "ifconfig #{iface} #{network[:ip]} netmask #{network[:netmask]}".squeeze(" ")
             end
 
-            comm.sudo("mv /tmp/etcd-cluster.service /media/state/units/")
-            comm.sudo("systemctl restart local-enable.service")
+            commands << <<-EOH.gsub(/^ {14}/, '')
+              mv /tmp/etcd-cluster.service /media/state/units/
+              systemctl restart local-enable.service
+
+              # Restart default etcd
+              systemctl start etcd
+            EOH
 
-            # Restart default etcd
-            comm.sudo("systemctl start etcd")
+            # Run all network configuration commands in one communicator session.
+            comm.sudo(commands.join("\n"))
           end
         end
+
+        private
+
+        def self.get_ip(machine)
+          ip = nil
+          machine.config.vm.networks.each do |type, opts|
+            if type == :private_network && opts[:ip]
+              ip = opts[:ip]
+              break
+            end
+          end
+
+          ip
+        end
       end
     end
   end