haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show node name in logging

This commit is contained in:
Nate Smith 2012-12-17 11:58:15 -05:00
parent 370d6b0c98
commit 94ce12683e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/provisioners/chef/provisioner/chef_client.rb
View File

@ -142,7 +142,7 @@ module VagrantPlugins
def delete_from_chef_server(deletable) def delete_from_chef_server(deletable)
node_name = (config.node_name || env[:vm].config.vm.host_name) node_name = (config.node_name || env[:vm].config.vm.host_name)
env[:ui].info I18n.t("vagrant.provisioners.chef.deleting_from_server", env[:ui].info I18n.t("vagrant.provisioners.chef.deleting_from_server",
:deletable => deletable) :deletable => deletable, :name => node_name)
Kernel.system("knife #{deletable} delete --yes #{node_name}") Kernel.system("knife #{deletable} delete --yes #{node_name}")
end end
end end

2
templates/locales/en.yml
View File

@ -721,7 +721,7 @@ en:
server_validation_key_doesnt_exist: |- server_validation_key_doesnt_exist: |-
The validation key set for `config.chef.validation_key_path` does not exist! This The validation key set for `config.chef.validation_key_path` does not exist! This
file needs to exist so it can be uploaded to the virtual machine. file needs to exist so it can be uploaded to the virtual machine.
deleting_from_server: "Deleting %{deletable} from Chef server..." deleting_from_server: "Deleting %{deletable} \"%{name}\" from Chef server..."
puppet: puppet:
not_detected: |- not_detected: |-