Merge pull request #6561 from mitchellh/sethvargo/data_bags_array

Support arrays for data_bags_path

plugins/provisioners/chef/provisioner/chef_solo.rb

@@ -165,7 +165,7 @@ module VagrantPlugins
             recipe_url: @config.recipe_url,
             nodes_path: guest_paths(@node_folders),
             roles_path: guest_paths(@role_folders),
-            data_bags_path: guest_paths(@data_bags_folders).first,
+            data_bags_path: guest_paths(@data_bags_folders),
             environments_path: guest_paths(@environments_folders).first
           }
         end

templates/provisioners/chef_solo/solo.erb

@@ -8,12 +8,12 @@ cookbook_path <%= cookbooks_path.inspect %>
 role_path <%= roles_path.size == 1 ? roles_path.first.inspect : roles_path.inspect %>
 <% end %>
 log_level <%= log_level.inspect %>
-verbose_logging    <%= verbose_logging.inspect %>
+verbose_logging <%= verbose_logging.inspect %>
 
 encrypted_data_bag_secret <%= encrypted_data_bag_secret.inspect %>
 
 <% if data_bags_path -%>
-data_bag_path <%= data_bags_path.inspect %>
+data_bag_path <%= data_bags_path.size == 1 ? data_bags_path.first.inspect : data_bags_path.inspect %>
 <% end %>
 
 <% if recipe_url -%>

templates/provisioners/chef_zero/zero.erb

@@ -9,6 +9,7 @@ role_path <%= roles_path.size == 1 ? roles_path.first.inspect : roles_path.inspe
 <% end %>
 log_level <%= log_level.inspect %>
 verbose_logging <%= verbose_logging.inspect %>
+
 <% if !enable_reporting %>
 enable_reporting <%= enable_reporting.inspect %>
 <% end %>
@@ -16,7 +17,7 @@ enable_reporting <%= enable_reporting.inspect %>
 encrypted_data_bag_secret <%= encrypted_data_bag_secret.inspect %>
 
 <% if data_bags_path -%>
-data_bag_path <%= data_bags_path.inspect %>
+data_bag_path <%= data_bags_path.size == 1 ? data_bags_path.first.inspect : data_bags_path.inspect %>
 <% end %>
 
 <% if environments_path %>

website/docs/source/v2/provisioning/chef_solo.html.md

@@ -36,8 +36,9 @@ available below this section.
   are stored. By default this is "cookbooks", expecting a cookbooks folder
   relative to the Vagrantfile location.
 
-* `data_bags_path` (string) - A path where data bags are stored. By default, no
-  data bag path is set.
+* `data_bags_path` (string or array) - A path where data bags are stored. By
+  default, no data bag path is set. Chef 12 or higher is required to use the
+  array option. Chef 11 and lower only accept a string value.
 
 * `environments_path` (string) - A path where environment definitions are
   located. By default, no environments folder is set.

website/docs/source/v2/provisioning/chef_zero.html.md

@@ -35,8 +35,9 @@ available below this section.
   are stored. By default this is "cookbooks", expecting a cookbooks folder
   relative to the Vagrantfile location.
 
-* `data_bags_path` (string) - A path where data bags are stored. By default, no
-  data bag path is set.
+* `data_bags_path` (string or array) - A path where data bags are stored. By
+  default, no data bag path is set. Chef 12 or higher is required to use the
+  array option. Chef 11 and lower only accept a string value.
 
 * `environments_path` (string) - A path where environment definitions are
   located. By default, no environments folder is set.