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

Chef client config defaults are correct [GH-1609]

This commit is contained in:
Mitchell Hashimoto 2013-04-16 15:07:37 -07:00
parent 8322f20f4b
commit 4bb5da7232
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@ BUG FIXES:
- Chef solo run list properly set. [GH-1608] - Chef solo run list properly set. [GH-1608]
- Follow 30x redirects when downloading boxes. [GH-1607] - Follow 30x redirects when downloading boxes. [GH-1607]
- Chef client config defaults are done properly. [GH-1609]
## 1.2.0 (April 16, 2013) ## 1.2.0 (April 16, 2013)

5
plugins/provisioners/chef/config/chef_client.rb
View File

@ -31,10 +31,15 @@ module VagrantPlugins
def finalize! def finalize!
super super
@chef_server_url = nil if @chef_server_url == UNSET_VALUE
@client_key_path = "/etc/chef/client.pem" if @client_key_path == UNSET_VALUE @client_key_path = "/etc/chef/client.pem" if @client_key_path == UNSET_VALUE
@encrypted_data_bag_secret_key_path = nil if @encrypted_data_bag_secret_key_path == UNSET_VALUE
@encrypted_data_bag_secret = nil if @encrypted_data_bag_secret == UNSET_VALUE
@environment = nil if @environment == UNSET_VALUE
@file_backup_path = "/srv/chef/cache" if @file_backup_path == UNSET_VALUE @file_backup_path = "/srv/chef/cache" if @file_backup_path == UNSET_VALUE
@file_cache_path = "/srv/chef/file_store" if @file_cache_path == UNSET_VALUE @file_cache_path = "/srv/chef/file_store" if @file_cache_path == UNSET_VALUE
@validation_client_name = "chef-validator" if @validation_client_name == UNSET_VALUE @validation_client_name = "chef-validator" if @validation_client_name == UNSET_VALUE
@validation_key_path = nil if @validation_key_path == UNSET_VALUE
if @encrypted_data_bag_secret == UNSET_VALUE if @encrypted_data_bag_secret == UNSET_VALUE
@encrypted_data_bag_secret = "/tmp/encrypted_data_bag_secret" @encrypted_data_bag_secret = "/tmp/encrypted_data_bag_secret"