Chef solo roles_path and data_bag_path should be a string
This commit is contained in:
parent
92bb5c423b
commit
8ff269c341
|
@ -6,6 +6,7 @@
|
||||||
- Checking guest addition versions now ignores OSE. [GH-438]
|
- Checking guest addition versions now ignores OSE. [GH-438]
|
||||||
- Chef solo from a remote URL fixed. [GH-431]
|
- Chef solo from a remote URL fixed. [GH-431]
|
||||||
- Arch linux support: host only networks and changing the host name. [GH-439] [GH-448]
|
- Arch linux support: host only networks and changing the host name. [GH-439] [GH-448]
|
||||||
|
- Chef solo `roles_path` and `data_bags_path` can only be be single paths. [GH-446]
|
||||||
|
|
||||||
## 0.8.2 (July 22, 2011)
|
## 0.8.2 (July 22, 2011)
|
||||||
|
|
||||||
|
|
|
@ -17,8 +17,8 @@ module Vagrant
|
||||||
super
|
super
|
||||||
|
|
||||||
@cookbooks_path = ["cookbooks", [:vm, "cookbooks"]]
|
@cookbooks_path = ["cookbooks", [:vm, "cookbooks"]]
|
||||||
@roles_path = ""
|
@roles_path = nil
|
||||||
@data_bags_path = ""
|
@data_bags_path = nil
|
||||||
@nfs = false
|
@nfs = false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -54,6 +54,8 @@ module Vagrant
|
||||||
|
|
||||||
# Converts paths to a list of properly expanded paths with types.
|
# Converts paths to a list of properly expanded paths with types.
|
||||||
def expanded_folders(paths)
|
def expanded_folders(paths)
|
||||||
|
return [] if paths.nil?
|
||||||
|
|
||||||
# Convert the path to an array if it is a string or just a single
|
# Convert the path to an array if it is a string or just a single
|
||||||
# path element which contains the folder location (:host or :vm)
|
# path element which contains the folder location (:host or :vm)
|
||||||
paths = [paths] if paths.is_a?(String) || paths.first.is_a?(Symbol)
|
paths = [paths] if paths.is_a?(String) || paths.first.is_a?(Symbol)
|
||||||
|
|
|
@ -86,8 +86,8 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
|
||||||
:provisioning_path => @config.provisioning_path,
|
:provisioning_path => @config.provisioning_path,
|
||||||
:cookbooks_path => @action.guest_paths(@action.cookbook_folders),
|
:cookbooks_path => @action.guest_paths(@action.cookbook_folders),
|
||||||
:recipe_url => @config.recipe_url,
|
:recipe_url => @config.recipe_url,
|
||||||
:roles_path => @action.guest_paths(@action.role_folders),
|
:roles_path => @action.guest_paths(@action.role_folders).first,
|
||||||
:data_bags_path => @action.guest_paths(@action.data_bags_folders)
|
:data_bags_path => @action.guest_paths(@action.data_bags_folders).first
|
||||||
})
|
})
|
||||||
|
|
||||||
@action.setup_solo_config
|
@action.setup_solo_config
|
||||||
|
|
Loading…
Reference in New Issue