From 54e640b0c92ee465719ef7780df44a64cd3705d1 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 3 Jan 2014 11:22:05 -0800 Subject: [PATCH] communicators/ssh: output UI when inserting key --- plugins/communicators/ssh/communicator.rb | 3 ++- templates/locales/en.yml | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/communicators/ssh/communicator.rb b/plugins/communicators/ssh/communicator.rb index 59cc65787..681ce7fde 100644 --- a/plugins/communicators/ssh/communicator.rb +++ b/plugins/communicators/ssh/communicator.rb @@ -60,6 +60,7 @@ module VagrantPlugins ssh_info = @machine.ssh_info if ssh_info[:password] && ssh_info[:private_key_path].empty? @logger.info("Inserting insecure key to avoid password") + @machine.ui.info(I18n.t("vagrant.inserting_insecure_key")) @machine.guest.capability( :insert_public_key, Vagrant.source_root.join("keys", "vagrant.pub").read) @@ -70,7 +71,7 @@ module VagrantPlugins f.write(Vagrant.source_root.join("keys", "vagrant").read) end - @logger.info("Disconecting SSH so we can reconnect with new SSH key") + @machine.ui.info(I18n.t("vagrant.inserted_key")) @connection.close @connection = nil diff --git a/templates/locales/en.yml b/templates/locales/en.yml index 55d99a88c..b3939491f 100644 --- a/templates/locales/en.yml +++ b/templates/locales/en.yml @@ -58,6 +58,10 @@ en: docker_install_with_version_not_supported: |- Vagrant is not capable of installing an specific version of Docker onto the guest machine and the latest version will be installed. + inserted_key: |- + Key inserted! Disconnecting and reconnecting using new SSH key... + inserting_insecure_key: |- + Inserting Vagrant public key within guest... plugin_needs_reinstall: |- The following plugins were installed with a version of Vagrant that had different versions of underlying components. Because