From 280afa96c48eaf11bfec4c6e25d5e9a2545e125d Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 22 Apr 2013 08:43:20 -0700 Subject: [PATCH] Fix default encrypted data bag secret --- plugins/provisioners/chef/config/chef_client.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/plugins/provisioners/chef/config/chef_client.rb b/plugins/provisioners/chef/config/chef_client.rb index 32d7ccef8..ad536067d 100644 --- a/plugins/provisioners/chef/config/chef_client.rb +++ b/plugins/provisioners/chef/config/chef_client.rb @@ -34,16 +34,12 @@ module VagrantPlugins @chef_server_url = nil if @chef_server_url == 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 + @encrypted_data_bag_secret = "/tmp/encrypted_data_bag_secret" 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_cache_path = "/srv/chef/file_store" if @file_cache_path == 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 - @encrypted_data_bag_secret = "/tmp/encrypted_data_bag_secret" - end end def validate(machine)