Properly set the chef-solo run list [GH-1608]

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## 1.2.1 (unreleased)
 
+BUG FIXES:
 
+  - Chef solo run list properly set. [GH-1608]
 
 ## 1.2.0 (April 16, 2013)
 

plugins/provisioners/chef/config/base.rb

@@ -61,6 +61,13 @@ module VagrantPlugins
           @log_level = @log_level.to_sym
         end
 
+        def merge(other)
+          super.tap do |result|
+            result.instance_variable_set(:@json, @json.merge(other.json))
+            result.instance_variable_set(:@run_list, (@run_list + other.run_list))
+          end
+        end
+
         # Adds a recipe to the run list
         def add_recipe(name)
           name = "recipe[#{name}]" unless name =~ /^recipe\[(.+?)\]$/

plugins/provisioners/chef/provisioner/base.rb

@@ -75,7 +75,9 @@ module VagrantPlugins
           @machine.env.ui.info I18n.t("vagrant.provisioners.chef.json")
 
           # Get the JSON that we're going to expose to Chef
-          json = JSON.pretty_generate(@config.json)
+          json = @config.json
+          json[:run_list] = @config.run_list if !@config.run_list.empty?
+          json = JSON.pretty_generate(json)
 
           # Create a temporary file to store the data so we
           # can upload it