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

added :file_cache_path and :file_backup_path as configurable parameters 

removed deprecated :file_store_path parameter
This commit is contained in:
Dimitri Aivaliotis 2011-02-25 15:03:28 +01:00 committed by Mitchell Hashimoto
parent b1bc49c0f3
commit 6f9387adc6
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/vagrant/provisioners/chef_server.rb
View File

@ -12,12 +12,16 @@ module Vagrant
attr_accessor :validation_key_path
attr_accessor :validation_client_name
attr_accessor :client_key_path
attr_accessor :file_cache_path
attr_accessor :file_backup_path
def initialize
super
@validation_client_name = "chef-validator"
@client_key_path = "/etc/chef/client.pem"
@file_cache_path = "/srv/chef/file_store"
@file_backup_path = "/srv/chef/cache"
end
def validate(errors)
@ -65,7 +69,9 @@ module Vagrant
:chef_server_url => config.chef_server_url,
:validation_client_name => config.validation_client_name,
:validation_key => guest_validation_key_path,
:client_key => config.client_key_path
:client_key => config.client_key_path,
:file_cache_path => config.file_cache_path,
:file_backup_path => config.file_backup_path
})
end

4
templates/chef_server_client.erb
View File

@ -10,8 +10,8 @@ validation_client_name "<%= validation_client_name %>"
validation_key "<%= validation_key %>"
client_key "<%= client_key %>"
file_store_path "/srv/chef/file_store"
file_cache_path "/srv/chef/cache"
file_cache_path "<%= file_cache_path %>"
file_backup_path "<%= file_backup_path %>"
pid_file "/var/run/chef/chef-client.pid"

4
test/vagrant/provisioners/chef_server_test.rb
View File

@ -159,7 +159,9 @@ class ChefServerProvisionerTest < Test::Unit::TestCase
:chef_server_url => @config.chef_server_url,
:validation_client_name => @config.validation_client_name,
:validation_key => @action.guest_validation_key_path,
:client_key => @config.client_key_path
:client_key => @config.client_key_path,
:file_cache_path => @config.file_cache_path,
:file_backup_path => @config.file_backup_path
})
@action.setup_server_config