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

add verbose_logging config option to chef based provisioners 

Conflicts:
	plugins/provisioners/chef/config/base.rb
This commit is contained in:
Fabian Ruff 2013-02-05 13:53:34 +01:00 committed by Mitchell Hashimoto
parent 87455b5d0a
commit 931e23c5d0
4 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/provisioners/chef/config/base.rb
View File

@ -21,6 +21,7 @@ module VagrantPlugins
attr_accessor :run_list attr_accessor :run_list
attr_accessor :file_cache_path attr_accessor :file_cache_path
attr_accessor :file_backup_path attr_accessor :file_backup_path
attr_accessor :verbose_logging
def initialize def initialize
super super
@ -42,6 +43,7 @@ module VagrantPlugins
@provisioning_path = UNSET_VALUE @provisioning_path = UNSET_VALUE
@file_cache_path = UNSET_VALUE @file_cache_path = UNSET_VALUE
@file_backup_path = UNSET_VALUE @file_backup_path = UNSET_VALUE
@verbose_logging = UNSET_VALUE
@json = {} @json = {}
@run_list = [] @run_list = []
@ -65,6 +67,7 @@ module VagrantPlugins
@provisioning_path = nil if @provisioning_path == UNSET_VALUE @provisioning_path = nil if @provisioning_path == UNSET_VALUE
@file_backup_path = "/var/chef/backup" if @file_backup_path == UNSET_VALUE @file_backup_path = "/var/chef/backup" if @file_backup_path == UNSET_VALUE
@file_cache_path = "/var/chef/cache" if @file_cache_path == UNSET_VALUE @file_cache_path = "/var/chef/cache" if @file_cache_path == UNSET_VALUE
@verbose_logging = false if @verbose_logging == UNSET_VALUE
# Make sure the log level is a symbol # Make sure the log level is a symbol
@log_level = @log_level.to_sym @log_level = @log_level.to_sym

1
plugins/provisioners/chef/provisioner/base.rb
View File

@ -63,6 +63,7 @@ module VagrantPlugins
:file_cache_path => @config.file_cache_path, :file_cache_path => @config.file_cache_path,
:file_backup_path => @config.file_backup_path, :file_backup_path => @config.file_backup_path,
:log_level => @config.log_level.to_sym, :log_level => @config.log_level.to_sym,
:verbose_logging => @config.verbose_logging,
:http_proxy => @config.http_proxy, :http_proxy => @config.http_proxy,
:http_proxy_user => @config.http_proxy_user, :http_proxy_user => @config.http_proxy_user,
:http_proxy_pass => @config.http_proxy_pass, :http_proxy_pass => @config.http_proxy_pass,

1
templates/provisioners/chef_client/client.erb
View File

@ -1,5 +1,6 @@
log_level <%= log_level.inspect %> log_level <%= log_level.inspect %>
log_location STDOUT log_location STDOUT
verbose_logging <%= verbose_logging.inspect %>
<% if node_name %> <% if node_name %>
node_name "<%= node_name %>" node_name "<%= node_name %>"
<% end %> <% end %>

1
templates/provisioners/chef_solo/solo.erb
View File

@ -8,6 +8,7 @@ cookbook_path <%= cookbooks_path.inspect %>
role_path <%= roles_path.inspect %> role_path <%= roles_path.inspect %>
<% end %> <% end %>
log_level <%= log_level.inspect %> log_level <%= log_level.inspect %>
verbose_logging <%= verbose_logging.inspect %>
encrypted_data_bag_secret "<%= encrypted_data_bag_secret %>" encrypted_data_bag_secret "<%= encrypted_data_bag_secret %>"