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

Do not throw an error when the Chef node_name is nil

This commit is contained in:
Seth Vargo 2015-11-18 16:55:37 -08:00
parent 733a583b69
commit a1a3824e35
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,6 +122,14 @@ module VagrantPlugins
def delete_from_chef_server(deletable) def delete_from_chef_server(deletable)
node_name = @config.node_name || @machine.config.vm.hostname node_name = @config.node_name || @machine.config.vm.hostname
if node_name.to_s.empty?
@machine.ui.warn(I18n.t("vagrant.provisioners.chef.missing_node_name",
deletable: deletable,
))
return
end
@machine.ui.info(I18n.t( @machine.ui.info(I18n.t(
"vagrant.provisioners.chef.deleting_from_server", "vagrant.provisioners.chef.deleting_from_server",
deletable: deletable, name: node_name)) deletable: deletable, name: node_name))

6
templates/locales/en.yml
View File

@ -1984,6 +1984,12 @@ en:
upload_path_empty: |- upload_path_empty: |-
The Chef Apply provisioner requires that the `config.chef.upload_path` The Chef Apply provisioner requires that the `config.chef.upload_path`
be set to a non-nil, non-empty value. be set to a non-nil, non-empty value.
missing_node_name: |-
The Chef Client provisioner cannot delete the %{deletable} from
the Chef server because Vagrant does not know the `node_name'! You
need to manually delete the %{deletable} from the Chef server. You
can specify the `node_name' in the Chef configuration to prevent this
in the future.
deleting_from_server: "Deleting %{deletable} \"%{name}\" from Chef server..." deleting_from_server: "Deleting %{deletable} \"%{name}\" from Chef server..."
file: file: