vagrant-unbundled 2.2.4.0 → 2.2.5.0

data/plugins/commands/cloud/box/create.rb

@@ -19,7 +19,7 @@ module VagrantPlugins
               o.on("-d", "--description DESCRIPTION", String, "Full description of the box") do |d|
                 options[:description] = d
               end
-              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |t|
+              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |u|
                 options[:username] = u
               end
               o.on("-s", "--short-description DESCRIPTION", String, "Short description of the box") do |s|

data/plugins/commands/cloud/box/delete.rb

@@ -16,7 +16,7 @@ module VagrantPlugins
               o.separator "Options:"
               o.separator ""
 
-              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |t|
+              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |u|
                 options[:username] = u
               end
             end

data/plugins/commands/cloud/provider/create.rb

@@ -16,7 +16,7 @@ module VagrantPlugins
               o.separator "Options:"
               o.separator ""
 
-              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |t|
+              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |u|
                 options[:username] = u
               end
             end

data/plugins/commands/cloud/provider/delete.rb

@@ -16,7 +16,7 @@ module VagrantPlugins
               o.separator "Options:"
               o.separator ""
 
-              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |t|
+              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |u|
                 options[:username] = u
               end
             end

data/plugins/commands/cloud/provider/update.rb

@@ -16,7 +16,7 @@ module VagrantPlugins
               o.separator "Options:"
               o.separator ""
 
-              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |t|
+              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |u|
                 options[:username] = u
               end
             end

data/plugins/commands/cloud/provider/upload.rb

@@ -17,7 +17,7 @@ module VagrantPlugins
               o.separator "Options:"
               o.separator ""
 
-              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |t|
+              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |u|
                 options[:username] = u
               end
             end

data/plugins/commands/cloud/publish.rb

@@ -40,7 +40,7 @@ module VagrantPlugins
             o.on("-s", "--short-description DESCRIPTION", String, "Short description of the box") do |s|
               options[:short_description] = s
             end
-            o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |t|
+            o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |u|
               options[:username] = u
             end
           end

data/plugins/commands/cloud/search.rb

@@ -37,7 +37,7 @@ module VagrantPlugins
             o.on("--sort-by SORT", "Field to sort results on (created, downloads, updated) Default: downloads") do |s|
               options[:sort] = s
             end
-            o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |t|
+            o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address to login with") do |u|
               options[:username] = u
             end
           end

data/plugins/commands/cloud/version/create.rb

@@ -19,7 +19,7 @@ module VagrantPlugins
               o.on("-d", "--description DESCRIPTION", String, "A description for this version") do |d|
                 options[:description] = d
               end
-              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |t|
+              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |u|
                 options[:username] = u
               end
             end

data/plugins/commands/cloud/version/delete.rb

@@ -15,7 +15,7 @@ module VagrantPlugins
               o.separator ""
               o.separator "Options:"
               o.separator ""
-              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |t|
+              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |u|
                 options[:username] = u
               end
             end

data/plugins/commands/cloud/version/release.rb

@@ -15,7 +15,7 @@ module VagrantPlugins
               o.separator ""
               o.separator "Options:"
               o.separator ""
-              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |t|
+              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |u|
                 options[:username] = u
               end
             end

data/plugins/commands/cloud/version/revoke.rb

@@ -15,7 +15,7 @@ module VagrantPlugins
               o.separator ""
               o.separator "Options:"
               o.separator ""
-              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |t|
+              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |u|
                 options[:username] = u
               end
             end

data/plugins/commands/cloud/version/update.rb

@@ -19,7 +19,7 @@ module VagrantPlugins
               o.on("-d", "--description DESCRIPTION", "A description for this version") do |d|
                 options[:description] = d
               end
-              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |t|
+              o.on("-u", "--username USERNAME_OR_EMAIL", String, "Vagrant Cloud username or email address") do |u|
                 options[:username] = u
               end
             end

data/plugins/commands/global-status/command.rb

@@ -65,6 +65,17 @@ module VagrantPlugins
           @env.machine_index.delete(deletable) if deletable
         end
 
+        # Machine-readable (non-formatted) output
+        @env.ui.machine("metadata", "machine-count", entries.length.to_s);
+        entries.each do |entry|
+          opts = { "target" => entry.name.to_s }
+          @env.ui.machine("machine-id", entry.id.to_s[0...7], opts)
+          @env.ui.machine("provider-name", entry.provider.to_s, opts)
+          @env.ui.machine("machine-home", entry.vagrantfile_path.to_s, opts)
+          @env.ui.machine("state", entry.state.to_s, opts)
+        end
+
+        # Human-readable (table formatted) output
         total_width = 0
         columns.each do |header, method|
           header = header.ljust(widths[method]) if widths[method]

data/plugins/commands/snapshot/command/list.rb

@@ -32,8 +32,9 @@ module VagrantPlugins
               next
             end
 
+            vm.ui.output("", prefix: true)
             snapshots.each do |snapshot|
-              vm.ui.output(snapshot, prefix: false)
+              vm.ui.detail(snapshot, prefix: false)
             end
           end
 

data/plugins/commands/snapshot/command/pop.rb

@@ -23,8 +23,10 @@ module VagrantPlugins
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant snapshot pop [options] [vm-name]"
             o.separator ""
+            o.separator "Restore state that was pushed onto the snapshot stack"
+            o.separator "with `vagrant snapshot push`."
+            o.separator ""
             build_start_options(o, options)
-            o.separator "Restore state that was pushed with `vagrant snapshot push`."
 
             o.on("--no-delete", "Don't delete the snapshot after the restore") do
                 options[:snapshot_delete] = false

data/plugins/communicators/ssh/communicator.rb

@@ -9,7 +9,6 @@ require 'log4r'
 require 'net/ssh'
 require 'net/ssh/proxy/command'
 require 'net/scp'
-require 'net/sftp'
 
 require 'vagrant/util/ansi_escape_code_remover'
 require 'vagrant/util/file_mode'

data/plugins/guests/bsd/cap/{virtualbox.rb → mount_virtualbox_shared_folder.rb}

@@ -1,7 +1,7 @@
 module VagrantPlugins
   module GuestBSD
     module Cap
-      class VirtualBox
+      class MountVirtualBoxSharedFolder
         # BSD-based guests do not currently support VirtualBox synced folders.
         # Instead of raising an error about a missing capability, this defines
         # the capability and then provides a more detailed error message,

data/plugins/guests/bsd/plugin.rb

@@ -42,8 +42,8 @@ module VagrantPlugins
       end
 
       guest_capability(:bsd, :mount_virtualbox_shared_folder) do
-        require_relative "cap/virtualbox"
-        Cap::VirtualBox
+        require_relative "cap/mount_virtualbox_shared_folder"
+        Cap::MountVirtualBoxSharedFolder
       end
 
       guest_capability(:bsd, :remove_public_key) do

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

@@ -1,18 +1,35 @@
+require "tempfile"
+require "yaml"
+
 module VagrantPlugins
   module GuestCoreOS
     module Cap
       class ChangeHostName
+        extend Vagrant::Util::GuestInspection::Linux
+
         def self.change_host_name(machine, name)
           comm = machine.communicate
 
-          if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
-            basename = name.split(".", 2)[0]
-            comm.sudo("hostname '#{basename}'")
+          if systemd_unit_file?(comm, "system-cloudinit*")
+            file = Tempfile.new("vagrant-coreos-hostname")
+            file.puts("#cloud-config\n")
+            file.puts({"hostname" => name}.to_yaml)
+            file.close
+
+            dst = "/var/tmp/hostname.yml"
+            svc_path = dst.tr("/", "-")[1..-1]
+            comm.upload(file.path, dst)
+            comm.sudo("systemctl start system-cloudinit@#{svc_path}.service")
+          else
+            if !comm.test("hostname -f | grep '^#{name}$'", sudo: false)
+              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.
+              # 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
       end

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

@@ -6,79 +6,63 @@ module VagrantPlugins
   module GuestCoreOS
     module Cap
       class ConfigureNetworks
-        include Vagrant::Util
+        extend Vagrant::Util::GuestInspection::Linux
 
-        def self.configure_networks(machine, networks)
-          machine.communicate.tap do |comm|
-            # Read network interface names
-            interfaces = []
-            comm.sudo("ifconfig | grep -E '(e[n,t][h,s,p][[:digit:]]([a-z][[:digit:]])?)' | cut -f1 -d:") do |_, result|
-              interfaces = result.split("\n")
-            end
-
-            primary_machine_config = machine.env.active_machines.first
-            primary_machine = machine.env.machine(*primary_machine_config, true)
+        DEFAULT_ENVIRONMENT_IP = "127.0.0.1".freeze
 
-            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-coreos-configure-networks") do |f|
-              f.binmode
-              f.write(entry)
-              f.fsync
-              f.close
-              comm.upload(f.path, "/tmp/etcd-cluster.service")
+        def self.configure_networks(machine, networks)
+          cloud_config = {}
+          # Locate configured IP addresses to drop in /etc/environment
+          # for export. If no addresses found, fall back to default
+          public_ip = catch(:public_ip) do
+            machine.config.vm.networks.each do |type, opts|
+              next if type != :public_network
+              throw(:public_ip, opts[:ip]) if opts[:ip]
             end
-
-            # Build a list of commands
-            commands = []
-
-            # Stop default systemd
-            commands << "systemctl stop etcd"
-
-            # Configure interfaces
-            # FIXME: fix matching of interfaces with IP addresses
-            networks.each do |network|
-              iface = interfaces[network[:interface].to_i]
-              commands << "ifconfig #{iface} #{network[:ip]} netmask #{network[:netmask]}".squeeze(" ")
+            DEFAULT_ENVIRONMENT_IP
+          end
+          private_ip = catch(:private_ip) do
+            machine.config.vm.networks.each do |type, opts|
+              next if type != :private_network
+              throw(:private_ip, opts[:ip]) if opts[:ip]
             end
-
-            commands << <<-EOH.gsub(/^ {14}/, '')
-              mv /tmp/etcd-cluster.service /media/state/units/
-              systemctl restart local-enable.service
-
-              # Restart default etcd
-              systemctl start etcd
-            EOH
-
-            # Run all network configuration commands in one communicator session.
-            comm.sudo(commands.join("\n"))
+            public_ip
           end
-        end
-
-        private
+          cloud_config["write_files"] = [
+            {"path" => "/etc/environment",
+              "content" => "COREOS_PUBLIC_IPV4=#{public_ip}\nCOREOS_PRIVATE_IPV4=#{private_ip}"}
+          ]
 
-        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
+          # Generate configuration for any static network interfaces
+          # which have been defined
+          interfaces = machine.guest.capability(:network_interfaces)
+          units = networks.map do |network|
+            iface = network[:interface].to_i
+            unit_name = "50-vagrant#{iface}.network"
+            device = interfaces[iface]
+            if network[:type].to_s == "dhcp"
+              network_content = "DHCP=yes"
+            else
+              prefix = IPAddr.new("255.255.255.255/#{network[:netmask]}").to_i.to_s(2).count("1")
+              address = "#{network[:ip]}/#{prefix}"
+              network_content = "Address=#{address}"
             end
+            {"name" => unit_name,
+              "runtime" => "no",
+              "content" => "[Match]\nName=#{device}\n[Network]\n#{network_content}"}
           end
+          cloud_config["coreos"] = {"units" => units.compact}
+
+          # Upload configuration and apply
+          file = Tempfile.new("vagrant-coreos-networks")
+          file.puts("#cloud-config\n")
+          file.puts(cloud_config.to_yaml)
+          file.close
 
-          ip
+          dst = "/var/tmp/networks.yml"
+          svc_path = dst.tr("/", "-")[1..-1]
+          machine.communicate.upload(file.path, dst)
+          machine.communicate.sudo("systemctl start system-cloudinit@#{svc_path}.service")
         end
       end
     end

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

@@ -18,8 +18,8 @@ module VagrantPlugins
           # Remove any previous network additions to the configuration file.
           commands << "sed -i '' -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/rc.conf"
 
-          comm.sudo("ifconfig -a | grep -o '^[0-9a-z]*' | grep -v '^lo'", options) do |_, stdout|
-            interfaces = stdout.split("\n")
+          comm.sudo("ifconfig -l ether", options) do |_, stdout|
+            interfaces = stdout.split
           end
 
           networks.each.with_index do |network, i|

data/plugins/guests/freebsd/cap/mount_virtualbox_shared_folder.rb

@@ -0,0 +1,76 @@
+require_relative "../../../synced_folders/unix_mount_helpers"
+
+module VagrantPlugins
+  module GuestFreeBSD
+    module Cap
+      class MountVirtualBoxSharedFolder
+        extend SyncedFolder::UnixMountHelpers
+
+        def self.mount_virtualbox_shared_folder(machine, name, guestpath, options)
+          guest_path = Shellwords.escape(guestpath)
+
+          @@logger.debug("Mounting #{name} (#{options[:hostpath]} to #{guestpath})")
+
+          builtin_mount_type = "-cit vboxvfs"
+          addon_mount_type = "-t vboxvfs"
+
+          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]
+
+          mount_options << "uid=#{mount_uid}"
+          mount_options << "gid=#{mount_gid}"
+          mount_options = mount_options.join(',')
+          mount_command = "mount #{addon_mount_type} -o #{mount_options} #{name} #{guest_path}"
+
+          # Create the guest path if it doesn't exist
+          machine.communicate.sudo("mkdir -p #{guest_path}")
+
+          stderr = ""
+          result = machine.communicate.sudo(mount_command, error_check: false) do |type, data|
+            stderr << data if type == :stderr
+          end
+
+          if result != 0
+            if stderr.include?("-cit")
+              @@logger.info("Detected builtin vboxvfs module, modifying mount command")
+              mount_command.sub!(addon_mount_type, builtin_mount_type)
+            end
+
+            # Attempt to mount the folder. We retry here a few times because
+            # it can fail early on.
+            stderr = ""
+            retryable(on: Vagrant::Errors::VirtualBoxMountFailed, tries: 3, sleep: 5) do
+              machine.communicate.sudo(mount_command,
+                error_class: Vagrant::Errors::VirtualBoxMountFailed,
+                error_key: :virtualbox_mount_failed,
+                command: mount_command,
+                output: stderr,
+              ) { |type, data| stderr = data if type == :stderr }
+            end
+          end
+
+          # Chown the directory to the proper user. We skip this if the
+          # mount options contained a readonly flag, because it won't work.
+          if !options[:mount_options] || !options[:mount_options].include?("ro")
+            chown_command = "chown #{mount_uid}:#{mount_gid} #{guest_path}"
+            machine.communicate.sudo(chown_command)
+          end
+
+          emit_upstart_notification(machine, guest_path)
+        end
+
+
+        def self.unmount_virtualbox_shared_folder(machine, guestpath, options)
+          guest_path = Shellwords.escape(guestpath)
+
+          result = machine.communicate.sudo("umount #{guest_path}", error_check: false)
+          if result == 0
+            machine.communicate.sudo("rmdir #{guest_path}", error_check: false)
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/guests/freebsd/plugin.rb

@@ -50,6 +50,16 @@ module VagrantPlugins
         require_relative "cap/shell_expand_guest_path"
         Cap::ShellExpandGuestPath
       end
+
+      guest_capability(:freebsd, :mount_virtualbox_shared_folder) do
+        require_relative "cap/mount_virtualbox_shared_folder"
+        Cap::MountVirtualBoxSharedFolder
+      end
+
+      guest_capability(:freebsd, :unmount_virtualbox_shared_folder) do
+        require_relative "cap/mount_virtualbox_shared_folder"
+        Cap::MountVirtualBoxSharedFolder
+      end
     end
   end
 end

data/plugins/hosts/bsd/cap/nfs.rb

@@ -120,7 +120,7 @@ module VagrantPlugins
         end
 
         def self.nfs_exports_template(environment)
-          "nfs/exports"
+          "nfs/exports_bsd"
         end
 
         def self.nfs_installed(environment)

data/plugins/hosts/freebsd/cap/nfs.rb

@@ -19,7 +19,7 @@ module VagrantPlugins
         end
 
         def self.nfs_exports_template(environment)
-          "nfs/exports_freebsd"
+          "nfs/exports_bsd"
         end
 
         def self.nfs_restart_command(environment)

data/plugins/hosts/void/cap/nfs.rb

@@ -15,7 +15,7 @@ module VagrantPlugins
         end
 
         def self.nfs_installed(env)
-          result = Vagrant::Util::Subprocess.execute("/usr/bin/xbps-query nfs-utils")
+          result = Vagrant::Util::Subprocess.execute("/usr/bin/xbps-query", "nfs-utils")
           result.exit_code == 0
         end
       end

data/plugins/kernel_v2/config/vm_trigger.rb

@@ -117,7 +117,7 @@ module VagrantPlugins
         @command = command.to_sym
         @ruby_block = UNSET_VALUE
 
-        @logger.debug("Trigger defined for command: #{command}")
+        @logger.debug("Trigger defined for: #{command}")
       end
 
       # Config option `ruby` for a trigger which reads in a ruby block and sets

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

@@ -0,0 +1,77 @@
+require 'ipaddr'
+require 'log4r'
+
+require 'vagrant/util/scoped_hash_override'
+
+module VagrantPlugins
+  module DockerProvider
+    module Action
+      class ConnectNetworks
+
+        include Vagrant::Util::ScopedHashOverride
+
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant::plugins::docker::connectnetworks')
+        end
+
+        # Generate CLI arguments for creating the docker network.
+        #
+        # @param [Hash] options Options from the network config
+        # @returns[Array<String> Network create arguments
+        def generate_connect_cli_arguments(options)
+          options.map do |key, value|
+            # If value is false, option is not set
+            next if value.to_s == "false"
+            # If value is true, consider feature flag with no value
+            opt = value.to_s == "true" ? [] : [value]
+            opt.unshift("--#{key.to_s.tr("_", "-")}")
+          end.flatten.compact
+        end
+
+        # Execute the action
+        def call(env)
+          # If we are using a host VM, then don't worry about it
+          machine = env[:machine]
+          if machine.provider.host_vm?
+            @logger.debug("Not setting up networks because docker host_vm is in use")
+            return @app.call(env)
+          end
+
+          env[:ui].info(I18n.t("docker_provider.network_connect"))
+
+          connections = env[:docker_connects] || {}
+
+          machine.config.vm.networks.each_with_index do |args, idx|
+            type, options = args
+            next if type != :private_network && type != :public_network
+
+            network_options = scoped_hash_override(options, :docker_connect)
+            network_options.delete_if{|k,_| options.key?(k)}
+            network_name = connections[idx]
+
+            if !network_name
+              raise Errors::NetworkNameMissing,
+                index: idx,
+                container: machine.name
+            end
+
+            @logger.debug("Connecting network #{network_name} to container guest #{machine.name}")
+            if options[:ip] && options[:type] != "dhcp"
+              if IPAddr.new(options[:ip]).ipv4?
+                network_options[:ip] = options[:ip]
+              else
+                network_options[:ip6] = options[:ip]
+              end
+            end
+            network_options[:alias] = options[:alias] if options[:alias]
+            connect_opts = generate_connect_cli_arguments(network_options)
+            machine.provider.driver.connect_network(network_name, machine.id, connect_opts)
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end