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

provisioners/chef: fix node/client deletion when node_name is not set [GH-2345] 

V2 config uses `hostname` instead of `host_name`.
This commit is contained in:
Teemu Matilainen 2013-12-13 00:51:22 -03:00
parent 7f624976f9
commit d321b9199e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -14,6 +14,7 @@ BUG FIXES:
[GH-2620] [GH-2620]
- guests/redhat: fix configure networks bringing down interfaces that - guests/redhat: fix configure networks bringing down interfaces that
don't exist. [GH-2614] don't exist. [GH-2614]
- provisioners/chef: fix node/client deletion when node_name is not set [GH-2345]
## 1.4.0 (December 9, 2013) ## 1.4.0 (December 9, 2013)

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

@ -112,7 +112,7 @@ module VagrantPlugins
end end
def delete_from_chef_server(deletable) def delete_from_chef_server(deletable)
node_name = @config.node_name || @machine.config.vm.host_name node_name = @config.node_name || @machine.config.vm.hostname
@machine.env.ui.info(I18n.t( @machine.env.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))