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

Fix some puppet translation

This commit is contained in:
Mitchell Hashimoto 2012-01-27 10:52:27 -08:00
parent 0714c235fe
commit e1dbc7f9b1
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vagrant/provisioners/puppet.rb
View File

@ -130,7 +130,7 @@ module Vagrant
def verify_binary(binary) def verify_binary(binary)
env[:vm].channel.sudo("which #{binary}", env[:vm].channel.sudo("which #{binary}",
:error_class => PuppetError, :error_class => PuppetError,
:error_key => :puppet_not_detected, :error_key => :not_detected,
:binary => binary) :binary => binary)
end end

2
lib/vagrant/provisioners/puppet_server.rb
View File

@ -29,7 +29,7 @@ module Vagrant
def verify_binary(binary) def verify_binary(binary)
env[:vm].channel.sudo("which #{binary}", env[:vm].channel.sudo("which #{binary}",
:error_class => PuppetServerError, :error_class => PuppetServerError,
:error_key => :puppetd_not_detected, :error_key => :not_detected,
:binary => binary) :binary => binary)
end end

6
templates/locales/en.yml
View File

@ -16,12 +16,6 @@ en:
errors: errors:
base_vm_not_found: The base VM with the name '%{name}' was not found. base_vm_not_found: The base VM with the name '%{name}' was not found.
box_not_found: Box '%{name}' could not be found. box_not_found: Box '%{name}' could not be found.
puppet_not_detected: |-
The `puppet` binary was not found on the VM and is required for Puppet provisioning.
Please verify that Puppet is installed and that the binary is available on the PATH.
puppetd_not_detected: |-
The `puppetd` binary was not found on the VM is required for Puppet Server provisioning.
Please verify that Puppet is installed and that the binary is available on the PATH.
cli_invalid_options: |- cli_invalid_options: |-
An invalid option was specified. The help for this command An invalid option was specified. The help for this command
is available below. is available below.