diff --git a/lib/vagrant/errors.rb b/lib/vagrant/errors.rb index fe64c4a77..25b1e8444 100644 --- a/lib/vagrant/errors.rb +++ b/lib/vagrant/errors.rb @@ -116,10 +116,6 @@ module Vagrant error_key(:ansible_playbook_app_not_found) end - class BaseVMNotFound < VagrantError - error_key(:base_vm_not_found) - end - class BatchMultiError < VagrantError error_key(:batch_multi_error) end @@ -152,18 +148,10 @@ module Vagrant error_key(:box_not_found) end - class BoxNotSpecified < VagrantError - error_key(:not_specified, "vagrant.actions.vm.check_box") - end - class BoxProviderDoesntMatch < VagrantError error_key(:box_provider_doesnt_match) end - class BoxSpecifiedDoesntExist < VagrantError - error_key(:does_not_exist, "vagrant.actions.vm.check_box") - end - class BoxUnpackageFailure < VagrantError error_key(:untar_failure, "vagrant.actions.box.unpackage") end @@ -248,10 +236,6 @@ module Vagrant error_key(:destroy_requires_force) end - class DotfileIsDirectory < VagrantError - error_key(:dotfile_is_directory) - end - class DotfileUpgradeJSONError < VagrantError error_key(:dotfile_upgrade_json_error) end @@ -272,14 +256,6 @@ module Vagrant error_key(:environment_locked) end - class GemCommandInBundler < VagrantError - error_key(:gem_command_in_bundler) - end - - class HomeDirectoryMigrationFailed < VagrantError - error_key(:home_dir_migration_failed) - end - class HomeDirectoryNotAccessible < VagrantError error_key(:home_dir_not_accessible) end @@ -296,10 +272,6 @@ module Vagrant error_key(:collision_error, "vagrant.actions.vm.forward_ports") end - class ForwardPortCollisionResume < VagrantError - error_key(:port_collision_resume) - end - class GuestCapabilityInvalid < VagrantError error_key(:guest_capability_invalid) end @@ -348,26 +320,14 @@ module Vagrant error_key(:machine_state_invalid) end - class MultiVMEnvironmentRequired < VagrantError - error_key(:multi_vm_required) - end - class MultiVMTargetRequired < VagrantError error_key(:multi_vm_target_required) end - class NetworkAdapterCollision < VagrantError - error_key(:adapter_collision, "vagrant.actions.vm.network") - end - class NetworkCollision < VagrantError error_key(:collides, "vagrant.actions.vm.host_only_network") end - class NetworkNoAdapters < VagrantError - error_key(:no_adapters, "vagrant.actions.vm.network") - end - class NetworkDHCPAlreadyAttached < VagrantError error_key(:dhcp_already_attached, "vagrant.actions.vm.network") end @@ -432,26 +392,14 @@ module Vagrant error_key(:provisioner_flag_invalid) end - class PluginGemError < VagrantError - error_key(:plugin_gem_error) - end - class PluginGemNotFound < VagrantError error_key(:plugin_gem_not_found) end - class PluginInstallBadEntryPoint < VagrantError - error_key(:plugin_install_bad_entry_point) - end - class PluginInstallLicenseNotFound < VagrantError error_key(:plugin_install_license_not_found) end - class PluginInstallNotFound < VagrantError - error_key(:plugin_install_not_found) - end - class PluginInstallVersionConflict < VagrantError error_key(:plugin_install_version_conflict) end @@ -460,10 +408,6 @@ module Vagrant error_key(:plugin_load_error) end - class PluginNotFound < VagrantError - error_key(:plugin_not_found) - end - class PluginNotInstalled < VagrantError error_key(:plugin_not_installed) end @@ -536,10 +480,6 @@ module Vagrant error_key(:ssh_not_ready) end - class SSHPortNotDetected < VagrantError - error_key(:ssh_port_not_detected) - end - class SSHRunRequiresKeys < VagrantError error_key(:ssh_run_requires_keys) end @@ -640,18 +580,6 @@ module Vagrant error_key(:failure, "vagrant.actions.vm.customize") end - class VMFailedToBoot < VagrantError - error_key(:failed_to_boot, "vagrant.actions.vm.boot") - end - - class VMFailedToRun < VagrantError - error_key(:failed_to_run, "vagrant.actions.vm.boot") - end - - class VMGuestError < VagrantError - error_namespace("vagrant.errors.guest") - end - class VMImportFailure < VagrantError error_key(:failure, "vagrant.actions.vm.import") end diff --git a/templates/locales/en.yml b/templates/locales/en.yml index c6f082a98..9d2894d32 100644 --- a/templates/locales/en.yml +++ b/templates/locales/en.yml @@ -174,7 +174,6 @@ en: If you haven't installed Ansible yet, please install Ansible on your system. Vagrant can't do this for you in a safe, automated way. Please see ansible.cc for more info. - base_vm_not_found: The base VM with the name '%{name}' was not found. batch_multi_error: |- An error occurred while executing multiple actions in parallel. Any errors that occurred are shown below. @@ -324,12 +323,6 @@ en: Destroy doesn't have a TTY to ask for confirmation. Please pass the `--force` flag to force a destroy, otherwise attach a TTY so that the destroy can be confirmed. - dotfile_is_directory: |- - The local file Vagrant uses to store data ".vagrant" already exists - and is a directory! If you are in your home directory, then please run - this command in another directory. If you aren't in a home directory, - then please rename ".vagrant" to something else, or configure Vagrant - to use another filename by modifying `config.vagrant.dotfile_name`. dotfile_upgrade_json_error: |- A Vagrant 1.0.x local state file was found. Vagrant is able to upgrade this to the latest format automatically, however various checks are @@ -378,12 +371,6 @@ en: freebsd_nfs_whitespace: |- FreeBSD hosts do not support sharing directories with whitespace in their path. Please adjust your path accordingly. - gem_command_in_bundler: |- - You cannot run the `vagrant plugin` command while in a bundler environment. - This should generally never happen unless Vagrant is installed outside - of the official installers or another gem is wrongly attempting to - use Vagrant internals directly. Please properly install Vagrant to - fix this. If this error persists, please contact support. guest_capability_invalid: |- The registered guest capability '%{cap}' for the detected guest OS '%{guest}' is invalid. The capability does @@ -406,13 +393,6 @@ en: as mounting shared folders and configuring networks. Please add the ability to detect this guest operating system to Vagrant by creating a plugin or reporting a bug. - home_dir_migration_failed: |- - Both an old and new Vagrant home directory exist. Only the new one will - be used. Please merge the old directory into the new directory if you'd - like to use the old data as well. - - Old: %{old} - New: %{new} home_dir_not_accessible: |- The home directory you specified is not accessible. The home directory that Vagrant uses must be both readable and writable. @@ -463,8 +443,6 @@ en: the provider you're using, and not with Vagrant itself or with any configuration you may have done. Please report this bug to the proper location. - multi_vm_required: |- - A multi-vm environment is required for name specification to this command. multi_vm_target_required: |- This command requires a specific VM name to target in a multi-VM environment. nfs_bad_exports: |- @@ -503,26 +481,13 @@ en: A Vagrant environment is required to run this command. Run `vagrant init` to set one up in this directory, or change to a directory with a Vagrantfile and try again. - plugin_gem_error: |- - An error occurred within RubyGems, the underlying system used to - manage Vagrant plugins. The output of the errors are shown below: - - %{output} plugin_gem_not_found: |- The plugin '%{name}' could not be installed because it could not be found. Please double check the name and try again. - plugin_install_bad_entry_point: |- - Attempting to load the plugin '%{name}' failed, because - the entry point doesn't exist. The entry point attempted was - '%{entry_point}'. If this is not correct, please manually - specify an `--entry-point` when installing the plugin. plugin_install_license_not_found: |- The license file to install could not be found. Please verify the path you gave is correct. The path to the license file given was: '%{path}' - plugin_install_not_found: |- - The plugin '%{name}' could not be found in local or remote - repositories. Please check the name of the plugin and try again. plugin_install_version_conflict: |- The plugin(s) can't be installed due to the version conflicts below. This means that the plugins depend on a library version that conflicts @@ -538,9 +503,6 @@ en: shown below. %{message} - plugin_not_found: |- - The plugin '%{name}' could not be found. Please install this plugin - prior to attempting to do anything with it. plugin_not_installed: |- The plugin '%{name}' is not installed. Please install it first. plugin_state_file_not_parsable: |- @@ -549,12 +511,6 @@ en: Please remove the file and reinstall the plugins. If this error recurs, please report a bug. - port_collision_resume: |- - This VM cannot be resumed, because the forwarded ports would collide - with a running program (it could be another virtual machine). Normally, - Vagrant will attempt to fix this for you but VirtualBox only allows - forwarded ports to change if the VM is powered off. Therefore, please - reload your VM or stop the other program to continue. provider_not_found: |- The provider '%{provider}' could not be found, but was requested to back the machine '%{machine}'. Please use a provider that exists. @@ -672,6 +628,7 @@ en: that the machine is in the state that you expect. If you continue to get this error message, please view the documentation for the provider you're using. + ssh_run_requires_keys: |- ssh_port_not_detected: |- Vagrant couldn't determine the SSH port for your VM! Vagrant attempts to automatically find a forwarded port that matches your `config.ssh.guest_port` @@ -683,7 +640,6 @@ en: Please make sure that you have a forwarded port that goes to the configured guest port value, or specify an explicit SSH port with `config.ssh.port`. - ssh_run_requires_keys: |- Using `vagrant ssh -c` requires key-based SSH authentication, but your Vagrant environmet is configured to use only password-based authentication. Please configure your Vagrantfile with a private key to use this @@ -1019,14 +975,6 @@ en: vm: boot: booting: Booting VM... - failed_to_boot: |- - Failed to connect to VM via SSH. Please verify the VM successfully booted - by looking at the VirtualBox GUI. - failed_to_run: |- - The VM failed to remain in the "running" state while attempting to boot. - This is normally caused by a misconfiguration or host system incompatibilities. - Please open the VirtualBox GUI and attempt to boot the virtual machine - manually to get a more informative error message. bridged_networking: available: |- Available bridged network interfaces: @@ -1046,15 +994,6 @@ en: a box for this provider, you should interrupt Vagrant now and add the box yourself. Otherwise Vagrant will attempt to download the full box prior to discovering this error. - not_specified: |- - No base box was specified! A base box is required as a staring point - for every vagrant virtual machine. Please specify one in your Vagrantfile - using `config.vm.box` - does_not_exist: |- - Specified box `%{name}` does not exist! - - The box must be added through the `vagrant box add` command. Please view - the documentation associated with the command for more information. check_guest_additions: not_detected: |- No guest additions were detected on the base box for this VM! Guest @@ -1160,10 +1099,6 @@ en: MAC address is typically up to the box and box maintiner. Please contact the relevant person to solve this issue. network: - adapter_collision: |- - More than one network have been assigned to the same adapter. Please - make sure your networks you've configured in your Vagrantfile do not - overlap. configuring: |- Configuring and enabling network interfaces... dhcp_already_attached: |- @@ -1174,11 +1109,6 @@ en: host only network interface can have only one DHCP server. Please reconfigure your host only network or remove the virtual machine using the other host only network. - no_adapters: |- - No available adapters on the virtual machine were found to accomodate - for all configured networks. VirtualBox virtual machines have 8 - network interfaces available usually, so please lower the number of - networks to below 8. preparing: |- Preparing network interfaces based on configuration... host_only_network: