tnargav 1.2.3 → 1.3.3

data/plugins/commands/plugin/command/update.rb

@@ -0,0 +1,41 @@
+require 'optparse'
+
+require_relative "base"
+require_relative "mixin_install_opts"
+
+module VagrantPlugins
+  module CommandPlugin
+    module Command
+      class Update < Base
+        include MixinInstallOpts
+
+        def execute
+          options = {}
+
+          opts = OptionParser.new do |o|
+            o.banner = "Usage: vagrant plugin update <name> [-h]"
+            o.separator ""
+            build_install_opts(o, options)
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+          raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length < 1
+
+          # Update the gem
+          action(Action.action_update, {
+            :plugin_entry_point => options[:entry_point],
+            :plugin_prerelease  => options[:plugin_prerelease],
+            :plugin_version     => options[:plugin_version],
+            :plugin_sources     => options[:plugin_sources],
+            :plugin_name        => argv[0]
+          })
+
+          # Success, exit status 0
+          0
+        end
+      end
+    end
+  end
+end

data/plugins/commands/reload/command.rb

@@ -13,6 +13,7 @@ module VagrantPlugins
 
       def execute
         options = {}
+        options[:provision_ignore_sentinel] = false
 
         opts = OptionParser.new do |o|
           o.banner = "Usage: vagrant reload [vm-name]"
@@ -24,6 +25,9 @@ module VagrantPlugins
         argv = parse_options(opts)
         return if !argv
 
+        # Validate the provisioners
+        validate_provisioner_flags!(options)
+
         @logger.debug("'reload' each target VM...")
         with_target_vms(argv) do |machine|
           machine.action(:reload, options)

data/plugins/commands/status/command.rb

@@ -12,11 +12,16 @@ module VagrantPlugins
         argv = parse_options(opts)
         return if !argv
 
+        max_name_length = 25
+        with_target_vms(argv) do |machine|
+          max_name_length = machine.name.length if machine.name.length > max_name_length
+        end
+
         state = nil
         results = []
         with_target_vms(argv) do |machine|
           state = machine.state if !state
-          results << "#{machine.name.to_s.ljust(25)} #{machine.state.short_description} (#{machine.provider_name})"
+          results << "#{machine.name.to_s.ljust(max_name_length)} #{machine.state.short_description} (#{machine.provider_name})"
         end
 
         message = nil

data/plugins/commands/up/command.rb

@@ -11,7 +11,9 @@ module VagrantPlugins
 
       def execute
         options = {}
+        options[:destroy_on_error] = true
         options[:parallel] = true
+        options[:provision_ignore_sentinel] = false
 
         opts = OptionParser.new do |o|
           o.banner = "Usage: vagrant up [vm-name] [options] [-h]"
@@ -19,6 +21,11 @@ module VagrantPlugins
 
           build_start_options(o, options)
 
+          o.on("--[no-]destroy-on-error",
+               "Destroy machine if any fatal error happens (default to true).") do |destroy|
+            options[:destroy_on_error] = destroy
+          end
+
           o.on("--[no-]parallel",
                "Enable or disable parallelism if provider supports it.") do |parallel|
             options[:parallel] = parallel
@@ -34,6 +41,9 @@ module VagrantPlugins
         argv = parse_options(opts)
         return if !argv
 
+        # Validate the provisioners
+        validate_provisioner_flags!(options)
+
         # Go over each VM and bring it up
         @logger.debug("'Up' each target VM...")
 

data/plugins/commands/up/start_mixins.rb

@@ -8,7 +8,6 @@ module VagrantPlugins
       # @param [Hash] options
       def build_start_options(parser, options)
         # Setup the defaults
-        options[:provision_enabled] = true
         options[:provision_types] = nil
 
         # Add the options
@@ -21,6 +20,18 @@ module VagrantPlugins
           options[:provision_types] = list.map { |type| type.to_sym }
         end
       end
+
+      # This validates the provisioner flags and raises an exception
+      # if there are invalid ones.
+      def validate_provisioner_flags!(options)
+        (options[:provision_types] || []).each do |type|
+            klass = Vagrant.plugin("2").manager.provisioners[type]
+            if !klass
+              raise Vagrant::Errors::ProvisionerFlagInvalid,
+                name: type.to_s
+            end
+        end
+      end
     end
   end
 end

data/plugins/communicators/ssh/communicator.rb

@@ -5,6 +5,7 @@ require 'timeout'
 
 require 'log4r'
 require 'net/ssh'
+require 'net/ssh/proxy/command'
 require 'net/scp'
 
 require 'vagrant/util/ansi_escape_code_remover'
@@ -57,8 +58,18 @@ module VagrantPlugins
         }.merge(opts || {})
 
         # Connect via SSH and execute the command in the shell.
+        stdout = ""
+        stderr = ""
         exit_status = connect do |connection|
-          shell_execute(connection, command, opts[:sudo], &block)
+          shell_execute(connection, command, opts[:sudo]) do |type, data|
+            if type == :stdout
+              stdout += data
+            elsif type == :stderr
+              stderr += data
+            end
+
+            block.call(type, data) if block
+          end
         end
 
         # Check for any errors
@@ -66,7 +77,11 @@ module VagrantPlugins
           # The error classes expect the translation key to be _key,
           # but that makes for an ugly configuration parameter, so we
           # set it here from `error_key`
-          error_opts = opts.merge(:_key => opts[:error_key])
+          error_opts = opts.merge(
+            :_key => opts[:error_key],
+            :stdout => stdout,
+            :stderr => stderr
+          )
           raise opts[:error_class], error_opts
         end
 
@@ -172,15 +187,16 @@ module VagrantPlugins
             Errno::EADDRINUSE,
             Errno::ECONNREFUSED,
             Errno::ECONNRESET,
+            Errno::ENETUNREACH,
             Errno::EHOSTUNREACH,
             Net::SSH::Disconnect,
             Timeout::Error
           ]
 
-          retries = @machine.config.ssh.max_tries
-          timeout = @machine.config.ssh.timeout
+          retries = 5
+          timeout = 60
 
-          @logger.info("Attempting SSH. Retries: #{retries}. Timeout: #{timeout}")
+          @logger.info("Attempting SSH connnection...")
           connection = retryable(:tries => retries, :on => exceptions) do
             Timeout.timeout(timeout) do
               begin
@@ -191,9 +207,14 @@ module VagrantPlugins
                 # Setup logging for connections
                 connect_opts = opts.merge({
                   :logger  => ssh_logger,
+                  :timeout => 15,
                   :verbose => :debug
                 })
 
+                if ssh_info[:proxy_command]
+                  connect_opts[:proxy] = Net::SSH::Proxy::Command.new(ssh_info[:proxy_command])
+                end
+
                 @logger.info("Attempting to connect to SSH...")
                 @logger.info("  - Host: #{ssh_info[:host]}")
                 @logger.info("  - Port: #{ssh_info[:port]}")
@@ -282,11 +303,40 @@ module VagrantPlugins
             ch2.on_request("exit-status") do |ch3, data|
               exit_status = data.read_long
               @logger.debug("Exit status: #{exit_status}")
+
+              # Close the channel, since after the exit status we're
+              # probably done. This fixes up issues with hanging.
+              channel.close
             end
 
             # Set the terminal
             ch2.send_data "export TERM=vt100\n"
 
+            # Set SSH_AUTH_SOCK if we are in sudo and forwarding agent.
+            # This is to work around often misconfigured boxes where
+            # the SSH_AUTH_SOCK env var is not preserved.
+            if @machine.ssh_info[:forward_agent] && sudo
+              auth_socket = ""
+              execute("echo; printf $SSH_AUTH_SOCK") do |type, data|
+                if type == :stdout
+                  auth_socket += data
+                end
+              end
+
+              if auth_socket != ""
+                # Make sure we only read the last line which should be
+                # the $SSH_AUTH_SOCK env var we printed.
+                auth_socket = auth_socket.split("\n").last.chomp
+              end
+
+              if auth_socket == ""
+                @logger.warn("No SSH_AUTH_SOCK found despite forward_agent being set.")
+              else
+                @logger.info("Setting SSH_AUTH_SOCK remotely: #{auth_socket}")
+                ch2.send_data "export SSH_AUTH_SOCK=#{auth_socket}\n"
+              end
+            end
+
             # Output the command
             ch2.send_data "#{command}\n"
 
@@ -315,7 +365,12 @@ module VagrantPlugins
           end
 
           # Wait for the channel to complete
-          channel.wait
+          begin
+            channel.wait
+          rescue IOError
+            @logger.info("SSH connection unexpected closed. Assuming reboot or something.")
+            exit_status = 0
+          end
         ensure
           # Kill the keep-alive thread
           keep_alive.kill if keep_alive

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

@@ -6,8 +6,7 @@ module VagrantPlugins
           machine.communicate.tap do |comm|
             # Only do this if the hostname is not already set
             if !comm.test("sudo hostname | grep '#{name}'")
-              comm.sudo("sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/rc.conf")
-              comm.sudo("hostname #{name}")
+              comm.sudo("hostnamectl set-hostname #{name}")
               comm.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} @' /etc/hosts")
             end
           end

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

@@ -1,7 +1,13 @@
+require "tempfile"
+
+require "vagrant/util/template_renderer"
+
 module VagrantPlugins
   module GuestArch
     module Cap
       class ConfigureNetworks
+        include Vagrant::Util
+
         def self.configure_networks(machine, networks)
           networks.each do |network|
             entry = TemplateRenderer.render("guests/arch/network_#{network[:type]}",

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

@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module GuestCoreOS
+    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
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,72 @@
+require "tempfile"
+
+require "vagrant/util/template_renderer"
+
+module VagrantPlugins
+  module GuestCoreOS
+    module Cap
+      class ConfigureNetworks
+        include Vagrant::Util
+
+        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 | 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)
+            if current_ip == primary_machine_ip
+              entry = TemplateRenderer.render("guests/coreos/etcd.service", :options => {
+                  :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
+              })
+            end
+
+            Tempfile.open("vagrant") do |temp|
+              temp.binmode
+              temp.write(entry)
+              temp.close
+              comm.upload(temp.path, "/tmp/etcd-cluster.service")
+            end
+
+            comm.sudo("mv /tmp/etcd-cluster.service /media/state/units/")
+            comm.sudo("systemctl restart local-enable.service")
+          end
+
+        end
+      end
+    end
+  end
+end

data/plugins/guests/coreos/guest.rb

@@ -0,0 +1,9 @@
+module VagrantPlugins
+  module GuestCoreOS
+    class Guest < Vagrant.plugin("2", :guest)
+      def detect?(machine)
+        machine.communicate.test("cat /etc/gentoo-release | grep CoreOS")
+      end
+    end
+  end
+end

data/plugins/guests/coreos/plugin.rb

@@ -0,0 +1,25 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestCoreOS
+    class Plugin < Vagrant.plugin("2")
+      name "CoreOS guest"
+      description "CoreOS guest support."
+
+      guest("coreos", "linux") do
+        require File.expand_path("../guest", __FILE__)
+        Guest
+      end
+
+      guest_capability("coreos", "change_host_name") do
+        require_relative "cap/change_host_name"
+        Cap::ChangeHostName
+      end
+
+      guest_capability("coreos", "configure_networks") do
+        require_relative "cap/configure_networks"
+        Cap::ConfigureNetworks
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module VagrantPlugins
+  module GuestDarwin
+    module Cap
+      class ChangeHostName
+        def self.change_host_name(machine, name)
+          if !machine.communicate.test("hostname -f | grep '^#{name}$' || hostname -s | grep '^#{name}$'")
+            machine.communicate.sudo("scutil --set HostName #{name}")
+            machine.communicate.sudo("hostname #{name}")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+require "tempfile"
+
+require "vagrant/util/template_renderer"
+
+module VagrantPlugins
+  module GuestDarwin
+    module Cap
+      class ConfigureNetworks
+        include Vagrant::Util
+
+        def self.configure_networks(machine, networks)
+          # Slightly different than other plugins, using the template to build commands 
+          # rather than templating the files.
+
+          machine.communicate.sudo("networksetup -detectnewhardware")
+          machine.communicate.sudo("networksetup -listnetworkserviceorder > /tmp/vagrant.interfaces")
+          tmpints = File.join(Dir.tmpdir, File.basename("#{machine.id}.interfaces"))
+          machine.communicate.download("/tmp/vagrant.interfaces",tmpints)
+
+          devlist = []
+          ints = IO.read(tmpints)
+          ints.split(/\n\n/m).each do |i|
+            if i.match(/Hardware/) and not i.match(/Ethernet/).nil?
+              devmap = {}
+              # Ethernet, should be 2 lines, 
+              # (3) Thunderbolt Ethernet
+              # (Hardware Port: Thunderbolt Ethernet, Device: en1)
+
+              # multiline, should match "Thunderbolt Ethernet", "en1"
+              devicearry = i.match(/\([0-9]+\) (.+)\n.*Device: (.+)\)/m)
+              devmap[:interface] = devicearry[2]
+              devmap[:service] = devicearry[1]
+              devlist << devmap
+            end
+          end
+          File.delete(tmpints)
+
+          networks.each do |network|
+            service_name = devlist[network[:interface]][:service]
+            if network[:type].to_sym == :static
+              command = "networksetup -setmanual \"#{service_name}\" #{network[:ip]} #{network[:netmask]}"
+            elsif network[:type].to_sym == :dhcp
+              command = "networksetup -setdhcp \"#{service_name}\""
+            end
+
+            machine.communicate.sudo(command)
+          end
+        end
+      end
+    end
+  end
+end