Spelling fixes
* account * addresses * administrator * afterwards * because * bridgeable * capabilities * capability * checksum * configuration * configuration for * configure * criteria * delimited * delivered * derivatives * description * detect * directory * display * downloading * during * electric * enabling * encountered * equivalent * executable * executed * hashicorp * hypervisor * hyphens * implementation * incorporate * inheritance * initialize * instance * instead * interactions * invocable * machine * maximum * message * mounting * overridden * overwrite * paramiko * preparing * provides * provisioning * recursively * requested * resetting * retryable * running * satisfied * searching * sometimes * specified * successfully * synced folders * unauthorized * underlying * userprofile * vagrant * vagrantfile * variable * various * version * virtual * windows
This commit is contained in:
parent
586ee5bfba
commit
1a5ddea9f4
20
CHANGELOG.md
20
CHANGELOG.md
|
@ -308,7 +308,7 @@ BUG FIXES:
|
||||||
- core/bundler: Check if source is local path and prevent addition to remote sources [GH-8401]
|
- core/bundler: Check if source is local path and prevent addition to remote sources [GH-8401]
|
||||||
- core/ui: Prevent deadlock detection errors [GH-8414, GH-8125]
|
- core/ui: Prevent deadlock detection errors [GH-8414, GH-8125]
|
||||||
- guests/debian: Remove hardcoded device name in interface template [GH-8336, GH-7960]
|
- guests/debian: Remove hardcoded device name in interface template [GH-8336, GH-7960]
|
||||||
- guests/linux: Fix SMB mount capbability [GH-8410, GH-8404]
|
- guests/linux: Fix SMB mount capability [GH-8410, GH-8404]
|
||||||
- hosts/windows: Fix issues with Windows encoding [GH-8385, GH-8380, GH-8212, GH-8207, GH-7516]
|
- hosts/windows: Fix issues with Windows encoding [GH-8385, GH-8380, GH-8212, GH-8207, GH-7516]
|
||||||
- hosts/windows: Fix UNC path generation when UNC path is provided [GH-8504]
|
- hosts/windows: Fix UNC path generation when UNC path is provided [GH-8504]
|
||||||
- provisioners/salt: Allow Salt version to match 2 digit month [GH-8428]
|
- provisioners/salt: Allow Salt version to match 2 digit month [GH-8428]
|
||||||
|
@ -526,7 +526,7 @@ BUG FIXES:
|
||||||
- guests/redhat: Use `/sbin/ip` to list and configure networks for
|
- guests/redhat: Use `/sbin/ip` to list and configure networks for
|
||||||
compatability with older versions of CentOS [GH-7482]
|
compatability with older versions of CentOS [GH-7482]
|
||||||
- guests/redhat: Ensure newline when inserting public key [GH-7598, GH-7605]
|
- guests/redhat: Ensure newline when inserting public key [GH-7598, GH-7605]
|
||||||
- guests/ubuntu: Use /etc/os-release to detech [GH-7524]
|
- guests/ubuntu: Use /etc/os-release to detect [GH-7524]
|
||||||
- guests/ubuntu: Use short hostname [GH-7488, GH-7605]
|
- guests/ubuntu: Use short hostname [GH-7488, GH-7605]
|
||||||
- providers/hyperv: Fix version check and catch statement [GH-7447, GH-7487]
|
- providers/hyperv: Fix version check and catch statement [GH-7447, GH-7487]
|
||||||
|
|
||||||
|
@ -660,7 +660,7 @@ BUG FIXES:
|
||||||
- providers/virtualbox: Set maximum network adapters to 36 [GH-7293, GH-7286]
|
- providers/virtualbox: Set maximum network adapters to 36 [GH-7293, GH-7286]
|
||||||
- providers/virtualbox: Do not fail when master VM from linked clone is
|
- providers/virtualbox: Do not fail when master VM from linked clone is
|
||||||
missing [GH-7126, GH-6742]
|
missing [GH-7126, GH-6742]
|
||||||
- providers/virtualbox: Use scoped overrides in preparring NFS
|
- providers/virtualbox: Use scoped overrides in preparing NFS
|
||||||
[GH-7387, GH-7386]
|
[GH-7387, GH-7386]
|
||||||
- provisioners/ansible: Fix a race condition in the concurrent generations of
|
- provisioners/ansible: Fix a race condition in the concurrent generations of
|
||||||
the ansible inventory file, while running `vagrant up --parallel`
|
the ansible inventory file, while running `vagrant up --parallel`
|
||||||
|
@ -1016,7 +1016,7 @@ BUG FIXES:
|
||||||
- provisioners/ansible: disable color if Vagrant is not colored [GH-5531, GH-5532]
|
- provisioners/ansible: disable color if Vagrant is not colored [GH-5531, GH-5532]
|
||||||
- provisioners/ansible: only show ansible-playbook command when `verbose` option is enabled [GH-5803]
|
- provisioners/ansible: only show ansible-playbook command when `verbose` option is enabled [GH-5803]
|
||||||
- provisioners/ansible: fix a race condition in the inventory file generation [GH-5551]
|
- provisioners/ansible: fix a race condition in the inventory file generation [GH-5551]
|
||||||
- provisioners/docker: use `service` to restart Docker instad of upstart [GH-5245, GH-5577]
|
- provisioners/docker: use `service` to restart Docker instead of upstart [GH-5245, GH-5577]
|
||||||
- provisioners/docker: Only add docker user to group if exists. [GH-5315]
|
- provisioners/docker: Only add docker user to group if exists. [GH-5315]
|
||||||
- provisioners/docker: Use https for repo [GH-5749]
|
- provisioners/docker: Use https for repo [GH-5749]
|
||||||
- provisioners/docker: `apt-get update` before installing linux kernel
|
- provisioners/docker: `apt-get update` before installing linux kernel
|
||||||
|
@ -1251,7 +1251,7 @@ IMPROVEMENTS:
|
||||||
deleted by default. [GH-4327]
|
deleted by default. [GH-4327]
|
||||||
- commands/plugin: Better error output is shown when plugin installation
|
- commands/plugin: Better error output is shown when plugin installation
|
||||||
fails.
|
fails.
|
||||||
- commands/reload: show post up messsage [GH-4168]
|
- commands/reload: show post up message [GH-4168]
|
||||||
- commands/rsync-auto: Add `--poll` flag. [GH-4392]
|
- commands/rsync-auto: Add `--poll` flag. [GH-4392]
|
||||||
- communicators/winrm: Show stdout/stderr if command fails. [GH-4094]
|
- communicators/winrm: Show stdout/stderr if command fails. [GH-4094]
|
||||||
- guests/nixos: Added better NFS support. [GH-3983]
|
- guests/nixos: Added better NFS support. [GH-3983]
|
||||||
|
@ -1539,7 +1539,7 @@ BUG FIXES:
|
||||||
already for 127.0.1.1 [GH-3271]
|
already for 127.0.1.1 [GH-3271]
|
||||||
- guests/linux: For `read_ip_address` capability, set `LANG=en` so
|
- guests/linux: For `read_ip_address` capability, set `LANG=en` so
|
||||||
it works on international systems. [GH-3029]
|
it works on international systems. [GH-3029]
|
||||||
- providers/virtualbox: VirtalBox detection works properly again on
|
- providers/virtualbox: VirtualBox detection works properly again on
|
||||||
Windows when the `VBOX_INSTALL_PATH` has multiple elements. [GH-3549]
|
Windows when the `VBOX_INSTALL_PATH` has multiple elements. [GH-3549]
|
||||||
- providers/virtualbox: Forcing MAC address on private network works
|
- providers/virtualbox: Forcing MAC address on private network works
|
||||||
properly again. [GH-3588]
|
properly again. [GH-3588]
|
||||||
|
@ -1716,7 +1716,7 @@ BUG FIXES:
|
||||||
- core: Assume a box isn't metadata if it exceeds 20 MB. [GH-3107]
|
- core: Assume a box isn't metadata if it exceeds 20 MB. [GH-3107]
|
||||||
- core: Asking for input works even in consoles that don't support
|
- core: Asking for input works even in consoles that don't support
|
||||||
hiding input. [GH-3119]
|
hiding input. [GH-3119]
|
||||||
- core: Adding a box by path in Cygwin on Windos works. [GH-3132]
|
- core: Adding a box by path in Cygwin on Windows works. [GH-3132]
|
||||||
- core: PowerShell scripts work when they're in a directory with
|
- core: PowerShell scripts work when they're in a directory with
|
||||||
spaces. [GH-3100]
|
spaces. [GH-3100]
|
||||||
- core: If you add a box path that doesn't exist, error earlier. [GH-3091]
|
- core: If you add a box path that doesn't exist, error earlier. [GH-3091]
|
||||||
|
@ -2032,7 +2032,7 @@ BUG FIXES:
|
||||||
- core: Don't load Vagrantfile on `vagrant plugin` commands, allowing
|
- core: Don't load Vagrantfile on `vagrant plugin` commands, allowing
|
||||||
Vagrantfiles that use plugins to work. [GH-2388]
|
Vagrantfiles that use plugins to work. [GH-2388]
|
||||||
- core: global flags are ignored past the "--" on the CLI. [GH-2491]
|
- core: global flags are ignored past the "--" on the CLI. [GH-2491]
|
||||||
- core: provisoining will properly happen if `up` failed. [GH-2488]
|
- core: provisioning will properly happen if `up` failed. [GH-2488]
|
||||||
- guests/freebsd: Mounting NFS folders works. [GH-2400]
|
- guests/freebsd: Mounting NFS folders works. [GH-2400]
|
||||||
- guests/freebsd: Uses `sh` by default for shell. [GH-2485]
|
- guests/freebsd: Uses `sh` by default for shell. [GH-2485]
|
||||||
- guests/linux: upstart events listening for `vagrant-mounted` won't
|
- guests/linux: upstart events listening for `vagrant-mounted` won't
|
||||||
|
@ -3038,7 +3038,7 @@ IMPROVEMENTS / BUG FIXES:
|
||||||
the behavior seems different/wrong.
|
the behavior seems different/wrong.
|
||||||
- Give a nice error if `:vagrant` is used as a JSON key, since Vagrant
|
- Give a nice error if `:vagrant` is used as a JSON key, since Vagrant
|
||||||
uses this. [GH-661]
|
uses this. [GH-661]
|
||||||
- If there is only one bridgable interface, use that without asking
|
- If there is only one bridgeable interface, use that without asking
|
||||||
the user. [GH-655]
|
the user. [GH-655]
|
||||||
- The shell will have color output if ANSICON is installed on Windows. [GH-666]
|
- The shell will have color output if ANSICON is installed on Windows. [GH-666]
|
||||||
|
|
||||||
|
@ -3089,7 +3089,7 @@ IMPROVEMENTS / BUG FIXES:
|
||||||
port of the virtual machine.
|
port of the virtual machine.
|
||||||
- If a shared folder now has a `:create` flag set to `true`, the path on the
|
- If a shared folder now has a `:create` flag set to `true`, the path on the
|
||||||
host will be created if it doesn't exist.
|
host will be created if it doesn't exist.
|
||||||
- Added `--force` flag to `box add`, which will overwite any existing boxes
|
- Added `--force` flag to `box add`, which will overwrite any existing boxes
|
||||||
if they exist. [GH-631]
|
if they exist. [GH-631]
|
||||||
- Added `--provision-with` to `up` which configures what provisioners run,
|
- Added `--provision-with` to `up` which configures what provisioners run,
|
||||||
by shortcut. [GH-367]
|
by shortcut. [GH-367]
|
||||||
|
|
|
@ -9,7 +9,7 @@ Signal.trap("INT") { abort }
|
||||||
argv = ARGV.dup
|
argv = ARGV.dup
|
||||||
argv_extra = []
|
argv_extra = []
|
||||||
|
|
||||||
# These will be the options that are passed to initialze the Vagrant
|
# These will be the options that are passed to initialize the Vagrant
|
||||||
# environment.
|
# environment.
|
||||||
opts = {}
|
opts = {}
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ module Vagrant
|
||||||
module Action
|
module Action
|
||||||
module Builtin
|
module Builtin
|
||||||
# This built-in middleware handles the `box` setting by verifying
|
# This built-in middleware handles the `box` setting by verifying
|
||||||
# the box is already installed, dowloading the box if it isn't,
|
# the box is already installed, downloading the box if it isn't,
|
||||||
# updating the box if it is requested, etc.
|
# updating the box if it is requested, etc.
|
||||||
class HandleBox
|
class HandleBox
|
||||||
@@big_lock = Mutex.new
|
@@big_lock = Mutex.new
|
||||||
|
|
|
@ -121,7 +121,7 @@ module Vagrant
|
||||||
@env[:ui].info I18n.t("vagrant.actions.general.package.packaging", file: from)
|
@env[:ui].info I18n.t("vagrant.actions.general.package.packaging", file: from)
|
||||||
FileUtils.mkdir_p(to.parent)
|
FileUtils.mkdir_p(to.parent)
|
||||||
|
|
||||||
# Copy direcotry contents recursively.
|
# Copy directory contents recursively.
|
||||||
if File.directory?(from)
|
if File.directory?(from)
|
||||||
FileUtils.cp_r(Dir.glob(from), to.parent, preserve: true)
|
FileUtils.cp_r(Dir.glob(from), to.parent, preserve: true)
|
||||||
else
|
else
|
||||||
|
|
|
@ -307,7 +307,7 @@ module Vagrant
|
||||||
|
|
||||||
# Install all remote gems into plugin path. Set the installer to ignore dependencies
|
# Install all remote gems into plugin path. Set the installer to ignore dependencies
|
||||||
# as we know the dependencies are satisfied and it will attempt to validate a gem's
|
# as we know the dependencies are satisfied and it will attempt to validate a gem's
|
||||||
# dependencies are satisified by gems in the install directory (which will likely not
|
# dependencies are satisfied by gems in the install directory (which will likely not
|
||||||
# be true)
|
# be true)
|
||||||
result = request_set.install_into(plugin_gem_path.to_s, true,
|
result = request_set.install_into(plugin_gem_path.to_s, true,
|
||||||
ignore_dependencies: true,
|
ignore_dependencies: true,
|
||||||
|
|
|
@ -5,7 +5,7 @@ module Vagrant
|
||||||
#
|
#
|
||||||
# Capabilities allow small pieces of functionality to be plugged in using
|
# Capabilities allow small pieces of functionality to be plugged in using
|
||||||
# the Vagrant plugin model. Capabilities even allow for a certain amount
|
# the Vagrant plugin model. Capabilities even allow for a certain amount
|
||||||
# of inheritence, where only a subset of capabilities may be implemented but
|
# of inheritance, where only a subset of capabilities may be implemented but
|
||||||
# a parent implements the rest.
|
# a parent implements the rest.
|
||||||
#
|
#
|
||||||
# Capabilities are used heavily in Vagrant for host/guest interactions. For
|
# Capabilities are used heavily in Vagrant for host/guest interactions. For
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
module Vagrant
|
module Vagrant
|
||||||
module Config
|
module Config
|
||||||
# This is the base class for any configuration versions, and includes
|
# This is the base class for any configuration versions, and includes
|
||||||
# the stub methods that configuaration versions must implement. Vagrant
|
# the stub methods that configuration versions must implement. Vagrant
|
||||||
# supports configuration versioning so that backwards compatibility can be
|
# supports configuration versioning so that backwards compatibility can be
|
||||||
# maintained for past Vagrantfiles while newer configurations are added.
|
# maintained for past Vagrantfiles while newer configurations are added.
|
||||||
# Vagrant only introduces new configuration versions for major versions
|
# Vagrant only introduces new configuration versions for major versions
|
||||||
|
|
|
@ -446,7 +446,7 @@ module Vagrant
|
||||||
temp_dir_root: tmp_path)
|
temp_dir_root: tmp_path)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Returns the {Config::Loader} that can be used to load Vagrantflies
|
# Returns the {Config::Loader} that can be used to load Vagrantfiles
|
||||||
# given the settings of this environment.
|
# given the settings of this environment.
|
||||||
#
|
#
|
||||||
# @return [Config::Loader]
|
# @return [Config::Loader]
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
require "vagrant/capability_host"
|
require "vagrant/capability_host"
|
||||||
|
|
||||||
module Vagrant
|
module Vagrant
|
||||||
# This class handles host-OS specific interations. It is responsible for
|
# This class handles host-OS specific interactions. It is responsible for
|
||||||
# detecting the proper host OS implementation and delegating capabilities
|
# detecting the proper host OS implementation and delegating capabilities
|
||||||
# to plugins.
|
# to plugins.
|
||||||
#
|
#
|
||||||
|
|
|
@ -456,7 +456,7 @@ module Vagrant
|
||||||
info[:password] = @config.ssh.password if @config.ssh.password
|
info[:password] = @config.ssh.password if @config.ssh.password
|
||||||
info[:extra_args] = @config.ssh.extra_args if @config.ssh.extra_args
|
info[:extra_args] = @config.ssh.extra_args if @config.ssh.extra_args
|
||||||
|
|
||||||
# We also set some fields that are purely controlled by Varant
|
# We also set some fields that are purely controlled by Vagrant
|
||||||
info[:forward_agent] = @config.ssh.forward_agent
|
info[:forward_agent] = @config.ssh.forward_agent
|
||||||
info[:forward_x11] = @config.ssh.forward_x11
|
info[:forward_x11] = @config.ssh.forward_x11
|
||||||
info[:forward_env] = @config.ssh.forward_env
|
info[:forward_env] = @config.ssh.forward_env
|
||||||
|
|
|
@ -404,7 +404,7 @@ module Vagrant
|
||||||
end
|
end
|
||||||
|
|
||||||
# Returns boolean true if this entry appears to be valid.
|
# Returns boolean true if this entry appears to be valid.
|
||||||
# The critera for being valid:
|
# The criteria for being valid:
|
||||||
#
|
#
|
||||||
# * Vagrantfile directory exists
|
# * Vagrantfile directory exists
|
||||||
# * Vagrant environment contains a machine with this
|
# * Vagrant environment contains a machine with this
|
||||||
|
|
|
@ -3,7 +3,7 @@ module Vagrant
|
||||||
module V1
|
module V1
|
||||||
# The base class for a guest. A guest represents an installed system
|
# The base class for a guest. A guest represents an installed system
|
||||||
# within a machine that Vagrant manages. There are some portions of
|
# within a machine that Vagrant manages. There are some portions of
|
||||||
# Vagrant which are OS-specific such as mountaing shared folders and
|
# Vagrant which are OS-specific such as mounting shared folders and
|
||||||
# halting the machine, and this abstraction allows the implementation
|
# halting the machine, and this abstraction allows the implementation
|
||||||
# for these to be separate from the core of Vagrant.
|
# for these to be separate from the core of Vagrant.
|
||||||
class Guest
|
class Guest
|
||||||
|
|
|
@ -3,7 +3,7 @@ module Vagrant
|
||||||
module V1
|
module V1
|
||||||
# Base class for a host in Vagrant. A host class contains functionality
|
# Base class for a host in Vagrant. A host class contains functionality
|
||||||
# that is specific to a specific OS that is running Vagrant. This
|
# that is specific to a specific OS that is running Vagrant. This
|
||||||
# abstraction is done becauase there is some host-specific logic that
|
# abstraction is done because there is some host-specific logic that
|
||||||
# Vagrant must do in some cases.
|
# Vagrant must do in some cases.
|
||||||
class Host
|
class Host
|
||||||
# This returns true/false depending on if the current running system
|
# This returns true/false depending on if the current running system
|
||||||
|
|
|
@ -44,7 +44,7 @@ module Vagrant
|
||||||
result
|
result
|
||||||
end
|
end
|
||||||
|
|
||||||
# Sets a human-friendly descrition of the plugin.
|
# Sets a human-friendly description of the plugin.
|
||||||
#
|
#
|
||||||
# @param [String] value Description of the plugin.
|
# @param [String] value Description of the plugin.
|
||||||
# @return [String] Description of the plugin.
|
# @return [String] Description of the plugin.
|
||||||
|
|
|
@ -21,7 +21,7 @@ module Vagrant
|
||||||
nil
|
nil
|
||||||
end
|
end
|
||||||
|
|
||||||
# This method is called if the underying machine ID changes. Providers
|
# This method is called if the underlying machine ID changes. Providers
|
||||||
# can use this method to load in new data for the actual backing
|
# can use this method to load in new data for the actual backing
|
||||||
# machine or to realize that the machine is now gone (the ID can
|
# machine or to realize that the machine is now gone (the ID can
|
||||||
# become `nil`). No parameters are given, since the underlying machine
|
# become `nil`). No parameters are given, since the underlying machine
|
||||||
|
|
|
@ -7,7 +7,7 @@ module Vagrant
|
||||||
# own form of plugin.
|
# own form of plugin.
|
||||||
#
|
#
|
||||||
# The guest class itself is only responsible for detecting itself,
|
# The guest class itself is only responsible for detecting itself,
|
||||||
# and may provide helpers for the capabilties.
|
# and may provide helpers for the capabilities.
|
||||||
class Guest
|
class Guest
|
||||||
# This method is called when the machine is booted and has communication
|
# This method is called when the machine is booted and has communication
|
||||||
# capabilities in order to detect whether this guest operating system
|
# capabilities in order to detect whether this guest operating system
|
||||||
|
|
|
@ -3,7 +3,7 @@ module Vagrant
|
||||||
module V2
|
module V2
|
||||||
# Base class for a host in Vagrant. A host class contains functionality
|
# Base class for a host in Vagrant. A host class contains functionality
|
||||||
# that is specific to a specific OS that is running Vagrant. This
|
# that is specific to a specific OS that is running Vagrant. This
|
||||||
# abstraction is done becauase there is some host-specific logic that
|
# abstraction is done because there is some host-specific logic that
|
||||||
# Vagrant must do in some cases.
|
# Vagrant must do in some cases.
|
||||||
class Host
|
class Host
|
||||||
# This returns true/false depending on if the current running system
|
# This returns true/false depending on if the current running system
|
||||||
|
|
|
@ -53,7 +53,7 @@ module Vagrant
|
||||||
result
|
result
|
||||||
end
|
end
|
||||||
|
|
||||||
# Sets a human-friendly descrition of the plugin.
|
# Sets a human-friendly description of the plugin.
|
||||||
#
|
#
|
||||||
# @param [String] value Description of the plugin.
|
# @param [String] value Description of the plugin.
|
||||||
# @return [String] Description of the plugin.
|
# @return [String] Description of the plugin.
|
||||||
|
|
|
@ -55,7 +55,7 @@ module Vagrant
|
||||||
nil
|
nil
|
||||||
end
|
end
|
||||||
|
|
||||||
# This method is called if the underying machine ID changes. Providers
|
# This method is called if the underlying machine ID changes. Providers
|
||||||
# can use this method to load in new data for the actual backing
|
# can use this method to load in new data for the actual backing
|
||||||
# machine or to realize that the machine is now gone (the ID can
|
# machine or to realize that the machine is now gone (the ID can
|
||||||
# become `nil`). No parameters are given, since the underlying machine
|
# become `nil`). No parameters are given, since the underlying machine
|
||||||
|
|
|
@ -15,7 +15,7 @@ module Vagrant
|
||||||
# Max number of seconds to wait for joining an active thread.
|
# Max number of seconds to wait for joining an active thread.
|
||||||
#
|
#
|
||||||
# @return [Integer]
|
# @return [Integer]
|
||||||
# @note This is not the maxium time for a thread to complete.
|
# @note This is not the maximum time for a thread to complete.
|
||||||
THREAD_MAX_JOIN_TIMEOUT = 60
|
THREAD_MAX_JOIN_TIMEOUT = 60
|
||||||
|
|
||||||
# This holds a global lock for the duration of the block. This should
|
# This holds a global lock for the duration of the block. This should
|
||||||
|
@ -93,7 +93,7 @@ module Vagrant
|
||||||
#
|
#
|
||||||
# @return [Pathname]
|
# @return [Pathname]
|
||||||
def self.user_data_path
|
def self.user_data_path
|
||||||
# Use user spcified env var if available
|
# Use user specified env var if available
|
||||||
path = ENV["VAGRANT_HOME"]
|
path = ENV["VAGRANT_HOME"]
|
||||||
|
|
||||||
# On Windows, we default to the USERPROFILE directory if it
|
# On Windows, we default to the USERPROFILE directory if it
|
||||||
|
|
|
@ -302,7 +302,7 @@ module Vagrant
|
||||||
result
|
result
|
||||||
end
|
end
|
||||||
|
|
||||||
# Returns the varoius cURL and subprocess options.
|
# Returns the various cURL and subprocess options.
|
||||||
#
|
#
|
||||||
# @return [Array<Array, Hash>]
|
# @return [Array<Array, Hash>]
|
||||||
def options
|
def options
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
module Vagrant
|
module Vagrant
|
||||||
module Util
|
module Util
|
||||||
# This module provies a `safe_exec` method which is a drop-in
|
# This module provides a `safe_exec` method which is a drop-in
|
||||||
# replacement for `Kernel.exec` which addresses a specific issue
|
# replacement for `Kernel.exec` which addresses a specific issue
|
||||||
# which manifests on OS X 10.5 (GH-51) and perhaps other operating systems.
|
# which manifests on OS X 10.5 (GH-51) and perhaps other operating systems.
|
||||||
# This issue causes `exec` to fail if there is more than one system
|
# This issue causes `exec` to fail if there is more than one system
|
||||||
|
|
|
@ -23,7 +23,7 @@ module Vagrant
|
||||||
end
|
end
|
||||||
|
|
||||||
# Executes all the procs on the stack, passing in the given arguments.
|
# Executes all the procs on the stack, passing in the given arguments.
|
||||||
# The stack is not cleared afterwords. It is up to the user of this
|
# The stack is not cleared afterwards. It is up to the user of this
|
||||||
# mixin to clear the stack by calling `proc_stack.clear`.
|
# mixin to clear the stack by calling `proc_stack.clear`.
|
||||||
def run_procs!(*args)
|
def run_procs!(*args)
|
||||||
proc_stack.each do |proc|
|
proc_stack.each do |proc|
|
||||||
|
|
|
@ -50,7 +50,7 @@ module Vagrant
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Renders the template using the class intance as the binding. Because the
|
# Renders the template using the class instance as the binding. Because the
|
||||||
# renderer inherits from `OpenStruct`, additional view variables can be
|
# renderer inherits from `OpenStruct`, additional view variables can be
|
||||||
# added like normal accessors.
|
# added like normal accessors.
|
||||||
#
|
#
|
||||||
|
@ -76,7 +76,7 @@ module Vagrant
|
||||||
Erubis::Eruby.new(template, trim: true).result(binding)
|
Erubis::Eruby.new(template, trim: true).result(binding)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Returns the full path to the template, taking into accoun the gem directory
|
# Returns the full path to the template, taking into account the gem directory
|
||||||
# and adding the `.erb` extension to the end.
|
# and adding the `.erb` extension to the end.
|
||||||
#
|
#
|
||||||
# @return [String]
|
# @return [String]
|
||||||
|
|
|
@ -18,7 +18,7 @@ module Vagrant
|
||||||
# Initializes by loading a Vagrantfile.
|
# Initializes by loading a Vagrantfile.
|
||||||
#
|
#
|
||||||
# @param [Config::Loader] loader Configuration loader that should
|
# @param [Config::Loader] loader Configuration loader that should
|
||||||
# already be configured with the proper Vagrantflie locations.
|
# already be configured with the proper Vagrantfile locations.
|
||||||
# This usually comes from {Vagrant::Environment}
|
# This usually comes from {Vagrant::Environment}
|
||||||
# @param [Array<Symbol>] keys The Vagrantfiles to load and the
|
# @param [Array<Symbol>] keys The Vagrantfiles to load and the
|
||||||
# order to load them in (keys within the loader).
|
# order to load them in (keys within the loader).
|
||||||
|
|
|
@ -64,7 +64,7 @@ module VagrantPlugins
|
||||||
Gem.sources = old_sources.to_a
|
Gem.sources = old_sources.to_a
|
||||||
end
|
end
|
||||||
|
|
||||||
# This is pretty hacky but it is a custom implementatin of
|
# This is pretty hacky but it is a custom implementation of
|
||||||
# Gem::ConfigFile so that we don't load any gemrc files.
|
# Gem::ConfigFile so that we don't load any gemrc files.
|
||||||
class NilGemConfig < Gem::ConfigFile
|
class NilGemConfig < Gem::ConfigFile
|
||||||
def initialize
|
def initialize
|
||||||
|
|
|
@ -55,7 +55,7 @@ module VagrantPlugins
|
||||||
machine.ui.detail(data) if type == :stdout
|
machine.ui.detail(data) if type == :stdout
|
||||||
end
|
end
|
||||||
if out_code == 0
|
if out_code == 0
|
||||||
machine.ui.success("Command: #{options[:command]} executed succesfully with output code #{out_code}.")
|
machine.ui.success("Command: #{options[:command]} executed successfully with output code #{out_code}.")
|
||||||
end
|
end
|
||||||
next
|
next
|
||||||
end
|
end
|
||||||
|
@ -103,7 +103,7 @@ module VagrantPlugins
|
||||||
end
|
end
|
||||||
|
|
||||||
def reset_ps_remoting_for(machine, ps_info)
|
def reset_ps_remoting_for(machine, ps_info)
|
||||||
machine.ui.output(I18n.t("vagrant_ps.reseting"))
|
machine.ui.output(I18n.t("vagrant_ps.resetting"))
|
||||||
script_path = File.expand_path("../scripts/reset_trustedhosts.ps1", __FILE__)
|
script_path = File.expand_path("../scripts/reset_trustedhosts.ps1", __FILE__)
|
||||||
args = []
|
args = []
|
||||||
args << "-hostname" << ps_info[:host]
|
args << "-hostname" << ps_info[:host]
|
||||||
|
|
|
@ -5,7 +5,7 @@ Param(
|
||||||
[string]$password
|
[string]$password
|
||||||
)
|
)
|
||||||
# If we are in this script, we know basic winrm is working
|
# If we are in this script, we know basic winrm is working
|
||||||
# If the user is not using a domain acount and chances are
|
# If the user is not using a domain account and chances are
|
||||||
# they are not, PS Remoting will not work if the guest is not
|
# they are not, PS Remoting will not work if the guest is not
|
||||||
# listed in the trusted hosts.
|
# listed in the trusted hosts.
|
||||||
|
|
||||||
|
|
|
@ -285,7 +285,7 @@ module VagrantPlugins
|
||||||
|
|
||||||
scp_connect do |scp|
|
scp_connect do |scp|
|
||||||
if File.directory?(from)
|
if File.directory?(from)
|
||||||
# Recurisvely upload directories
|
# Recursively upload directories
|
||||||
scp.upload!(from, to, recursive: true)
|
scp.upload!(from, to, recursive: true)
|
||||||
else
|
else
|
||||||
# Open file read only to fix issue [GH-1036]
|
# Open file read only to fix issue [GH-1036]
|
||||||
|
|
|
@ -74,7 +74,7 @@ module VagrantPlugins
|
||||||
rescue Errors::NoRoute
|
rescue Errors::NoRoute
|
||||||
message = "Host unreachable."
|
message = "Host unreachable."
|
||||||
rescue Errors::TransientError => e
|
rescue Errors::TransientError => e
|
||||||
# Any other retriable errors
|
# Any other retryable errors
|
||||||
message = e.message
|
message = e.message
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -127,7 +127,7 @@ module VagrantPlugins
|
||||||
end
|
end
|
||||||
|
|
||||||
def execute(command, opts={}, &block)
|
def execute(command, opts={}, &block)
|
||||||
# If this is a *nix command with no Windows equivilant, don't run it
|
# If this is a *nix command with no Windows equivalent, don't run it
|
||||||
command = @cmd_filter.filter(command)
|
command = @cmd_filter.filter(command)
|
||||||
return 0 if command.empty?
|
return 0 if command.empty?
|
||||||
|
|
||||||
|
@ -152,7 +152,7 @@ module VagrantPlugins
|
||||||
|
|
||||||
def test(command, opts=nil)
|
def test(command, opts=nil)
|
||||||
# If this is a *nix command (which we know about) with no Windows
|
# If this is a *nix command (which we know about) with no Windows
|
||||||
# equivilant, assume failure
|
# equivalent, assume failure
|
||||||
command = @cmd_filter.filter(command)
|
command = @cmd_filter.filter(command)
|
||||||
return false if command.empty?
|
return false if command.empty?
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ module VagrantPlugins
|
||||||
class Flavor
|
class Flavor
|
||||||
def self.flavor(machine)
|
def self.flavor(machine)
|
||||||
# Amazon AMI is a frankenstien RHEL, mainly based on 6
|
# Amazon AMI is a frankenstien RHEL, mainly based on 6
|
||||||
# Maybe in the future if they incoporate RHEL 7 elements
|
# Maybe in the future if they incorporate RHEL 7 elements
|
||||||
# this should be extended to read /etc/os-release or similar
|
# this should be extended to read /etc/os-release or similar
|
||||||
return :rhel
|
return :rhel
|
||||||
end
|
end
|
||||||
|
|
|
@ -48,7 +48,7 @@ module VagrantPlugins
|
||||||
commands << "systemctl stop etcd"
|
commands << "systemctl stop etcd"
|
||||||
|
|
||||||
# Configure interfaces
|
# Configure interfaces
|
||||||
# FIXME: fix matching of interfaces with IP adresses
|
# FIXME: fix matching of interfaces with IP addresses
|
||||||
networks.each do |network|
|
networks.each do |network|
|
||||||
iface = interfaces[network[:interface].to_i]
|
iface = interfaces[network[:interface].to_i]
|
||||||
commands << "ifconfig #{iface} #{network[:ip]} netmask #{network[:netmask]}".squeeze(" ")
|
commands << "ifconfig #{iface} #{network[:ip]} netmask #{network[:netmask]}".squeeze(" ")
|
||||||
|
|
|
@ -17,7 +17,7 @@ module VagrantPlugins
|
||||||
end
|
end
|
||||||
|
|
||||||
# Linux-specific helpers we need to determine paths that can
|
# Linux-specific helpers we need to determine paths that can
|
||||||
# be overriden.
|
# be overridden.
|
||||||
host_capability("alt", "nfs_check_command") do
|
host_capability("alt", "nfs_check_command") do
|
||||||
require_relative "cap/nfs"
|
require_relative "cap/nfs"
|
||||||
Cap::NFS
|
Cap::NFS
|
||||||
|
|
|
@ -17,7 +17,7 @@ module VagrantPlugins
|
||||||
end
|
end
|
||||||
|
|
||||||
# Linux-specific helpers we need to determine paths that can
|
# Linux-specific helpers we need to determine paths that can
|
||||||
# be overriden.
|
# be overridden.
|
||||||
host_capability("arch", "nfs_check_command") do
|
host_capability("arch", "nfs_check_command") do
|
||||||
require_relative "cap/nfs"
|
require_relative "cap/nfs"
|
||||||
Cap::NFS
|
Cap::NFS
|
||||||
|
|
|
@ -12,7 +12,7 @@ module VagrantPlugins
|
||||||
end
|
end
|
||||||
|
|
||||||
# Linux-specific helpers we need to determine paths that can
|
# Linux-specific helpers we need to determine paths that can
|
||||||
# be overriden.
|
# be overridden.
|
||||||
host_capability("gentoo", "nfs_check_command") do
|
host_capability("gentoo", "nfs_check_command") do
|
||||||
require_relative "cap/nfs"
|
require_relative "cap/nfs"
|
||||||
Cap::NFS
|
Cap::NFS
|
||||||
|
|
|
@ -32,7 +32,7 @@ module VagrantPlugins
|
||||||
end
|
end
|
||||||
|
|
||||||
# Linux-specific helpers we need to determine paths that can
|
# Linux-specific helpers we need to determine paths that can
|
||||||
# be overriden.
|
# be overridden.
|
||||||
host_capability("linux", "nfs_apply_command") do
|
host_capability("linux", "nfs_apply_command") do
|
||||||
require_relative "cap/nfs"
|
require_relative "cap/nfs"
|
||||||
Cap::NFS
|
Cap::NFS
|
||||||
|
|
|
@ -12,7 +12,7 @@ module VagrantPlugins
|
||||||
end
|
end
|
||||||
|
|
||||||
# Linux-specific helpers we need to determine paths that can
|
# Linux-specific helpers we need to determine paths that can
|
||||||
# be overriden.
|
# be overridden.
|
||||||
host_capability("redhat", "nfs_check_command") do
|
host_capability("redhat", "nfs_check_command") do
|
||||||
require_relative "cap/nfs"
|
require_relative "cap/nfs"
|
||||||
Cap::NFS
|
Cap::NFS
|
||||||
|
|
|
@ -4,7 +4,7 @@ module VagrantPlugins
|
||||||
module HostSlackware
|
module HostSlackware
|
||||||
class Plugin < Vagrant.plugin("2")
|
class Plugin < Vagrant.plugin("2")
|
||||||
name "Slackware host"
|
name "Slackware host"
|
||||||
description "Slackware and derivertives host support."
|
description "Slackware and derivatives host support."
|
||||||
|
|
||||||
host("slackware", "linux") do
|
host("slackware", "linux") do
|
||||||
require File.expand_path("../host", __FILE__)
|
require File.expand_path("../host", __FILE__)
|
||||||
|
@ -12,7 +12,7 @@ module VagrantPlugins
|
||||||
end
|
end
|
||||||
|
|
||||||
# Linux-specific helpers we need to determine paths that can
|
# Linux-specific helpers we need to determine paths that can
|
||||||
# be overriden.
|
# be overridden.
|
||||||
host_capability("slackware", "nfs_check_command") do
|
host_capability("slackware", "nfs_check_command") do
|
||||||
require_relative "cap/nfs"
|
require_relative "cap/nfs"
|
||||||
Cap::NFS
|
Cap::NFS
|
||||||
|
|
|
@ -35,7 +35,7 @@ module VagrantPlugins
|
||||||
|
|
||||||
begin
|
begin
|
||||||
tuples.each do |s, b|
|
tuples.each do |s, b|
|
||||||
# Update the strategy if it has changed, reseting the current
|
# Update the strategy if it has changed, resetting the current
|
||||||
# config object.
|
# config object.
|
||||||
if s != strategy
|
if s != strategy
|
||||||
@logger.warn("duplicate strategy defined, overwriting config")
|
@logger.warn("duplicate strategy defined, overwriting config")
|
||||||
|
|
|
@ -535,7 +535,7 @@ module VagrantPlugins
|
||||||
@__finalized = true
|
@__finalized = true
|
||||||
end
|
end
|
||||||
|
|
||||||
# This returns the compiled provider-specific configurationf or the
|
# This returns the compiled provider-specific configuration for the
|
||||||
# given provider.
|
# given provider.
|
||||||
#
|
#
|
||||||
# @param [Symbol] name Name of the provider.
|
# @param [Symbol] name Name of the provider.
|
||||||
|
|
|
@ -26,7 +26,7 @@ module VagrantPlugins
|
||||||
end
|
end
|
||||||
|
|
||||||
# Remove the matching folders, and build up non-matching or
|
# Remove the matching folders, and build up non-matching or
|
||||||
# new syncedf olders.
|
# new synced folders.
|
||||||
invalids = {}
|
invalids = {}
|
||||||
fresh.each do |_, fs|
|
fresh.each do |_, fs|
|
||||||
fs.each do |_, data|
|
fs.each do |_, data|
|
||||||
|
|
|
@ -180,15 +180,15 @@ module VagrantPlugins
|
||||||
|
|
||||||
# If we still don't have a bridge chosen (this means that one wasn't
|
# If we still don't have a bridge chosen (this means that one wasn't
|
||||||
# specified in the Vagrantfile, or the bridge specified in the Vagrantfile
|
# specified in the Vagrantfile, or the bridge specified in the Vagrantfile
|
||||||
# wasn't found), then we fall back to the normal means of searchign for a
|
# wasn't found), then we fall back to the normal means of searching for a
|
||||||
# bridged network.
|
# bridged network.
|
||||||
if !chosen_bridge
|
if !chosen_bridge
|
||||||
if bridgedifs.length == 1
|
if bridgedifs.length == 1
|
||||||
# One bridgable interface? Just use it.
|
# One bridgeable interface? Just use it.
|
||||||
chosen_bridge = bridgedifs[0][:name]
|
chosen_bridge = bridgedifs[0][:name]
|
||||||
@logger.debug("Only one bridged interface available. Using it by default.")
|
@logger.debug("Only one bridged interface available. Using it by default.")
|
||||||
else
|
else
|
||||||
# More than one bridgable interface requires a user decision, so
|
# More than one bridgeable interface requires a user decision, so
|
||||||
# show options to choose from.
|
# show options to choose from.
|
||||||
@env[:ui].info I18n.t(
|
@env[:ui].info I18n.t(
|
||||||
"vagrant.actions.vm.bridged_networking.available",
|
"vagrant.actions.vm.bridged_networking.available",
|
||||||
|
|
|
@ -10,7 +10,7 @@ module VagrantPlugins
|
||||||
module ProviderVirtualBox
|
module ProviderVirtualBox
|
||||||
module Action
|
module Action
|
||||||
# This middleware works around a bug in VirtualBox where booting
|
# This middleware works around a bug in VirtualBox where booting
|
||||||
# a VM with an IPv6 host-only network will someties lose the
|
# a VM with an IPv6 host-only network will sometimes lose the
|
||||||
# route to that machine.
|
# route to that machine.
|
||||||
class NetworkFixIPv6
|
class NetworkFixIPv6
|
||||||
include Vagrant::Util::Presence
|
include Vagrant::Util::Presence
|
||||||
|
|
|
@ -2,7 +2,7 @@ en:
|
||||||
vagrant_ps:
|
vagrant_ps:
|
||||||
detecting: |-
|
detecting: |-
|
||||||
Detecting if a remote PowerShell connection can be made with the guest...
|
Detecting if a remote PowerShell connection can be made with the guest...
|
||||||
reseting: |-
|
resetting: |-
|
||||||
Resetting WinRM TrustedHosts to their original value.
|
Resetting WinRM TrustedHosts to their original value.
|
||||||
|
|
||||||
errors:
|
errors:
|
||||||
|
|
|
@ -775,7 +775,7 @@ en:
|
||||||
checksum!
|
checksum!
|
||||||
|
|
||||||
File source: %{source}
|
File source: %{source}
|
||||||
Checsum type: %{type}
|
Checksum type: %{type}
|
||||||
Expected checksum: %{expected_checksum}
|
Expected checksum: %{expected_checksum}
|
||||||
Calculated checksum: %{actual_checksum}
|
Calculated checksum: %{actual_checksum}
|
||||||
env_inval: |-
|
env_inval: |-
|
||||||
|
@ -928,7 +928,7 @@ en:
|
||||||
Vagrant was instructed to configure the %{device} network device to
|
Vagrant was instructed to configure the %{device} network device to
|
||||||
be managed by NetworkManager. However, the configured guest VM does
|
be managed by NetworkManager. However, the configured guest VM does
|
||||||
not have NetworkManager installed. To fix this error please remove
|
not have NetworkManager installed. To fix this error please remove
|
||||||
the `nm_controlled` setting from local Vagantfile. If NetworkManager
|
the `nm_controlled` setting from local Vagrantfile. If NetworkManager
|
||||||
is required to manage the network devices, please use a box with
|
is required to manage the network devices, please use a box with
|
||||||
NetworkManager installed.
|
NetworkManager installed.
|
||||||
nfs_bad_exports: |-
|
nfs_bad_exports: |-
|
||||||
|
@ -1625,7 +1625,7 @@ en:
|
||||||
Vagrant is unable to use the VirtualBox provider from the Windows Subsystem for
|
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
|
Linux without access to the Windows environment. Enabling this access must be
|
||||||
done with caution and an understanding of the implications. For more information
|
done with caution and an understanding of the implications. For more information
|
||||||
on enabing Windows access and using VirtualBox from the Windows Subsystem for
|
on enabling Windows access and using VirtualBox from the Windows Subsystem for
|
||||||
Linux, please refer to the Vagrant documentation:
|
Linux, please refer to the Vagrant documentation:
|
||||||
|
|
||||||
https://www.vagrantup.com/docs/other/wsl.html
|
https://www.vagrantup.com/docs/other/wsl.html
|
||||||
|
@ -1838,7 +1838,7 @@ en:
|
||||||
have to destroy and restart the virtual machine.
|
have to destroy and restart the virtual machine.
|
||||||
gurumeditation: |-
|
gurumeditation: |-
|
||||||
The VM is in the "guru meditation" state. This is a rare case which means
|
The VM is in the "guru meditation" state. This is a rare case which means
|
||||||
that an internal error in VitualBox caused the VM to fail. This is always
|
that an internal error in VirtualBox caused the VM to fail. This is always
|
||||||
the sign of a bug in VirtualBox. You can try to bring your VM back online
|
the sign of a bug in VirtualBox. You can try to bring your VM back online
|
||||||
with a `vagrant up`.
|
with a `vagrant up`.
|
||||||
inaccessible: |-
|
inaccessible: |-
|
||||||
|
|
|
@ -19,5 +19,5 @@ en:
|
||||||
specified a FQDN instead of just a host name.
|
specified a FQDN instead of just a host name.
|
||||||
|
|
||||||
Ensure the new guest name is properly formatted. Standard names may
|
Ensure the new guest name is properly formatted. Standard names may
|
||||||
contain letters (a-z, A-Z), numbers (0-9), and hypens (-), but no
|
contain letters (a-z, A-Z), numbers (0-9), and hyphens (-), but no
|
||||||
spaces or periods (.). The name may not consist entirely of digits.
|
spaces or periods (.). The name may not consist entirely of digits.
|
||||||
|
|
|
@ -118,7 +118,7 @@ en:
|
||||||
|
|
||||||
errors:
|
errors:
|
||||||
compose_lock_timeout: |-
|
compose_lock_timeout: |-
|
||||||
Vagrant enountered a timeout waiting for the docker compose driver
|
Vagrant encountered a timeout waiting for the docker compose driver
|
||||||
to become available. Please try to run your command again. If you
|
to become available. Please try to run your command again. If you
|
||||||
continue to experience this error it may be resolved by disabling
|
continue to experience this error it may be resolved by disabling
|
||||||
parallel execution.
|
parallel execution.
|
||||||
|
|
|
@ -20,10 +20,10 @@ en:
|
||||||
|
|
||||||
uac:
|
uac:
|
||||||
prune_warning: |-
|
prune_warning: |-
|
||||||
Vagrant requires administator access for pruning SMB shares and
|
Vagrant requires administrator access for pruning SMB shares and
|
||||||
may request access to complete removal of stale shares.
|
may request access to complete removal of stale shares.
|
||||||
create_warning: |-
|
create_warning: |-
|
||||||
Vagrant requires administator access to create SMB shares and
|
Vagrant requires administrator access to create SMB shares and
|
||||||
may request access to complete setup of configured shares.
|
may request access to complete setup of configured shares.
|
||||||
errors:
|
errors:
|
||||||
start_failed: |-
|
start_failed: |-
|
||||||
|
|
|
@ -17,7 +17,7 @@ class IsolatedEnvironment
|
||||||
attr_reader :workdir
|
attr_reader :workdir
|
||||||
|
|
||||||
# Initializes an isolated environment. You can pass in some
|
# Initializes an isolated environment. You can pass in some
|
||||||
# options here to configure runing custom applications in place
|
# options here to configure running custom applications in place
|
||||||
# of others as well as specifying environmental variables.
|
# of others as well as specifying environmental variables.
|
||||||
#
|
#
|
||||||
# @param [Hash] apps A mapping of application name (such as "vagrant")
|
# @param [Hash] apps A mapping of application name (such as "vagrant")
|
||||||
|
|
|
@ -129,7 +129,7 @@ describe VagrantPlugins::CommunicatorWinRM::WinRMShell do
|
||||||
# Note: The initialize for WinRMAuthorizationError may require a status_code as
|
# Note: The initialize for WinRMAuthorizationError may require a status_code as
|
||||||
# the second argument in a future WinRM release. Currently it doesn't track the
|
# the second argument in a future WinRM release. Currently it doesn't track the
|
||||||
# status code.
|
# status code.
|
||||||
WinRM::WinRMAuthorizationError.new("Oh no!! Unauthrorized")
|
WinRM::WinRMAuthorizationError.new("Oh no!! Unauthorized")
|
||||||
)
|
)
|
||||||
expect { subject.wql("select * from Win32_OperatingSystem") }.to raise_error(
|
expect { subject.wql("select * from Win32_OperatingSystem") }.to raise_error(
|
||||||
VagrantPlugins::CommunicatorWinRM::Errors::AuthenticationFailed)
|
VagrantPlugins::CommunicatorWinRM::Errors::AuthenticationFailed)
|
||||||
|
|
|
@ -18,7 +18,7 @@ describe "VagrantPlugins::GuestSolaris11::Cap::ConfigureNetworks" do
|
||||||
comm.verify_expectations!
|
comm.verify_expectations!
|
||||||
end
|
end
|
||||||
|
|
||||||
describe ".configufre_networks" do
|
describe ".configure_networks" do
|
||||||
let(:cap) { caps.get(:configure_networks) }
|
let(:cap) { caps.get(:configure_networks) }
|
||||||
let(:network_1) do
|
let(:network_1) do
|
||||||
{
|
{
|
||||||
|
|
|
@ -385,7 +385,7 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
|
||||||
expect(r[1].run).to eql(:always)
|
expect(r[1].run).to eql(:always)
|
||||||
end
|
end
|
||||||
|
|
||||||
it "allows provisioner settings to be overriden" do
|
it "allows provisioner settings to be overridden" do
|
||||||
subject.provision("s", path: "foo", type: "shell") { |s| s.inline = "foo" }
|
subject.provision("s", path: "foo", type: "shell") { |s| s.inline = "foo" }
|
||||||
subject.provision("s", inline: "bar", type: "shell") { |s| s.args = "bar" }
|
subject.provision("s", inline: "bar", type: "shell") { |s| s.args = "bar" }
|
||||||
subject.finalize!
|
subject.finalize!
|
||||||
|
|
|
@ -56,7 +56,7 @@ describe VagrantPlugins::DockerProvider::Driver::Compose do
|
||||||
|
|
||||||
describe '#create' do
|
describe '#create' do
|
||||||
let(:params) { {
|
let(:params) { {
|
||||||
image: 'jimi/hendrix:eletric-ladyland',
|
image: 'jimi/hendrix:electric-ladyland',
|
||||||
cmd: ['play', 'voodoo-chile'],
|
cmd: ['play', 'voodoo-chile'],
|
||||||
ports: '8080:80',
|
ports: '8080:80',
|
||||||
volumes: '/host/path:guest/path',
|
volumes: '/host/path:guest/path',
|
||||||
|
|
|
@ -12,7 +12,7 @@ describe VagrantPlugins::DockerProvider::Driver do
|
||||||
|
|
||||||
describe '#create' do
|
describe '#create' do
|
||||||
let(:params) { {
|
let(:params) { {
|
||||||
image: 'jimi/hendrix:eletric-ladyland',
|
image: 'jimi/hendrix:electric-ladyland',
|
||||||
cmd: ['play', 'voodoo-chile'],
|
cmd: ['play', 'voodoo-chile'],
|
||||||
ports: '8080:80',
|
ports: '8080:80',
|
||||||
volumes: '/host/path:guest/path',
|
volumes: '/host/path:guest/path',
|
||||||
|
|
|
@ -435,7 +435,7 @@ VF
|
||||||
before do
|
before do
|
||||||
config.playbook_command = "custom-ansible-playbook"
|
config.playbook_command = "custom-ansible-playbook"
|
||||||
|
|
||||||
# set the compatibility mode to ensure that only ansible-playbook is excuted
|
# set the compatibility mode to ensure that only ansible-playbook is executed
|
||||||
config.compatibility_mode = VagrantPlugins::Ansible::COMPATIBILITY_MODE_V1_8
|
config.compatibility_mode = VagrantPlugins::Ansible::COMPATIBILITY_MODE_V1_8
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -79,7 +79,7 @@ shared_context "unit" do
|
||||||
# @return [Pathname]
|
# @return [Pathname]
|
||||||
def temporary_dir
|
def temporary_dir
|
||||||
# Create a temporary directory and append it to the instance
|
# Create a temporary directory and append it to the instance
|
||||||
# variabe so that it isn't garbage collected and deleted
|
# variable so that it isn't garbage collected and deleted
|
||||||
d = Dir.mktmpdir("vagrant-temporary-dir")
|
d = Dir.mktmpdir("vagrant-temporary-dir")
|
||||||
@_temp_files ||= []
|
@_temp_files ||= []
|
||||||
@_temp_files << d
|
@_temp_files << d
|
||||||
|
|
|
@ -12,7 +12,7 @@ describe Vagrant::Action::Builtin::GracefulHalt do
|
||||||
end
|
end
|
||||||
let(:machine_config) do
|
let(:machine_config) do
|
||||||
double("machine_config").tap do |top_config|
|
double("machine_config").tap do |top_config|
|
||||||
vm_config = double("machien_vm_config")
|
vm_config = double("machine_vm_config")
|
||||||
allow(vm_config).to receive(:graceful_halt_timeout).and_return(10)
|
allow(vm_config).to receive(:graceful_halt_timeout).and_return(10)
|
||||||
allow(top_config).to receive(:vm).and_return(vm_config)
|
allow(top_config).to receive(:vm).and_return(vm_config)
|
||||||
end
|
end
|
||||||
|
|
|
@ -8,7 +8,7 @@ describe Vagrant::Config::Loader do
|
||||||
# This is the current version of configuration for the tests.
|
# This is the current version of configuration for the tests.
|
||||||
let(:current_version) { version_order.last }
|
let(:current_version) { version_order.last }
|
||||||
|
|
||||||
# This is just a dummy implementation of a configuraiton loader which
|
# This is just a dummy implementation of a configuration loader which
|
||||||
# simply acts on hashes.
|
# simply acts on hashes.
|
||||||
let(:test_loader) do
|
let(:test_loader) do
|
||||||
Class.new(Vagrant::Config::VersionBase) do
|
Class.new(Vagrant::Config::VersionBase) do
|
||||||
|
|
|
@ -119,7 +119,7 @@ describe Vagrant do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
it "prefers VAGRANT_HOME over USERPOFILE if both are set" do
|
it "prefers VAGRANT_HOME over USERPROFILE if both are set" do
|
||||||
env = {
|
env = {
|
||||||
"USERPROFILE" => "/bar",
|
"USERPROFILE" => "/bar",
|
||||||
"VAGRANT_HOME" => "/foo",
|
"VAGRANT_HOME" => "/foo",
|
||||||
|
|
|
@ -385,7 +385,7 @@ describe Vagrant::UI::Prefixed do
|
||||||
subject.output("foo\nbar")
|
subject.output("foo\nbar")
|
||||||
end
|
end
|
||||||
|
|
||||||
it "doesn't prefix if requestsed" do
|
it "doesn't prefix if requested" do
|
||||||
expect(ui).to receive(:output).with("foo", prefix: false, bold: true, target: prefix)
|
expect(ui).to receive(:output).with("foo", prefix: false, bold: true, target: prefix)
|
||||||
subject.output("foo", prefix: false)
|
subject.output("foo", prefix: false)
|
||||||
end
|
end
|
||||||
|
|
|
@ -59,7 +59,7 @@ describe Vagrant::Util::CheckpointClient do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "#display" do
|
describe "#display" do
|
||||||
it "should only dislay once" do
|
it "should only display once" do
|
||||||
expect(subject).to receive(:version_check).once
|
expect(subject).to receive(:version_check).once
|
||||||
expect(subject).to receive(:alerts_check).once
|
expect(subject).to receive(:alerts_check).once
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ describe Vagrant::Util::SSH do
|
||||||
|
|
||||||
let(:ssh_path) { "/usr/bin/ssh" }
|
let(:ssh_path) { "/usr/bin/ssh" }
|
||||||
|
|
||||||
it "searches original PATH for exectuable" do
|
it "searches original PATH for executable" do
|
||||||
expect(Vagrant::Util::Which).to receive(:which).with("ssh", original_path: true).and_return("valid-return")
|
expect(Vagrant::Util::Which).to receive(:which).with("ssh", original_path: true).and_return("valid-return")
|
||||||
allow(Vagrant::Util::SafeExec).to receive(:exec).and_return(nil)
|
allow(Vagrant::Util::SafeExec).to receive(:exec).and_return(nil)
|
||||||
described_class.exec(ssh_info)
|
described_class.exec(ssh_info)
|
||||||
|
|
|
@ -67,5 +67,5 @@ $ vagrant init my-company-box https://boxes.company.com/my-company.box
|
||||||
Create a Vagrantfile, locking the box to a version constraint:
|
Create a Vagrantfile, locking the box to a version constraint:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
$ vagrant init --box-version '> 0.1.5' hashcorp/precise64
|
$ vagrant init --box-version '> 0.1.5' hashicorp/precise64
|
||||||
```
|
```
|
||||||
|
|
|
@ -41,7 +41,7 @@ it!
|
||||||
|
|
||||||
## Format
|
## Format
|
||||||
|
|
||||||
The machine readable format is a line-oriented, comma-delimeted text format.
|
The machine readable format is a line-oriented, comma-delimited text format.
|
||||||
This makes it extremely easy to parse using standard Unix tools such as awk or
|
This makes it extremely easy to parse using standard Unix tools such as awk or
|
||||||
grep in addition to full programming languages like Ruby or Python.
|
grep in addition to full programming languages like Ruby or Python.
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ you may set. A complete reference is shown below:
|
||||||
* `ip_address_timeout` (integer) - The time in seconds to wait for the
|
* `ip_address_timeout` (integer) - The time in seconds to wait for the
|
||||||
virtual machine to report an IP address. This defaults to 120 seconds.
|
virtual machine to report an IP address. This defaults to 120 seconds.
|
||||||
This may have to be increased if your VM takes longer to boot.
|
This may have to be increased if your VM takes longer to boot.
|
||||||
* `differencing_disk` (boolean) - Switch to use differencing disk intead of cloning whole VHD.
|
* `differencing_disk` (boolean) - Switch to use differencing disk instead of cloning whole VHD.
|
||||||
* `enable_virtualization_extensions` (boolean) - Enable virtualization extensions for the virtual CPUs.
|
* `enable_virtualization_extensions` (boolean) - Enable virtualization extensions for the virtual CPUs.
|
||||||
This allows Hyper-V to be nested and run inside another Hyper-VM VM. It requires Windows 10 - 1511 (build 10586) or newer.
|
This allows Hyper-V to be nested and run inside another Hyper-VM VM. It requires Windows 10 - 1511 (build 10586) or newer.
|
||||||
Default is not defined. This will be disabled if not set.
|
Default is not defined. This will be disabled if not set.
|
||||||
|
|
|
@ -195,7 +195,7 @@ As of Vagrant 1.7.3, Vagrant tries to intelligently detect if it is running in
|
||||||
the installer or running via Bundler. Although not officially supported, Vagrant
|
the installer or running via Bundler. Although not officially supported, Vagrant
|
||||||
tries its best to work when executed via Bundler. When Vagrant detects that you
|
tries its best to work when executed via Bundler. When Vagrant detects that you
|
||||||
have spawned a subprocess that lives outside of Vagrant's installer, Vagrant
|
have spawned a subprocess that lives outside of Vagrant's installer, Vagrant
|
||||||
will do its best to reset the preserved environment dring the subprocess
|
will do its best to reset the preserved environment during the subprocess
|
||||||
execution.
|
execution.
|
||||||
|
|
||||||
If Vagrant detects it is running outside of the officially installer, the
|
If Vagrant detects it is running outside of the officially installer, the
|
||||||
|
@ -215,7 +215,7 @@ different configurations.
|
||||||
## `VAGRANT_DISABLE_VBOXSYMLINKCREATE`
|
## `VAGRANT_DISABLE_VBOXSYMLINKCREATE`
|
||||||
|
|
||||||
If set, this will disable the ability to create symlinks with all virtualbox
|
If set, this will disable the ability to create symlinks with all virtualbox
|
||||||
shared folders. Defaults to true if the option is not set. This can be overriden
|
shared folders. Defaults to true if the option is not set. This can be overridden
|
||||||
on a per-folder basis within your Vagrantfile config by settings the
|
on a per-folder basis within your Vagrantfile config by settings the
|
||||||
`SharedFoldersEnableSymlinksCreate` option to true.
|
`SharedFoldersEnableSymlinksCreate` option to true.
|
||||||
|
|
||||||
|
|
|
@ -50,7 +50,7 @@ that this list is not exhaustive and additional hooks can be added via plugins.
|
||||||
virtual machine is down.
|
virtual machine is down.
|
||||||
|
|
||||||
|
|
||||||
- `machine_action_halt` - called after the hypervision has moved the machine
|
- `machine_action_halt` - called after the hypervisor has moved the machine
|
||||||
into a halted state (usually "stopped" but not "terminated").
|
into a halted state (usually "stopped" but not "terminated").
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -3,14 +3,14 @@ layout: "docs"
|
||||||
page_title: "Command Plugins - Plugin Development"
|
page_title: "Command Plugins - Plugin Development"
|
||||||
sidebar_current: "plugins-commands"
|
sidebar_current: "plugins-commands"
|
||||||
description: |-
|
description: |-
|
||||||
This page documents how to add new commands to Vagrant, invokable
|
This page documents how to add new commands to Vagrant, invocable
|
||||||
via "vagrant YOUR-COMMAND". Prior to reading this, you should be familiar
|
via "vagrant YOUR-COMMAND". Prior to reading this, you should be familiar
|
||||||
with the plugin development basics.
|
with the plugin development basics.
|
||||||
---
|
---
|
||||||
|
|
||||||
# Plugin Development: Commands
|
# Plugin Development: Commands
|
||||||
|
|
||||||
This page documents how to add new commands to Vagrant, invokable
|
This page documents how to add new commands to Vagrant, invocable
|
||||||
via `vagrant YOUR-COMMAND`. Prior to reading this, you should be familiar
|
via `vagrant YOUR-COMMAND`. Prior to reading this, you should be familiar
|
||||||
with the [plugin development basics](/docs/plugins/development-basics.html).
|
with the [plugin development basics](/docs/plugins/development-basics.html).
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ end
|
||||||
|
|
||||||
Commands are defined with the `command` method, which takes as an argument
|
Commands are defined with the `command` method, which takes as an argument
|
||||||
the name of the command, in this case "foo." This means the command will be
|
the name of the command, in this case "foo." This means the command will be
|
||||||
invokable via `vagrant foo`. Then the block argument returns a class that
|
invocable via `vagrant foo`. Then the block argument returns a class that
|
||||||
implements the `Vagrant.plugin(2, "command")` interface.
|
implements the `Vagrant.plugin(2, "command")` interface.
|
||||||
|
|
||||||
You can also define _non-primary commands_. These commands do not show
|
You can also define _non-primary commands_. These commands do not show
|
||||||
|
|
|
@ -155,7 +155,7 @@ Some of these options are for advanced usage only and should not be used unless
|
||||||
|
|
||||||
<div class="alert alert-warn">
|
<div class="alert alert-warn">
|
||||||
<strong>Attention:</strong>
|
<strong>Attention:</strong>
|
||||||
The `ansible` provisioner does not support whitespace characters in `raw_arguments` elements. Therefore **don't write** something like `["-c paramiko"]`, which will result with an invalid `" parmiko"` parameter value.
|
The `ansible` provisioner does not support whitespace characters in `raw_arguments` elements. Therefore **don't write** something like `["-c paramiko"]`, which will result with an invalid `" paramiko"` parameter value.
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
- `skip_tags` (string or array of strings) - Only plays, roles and tasks that [*do not match* these values will be executed](https://docs.ansible.com/playbooks_tags.html).
|
- `skip_tags` (string or array of strings) - Only plays, roles and tasks that [*do not match* these values will be executed](https://docs.ansible.com/playbooks_tags.html).
|
||||||
|
|
|
@ -250,7 +250,7 @@ Creates a new token for the given user.
|
||||||
#### Arguments
|
#### Arguments
|
||||||
|
|
||||||
* `token`
|
* `token`
|
||||||
* `desription` (Optional) - A description of the token.
|
* `description` (Optional) - A description of the token.
|
||||||
* `two_factor`
|
* `two_factor`
|
||||||
* `code` - A two-factor authentication code. Required to use this API method if 2FA is enabled. See [Request a 2FA code](#request-a-2fa-code) if not using a TOTP application.
|
* `code` - A two-factor authentication code. Required to use this API method if 2FA is enabled. See [Request a 2FA code](#request-a-2fa-code) if not using a TOTP application.
|
||||||
* `user`
|
* `user`
|
||||||
|
@ -1315,7 +1315,7 @@ Response body is identical to [Reading a provider](#read-a-provider).
|
||||||
"Authorization" => "Bearer #{ENV['VAGRANT_CLOUD_TOKEN']}"
|
"Authorization" => "Bearer #{ENV['VAGRANT_CLOUD_TOKEN']}"
|
||||||
)
|
)
|
||||||
|
|
||||||
response = api.delete("/api/v1/box/myuser/test/verison/1.2.3/provider/virtualbox")
|
response = api.delete("/api/v1/box/myuser/test/version/1.2.3/provider/virtualbox")
|
||||||
|
|
||||||
if response.status.success?
|
if response.status.success?
|
||||||
# Success, the response attributes are available here.
|
# Success, the response attributes are available here.
|
||||||
|
|
|
@ -36,7 +36,7 @@ are some things to note when you're choosing a box:
|
||||||
- __The username of the user__. If it's `bento` or `canonical`, you can likely
|
- __The username of the user__. If it's `bento` or `canonical`, you can likely
|
||||||
trust the box more than an anonymous user
|
trust the box more than an anonymous user
|
||||||
- __The number of downloads of the box__. Heavily downloaded boxes
|
- __The number of downloads of the box__. Heavily downloaded boxes
|
||||||
are likely vetted more often by other members of the community. Hashicorp
|
are likely vetted more often by other members of the community. HashiCorp
|
||||||
responds to reports of malicious software distributed via Vagrant Cloud
|
responds to reports of malicious software distributed via Vagrant Cloud
|
||||||
and takes down boxes
|
and takes down boxes
|
||||||
- __The latest release date__. More up-to-date boxes contain up-to-date
|
- __The latest release date__. More up-to-date boxes contain up-to-date
|
||||||
|
|
|
@ -127,7 +127,7 @@ really only exposed for cases where it is absolutely necessary. If you can find
|
||||||
a way to not use a pty, that is recommended instead.
|
a way to not use a pty, that is recommended instead.
|
||||||
|
|
||||||
When pty is enabled, it is important to note that command output will _not_ be
|
When pty is enabled, it is important to note that command output will _not_ be
|
||||||
streamed to the UI. Instead, the output will be delievered in full to the UI
|
streamed to the UI. Instead, the output will be delivered in full to the UI
|
||||||
once the command has completed.
|
once the command has completed.
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
|
|
|
@ -158,7 +158,7 @@ config.winssh.export_command_template = '$env:%ENV_KEY%="%ENV_VALUE%"'
|
||||||
```
|
```
|
||||||
|
|
||||||
`config.winssh.sudo_command` - The command to use when executing a command
|
`config.winssh.sudo_command` - The command to use when executing a command
|
||||||
with `sudo`. This defaults to `%c` (assumes vagrant user is an administator
|
with `sudo`. This defaults to `%c` (assumes vagrant user is an administrator
|
||||||
and needs no escalation). The `%c` will be replaced by the command that is
|
and needs no escalation). The `%c` will be replaced by the command that is
|
||||||
being executed.
|
being executed.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue