From 0e5840a14d7faa20e5f32e6d943e41b796d3a26b Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 3 Feb 2014 16:40:02 +0100
Subject: [PATCH 1/9] kernel/v2: test for some config

---
 test/unit/plugins/kernel_v2/config/vm_test.rb | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 test/unit/plugins/kernel_v2/config/vm_test.rb

diff --git a/test/unit/plugins/kernel_v2/config/vm_test.rb b/test/unit/plugins/kernel_v2/config/vm_test.rb
new file mode 100644
index 000000000..16648ed6b
--- /dev/null
+++ b/test/unit/plugins/kernel_v2/config/vm_test.rb
@@ -0,0 +1,20 @@
+require File.expand_path("../../../../base", __FILE__)
+
+require Vagrant.source_root.join("plugins/kernel_v2/config/vm")
+
+describe VagrantPlugins::Kernel_V2::VMConfig do
+  subject { described_class.new }
+
+  describe "#provision" do
+    it "stores the provisioners" do
+      subject.provision("shell", inline: "foo")
+      subject.provision("shell", inline: "bar")
+      subject.finalize!
+
+      r = subject.provisioners
+      expect(r.length).to eql(2)
+      expect(r[0].config.inline).to eql("foo")
+      expect(r[1].config.inline).to eql("bar")
+    end
+  end
+end

From debc14f88310eda8439278c41878b064bc78aac3 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 3 Feb 2014 16:42:47 +0100
Subject: [PATCH 2/9] kernel/v2: more tests

---
 test/unit/plugins/kernel_v2/config/vm_test.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/unit/plugins/kernel_v2/config/vm_test.rb b/test/unit/plugins/kernel_v2/config/vm_test.rb
index 16648ed6b..e5e51de36 100644
--- a/test/unit/plugins/kernel_v2/config/vm_test.rb
+++ b/test/unit/plugins/kernel_v2/config/vm_test.rb
@@ -16,5 +16,14 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
       expect(r[0].config.inline).to eql("foo")
       expect(r[1].config.inline).to eql("bar")
     end
+
+    it "marks as invalid if a bad name" do
+      subject.provision("nope", inline: "foo")
+      subject.finalize!
+
+      r = subject.provisioners
+      expect(r.length).to eql(1)
+      expect(r[0]).to be_invalid
+    end
   end
 end

From 10d5416a9037233a8610f9b16cb28c948fa1c533 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 3 Feb 2014 16:56:39 +0100
Subject: [PATCH 3/9] kernel/v2: support overriding provisioner settings

---
 plugins/kernel_v2/config/vm.rb                | 17 ++++++++--
 plugins/kernel_v2/config/vm_provisioner.rb    | 34 ++++++++++++++-----
 test/unit/plugins/kernel_v2/config/vm_test.rb | 11 ++++++
 3 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb
index 1daf70073..b593eb643 100644
--- a/plugins/kernel_v2/config/vm.rb
+++ b/plugins/kernel_v2/config/vm.rb
@@ -221,8 +221,21 @@ module VagrantPlugins
         end
       end
 
-      def provision(name, options=nil, &block)
-        @provisioners << VagrantConfigProvisioner.new(name.to_sym, options, &block)
+      def provision(name, **options, &block)
+        options[:id] = options[:id].to_s if options[:id]
+
+        prov = nil
+        if options[:id]
+          prov = @provisioners.find { |p| p.id == options[:id] }
+        end
+
+        if !prov
+          prov = VagrantConfigProvisioner.new(options[:id], name.to_sym)
+          @provisioners << prov
+        end
+
+        prov.add_config(options, &block)
+        nil
       end
 
       def defined_vms
diff --git a/plugins/kernel_v2/config/vm_provisioner.rb b/plugins/kernel_v2/config/vm_provisioner.rb
index 82be495df..76939bee0 100644
--- a/plugins/kernel_v2/config/vm_provisioner.rb
+++ b/plugins/kernel_v2/config/vm_provisioner.rb
@@ -4,6 +4,11 @@ module VagrantPlugins
   module Kernel_V2
     # Represents a single configured provisioner for a VM.
     class VagrantConfigProvisioner
+      # Unique ID name for this provisioner
+      #
+      # @return [String]
+      attr_reader :id
+
       # The name of the provisioner that should be registered
       # as a plugin.
       #
@@ -15,11 +20,12 @@ module VagrantPlugins
       # @return [Object]
       attr_reader :config
 
-      def initialize(name, options=nil, &block)
+      def initialize(id, name)
         @logger = Log4r::Logger.new("vagrant::config::vm::provisioner")
         @logger.debug("Provisioner defined: #{name}")
 
         @config  = nil
+        @id      = id
         @invalid = false
         @name    = name
 
@@ -31,15 +37,27 @@ module VagrantPlugins
 
         # Attempt to find the configuration class for this provider
         # if it exists and load the configuration.
-        config_class = Vagrant.plugin("2").manager.provisioner_configs[@name]
-        if !config_class
-          @logger.info("Provisioner config for '#{@name}' not found. Ignoring config.")
-          return
+        @config_class = Vagrant.plugin("2").manager.
+          provisioner_configs[@name]
+        if !@config_class
+          @logger.info(
+            "Provisioner config for '#{@name}' not found. Ignoring config.")
         end
+      end
+
+      def add_config(**options, &block)
+        return if invalid?
+
+        current = @config_class.new
+        current.set_options(options) if options
+        current.call(@config) if block
+        current = @config.merge(current) if @config
+        @config = current
+      end
+
+      def finalize!
+        return if invalid?
 
-        @config = config_class.new
-        @config.set_options(options) if options
-        block.call(@config) if block
         @config.finalize!
       end
 
diff --git a/test/unit/plugins/kernel_v2/config/vm_test.rb b/test/unit/plugins/kernel_v2/config/vm_test.rb
index e5e51de36..983718d12 100644
--- a/test/unit/plugins/kernel_v2/config/vm_test.rb
+++ b/test/unit/plugins/kernel_v2/config/vm_test.rb
@@ -17,6 +17,17 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
       expect(r[1].config.inline).to eql("bar")
     end
 
+    it "allows provisioner settings to be overriden" do
+      subject.provision("shell", path: "foo", inline: "foo", id: "s")
+      subject.provision("shell", inline: "bar", id: "s")
+      subject.finalize!
+
+      r = subject.provisioners
+      expect(r.length).to eql(1)
+      expect(r[0].config.inline).to eql("bar")
+      expect(r[0].config.path).to eql("foo")
+    end
+
     it "marks as invalid if a bad name" do
       subject.provision("nope", inline: "foo")
       subject.finalize!

From 3aaa57cac930f348f0eb721280f998b7364dc086 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 3 Feb 2014 21:30:01 +0100
Subject: [PATCH 4/9] kernel/v2: support merging properly

---
 plugins/kernel_v2/config/vm.rb                | 22 ++++++++++-
 plugins/kernel_v2/config/vm_provisioner.rb    |  7 +++-
 test/unit/plugins/kernel_v2/config/vm_test.rb | 39 +++++++++++++++++++
 3 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb
index b593eb643..773771c56 100644
--- a/plugins/kernel_v2/config/vm.rb
+++ b/plugins/kernel_v2/config/vm.rb
@@ -65,7 +65,6 @@ module VagrantPlugins
           other_networks = other.instance_variable_get(:@__networks)
 
           result.instance_variable_set(:@__networks, @__networks.merge(other_networks))
-          result.instance_variable_set(:@provisioners, @provisioners + other.provisioners)
 
           # Merge defined VMs by first merging the defined VM keys,
           # preserving the order in which they were defined.
@@ -107,6 +106,27 @@ module VagrantPlugins
             new_overrides[key] += blocks
           end
 
+          # Merge provisioners. First we deal with overrides and making
+          # sure the ordering is good there. Then we merge them.
+          new_provs = []
+          @provisioners.each do |p|
+            if p.id
+              other_p = other.provisioners.find { |o| p.id == o.id }
+              if other_p
+                # There is an override. Take it.
+                other_p.config = p.config.merge(other_p.config)
+                next
+              end
+            end
+
+            # There is an override, merge it into the
+            new_provs << p.dup
+          end
+          other.provisioners.each do |p|
+            new_provs << p.dup
+          end
+          result.instance_variable_set(:@provisioners, new_provs)
+
           # Merge synced folders.
           other_folders = other.instance_variable_get(:@__synced_folders)
           new_folders = {}
diff --git a/plugins/kernel_v2/config/vm_provisioner.rb b/plugins/kernel_v2/config/vm_provisioner.rb
index 76939bee0..3e479d0be 100644
--- a/plugins/kernel_v2/config/vm_provisioner.rb
+++ b/plugins/kernel_v2/config/vm_provisioner.rb
@@ -18,7 +18,7 @@ module VagrantPlugins
       # The configuration associated with the provisioner, if there is any.
       #
       # @return [Object]
-      attr_reader :config
+      attr_accessor :config
 
       def initialize(id, name)
         @logger = Log4r::Logger.new("vagrant::config::vm::provisioner")
@@ -45,6 +45,11 @@ module VagrantPlugins
         end
       end
 
+      def initialize_copy(orig)
+        super
+        @config = @config.dup if @config
+      end
+
       def add_config(**options, &block)
         return if invalid?
 
diff --git a/test/unit/plugins/kernel_v2/config/vm_test.rb b/test/unit/plugins/kernel_v2/config/vm_test.rb
index 983718d12..dd4f1f674 100644
--- a/test/unit/plugins/kernel_v2/config/vm_test.rb
+++ b/test/unit/plugins/kernel_v2/config/vm_test.rb
@@ -36,5 +36,44 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
       expect(r.length).to eql(1)
       expect(r[0]).to be_invalid
     end
+
+    describe "merging" do
+      it "copies the configs" do
+        subject.provision("shell", inline: "foo")
+        subject_provs = subject.provisioners
+
+        other = described_class.new
+        other.provision("shell", inline: "bar")
+
+        merged = subject.merge(other)
+        merged_provs = merged.provisioners
+
+        expect(merged_provs.length).to eql(2)
+        expect(merged_provs[0].config.inline).
+          to eq(subject_provs[0].config.inline)
+        expect(merged_provs[0].config.object_id).
+          to_not eq(subject_provs[0].config.object_id)
+      end
+
+      it "uses the proper order when merging overrides" do
+        subject.provision("shell", inline: "foo", id: "original")
+        subject.provision("shell", inline: "other", id: "other")
+
+        other = described_class.new
+        other.provision("shell", inline: "bar")
+        other.provision("shell", inline: "foo-overload", id: "original")
+
+        merged = subject.merge(other)
+        merged_provs = merged.provisioners
+
+        expect(merged_provs.length).to eql(3)
+        expect(merged_provs[0].config.inline).
+          to eq("other")
+        expect(merged_provs[1].config.inline).
+          to eq("bar")
+        expect(merged_provs[2].config.inline).
+          to eq("foo-overload")
+      end
+    end
   end
 end

From 8603aeb2b9563d5126aee4eb8cadf116a3bc1d62 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 3 Feb 2014 21:56:41 +0100
Subject: [PATCH 5/9] website/docs: document it

---
 .../v2/provisioning/basic_usage.html.md       | 100 ++++++++++++++++--
 1 file changed, 91 insertions(+), 9 deletions(-)

diff --git a/website/docs/source/v2/provisioning/basic_usage.html.md b/website/docs/source/v2/provisioning/basic_usage.html.md
index ade41f746..e61feec81 100644
--- a/website/docs/source/v2/provisioning/basic_usage.html.md
+++ b/website/docs/source/v2/provisioning/basic_usage.html.md
@@ -23,7 +23,7 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-Every provisioner has an identifier, such as `"shell"`, used as the first
+Every provisioner has a type, such as `"shell"`, used as the first
 parameter to the provisioning configuration. Following that is basic key/value
 for configuring that specific provisioner. Instead of basic key/value, you
 can also use a Ruby block for a syntax that is more like variable assignment.
@@ -44,14 +44,6 @@ it can greatly improve readability. Additionally, some provisioners, like
 the Chef provisioner, have special methods that can be called within that
 block to ease configuration that can't be done with the key/value approach.
 
-## Multiple Provisioners
-
-Multiple `config.vm.provision` methods can be used to define multiple
-provisioners. These provisioners will be run in the order they're defined.
-This is useful for a variety of reasons, but most commonly it is used so
-that a shell script can bootstrap some of the system so that another provisioner
-can take over later.
-
 ## Running Provisioners
 
 Provisioners are run in three cases: the initial `vagrant up`, `vagrant
@@ -65,3 +57,93 @@ The `--provision-with` flag can be used if you only want to run a
 specific provisioner if you have multiple provisioners specified. For
 example, if you have a shell and Puppet provisioner and only want to
 run the shell one, you can do `vagrant provision --provision-with shell`.
+
+## Multiple Provisioners
+
+Multiple `config.vm.provision` methods can be used to define multiple
+provisioners. These provisioners will be run in the order they're defined.
+This is useful for a variety of reasons, but most commonly it is used so
+that a shell script can bootstrap some of the system so that another provisioner
+can take over later.
+
+If you define provisioners at multiple "scope" levels (such as globally
+in the configuration block, then in a
+[multi-machine](/v2/multi-machine/index.html) definition, then maybe
+in a [provider-specific override](/v2/providers/configuration.html)),
+then the outer scopes will always run _before_ any inner scopes. For
+example, in the Vagrantfile below:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provision "shell", inline: "echo foo"
+
+  config.vm.define "web" do |web|
+    web.vm.provision "shell", inline: "echo bar"
+  end
+
+  config.vm.provision "shell", inline: "echo baz"
+end
+```
+
+The ordering of the provisioners will be to echo "foo", "baz", then
+"bar" (note the second one might not be what you expect!). Remember:
+ordering is _outside in_.
+
+## Overriding Provisioner Settings
+
+<div class="alert alert-block alert-warn">
+<p>
+<strong>Warning: Advanced Topic!</strong> Provisioner overriding is
+an advanced topic that really only becomes useful if you're already
+using multi-machine and/or provider overrides. If you're just getting
+started with Vagrant, you can safely skip this.
+</p>
+</div>
+
+When using features such as [multi-machine](/v2/multi-machine/index.html)
+or [provider-specific overrides](/v2/providers/configuration.html),
+you may want to define common provisioners in the global configuration
+scope of a Vagrantfile, but override certain aspects of them internally.
+Vagrant allows you to do this, but has some details to consider.
+
+To override settings, you must assign an ID to your provisioner. Then
+it is only a matter of specifying the same ID to override:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provision "shell",
+    inline: "echo foo", id: "foo"
+
+  config.vm.define "web" do |web|
+    web.vm.provision "shell",
+      inline: "echo bar", id: "foo"
+  end
+end
+```
+
+In the above, only "bar" will be echoed, because the inline setting
+overloaded the outer provisioner. This overload is only effective
+within that scope: the "web" VM. If there were another VM defined,
+it would still echo "foo" unless it itself also overloaded the
+provisioner.
+
+**Be careful with ordering.** When overriding a provisioner in
+a sub-scope, the provisioner will run at _that point_. In the example
+below, the output would be "foo" then "bar":
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provision "shell",
+    inline: "echo ORIGINAL!", id: "foo"
+
+  config.vm.define "web" do |web|
+    web.vm.provision "shell",
+      inline: "echo foo"
+    web.vm.provision "shell",
+      inline: "echo bar", id: "foo"
+  end
+end
+```
+
+If you want to preserve the original ordering, you can specify
+the `preserve_order: true` flag.

From 2cc56119b7fdb6c19477d4a02c68a5fe4dabd75b Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 3 Feb 2014 22:03:20 +0100
Subject: [PATCH 6/9] kernel/v2: support the preserve_order option (documented)

---
 plugins/kernel_v2/config/vm.rb                | 14 ++++++++----
 plugins/kernel_v2/config/vm_provisioner.rb    |  7 ++++++
 test/unit/plugins/kernel_v2/config/vm_test.rb | 22 +++++++++++++++++++
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb
index 773771c56..0c8a6e859 100644
--- a/plugins/kernel_v2/config/vm.rb
+++ b/plugins/kernel_v2/config/vm.rb
@@ -108,21 +108,26 @@ module VagrantPlugins
 
           # Merge provisioners. First we deal with overrides and making
           # sure the ordering is good there. Then we merge them.
-          new_provs = []
+          new_provs   = []
+          other_provs = other.provisioners.dup
           @provisioners.each do |p|
             if p.id
-              other_p = other.provisioners.find { |o| p.id == o.id }
+              other_p = other_provs.find { |o| p.id == o.id }
               if other_p
                 # There is an override. Take it.
                 other_p.config = p.config.merge(other_p.config)
-                next
+                next if !other_p.preserve_order
+
+                # We're preserving order, delete from other
+                p = other_p
+                other_provs.delete(other_p)
               end
             end
 
             # There is an override, merge it into the
             new_provs << p.dup
           end
-          other.provisioners.each do |p|
+          other_provs.each do |p|
             new_provs << p.dup
           end
           result.instance_variable_set(:@provisioners, new_provs)
@@ -254,6 +259,7 @@ module VagrantPlugins
           @provisioners << prov
         end
 
+        prov.preserve_order = !!options[:preserve_order]
         prov.add_config(options, &block)
         nil
       end
diff --git a/plugins/kernel_v2/config/vm_provisioner.rb b/plugins/kernel_v2/config/vm_provisioner.rb
index 3e479d0be..af4222f11 100644
--- a/plugins/kernel_v2/config/vm_provisioner.rb
+++ b/plugins/kernel_v2/config/vm_provisioner.rb
@@ -20,6 +20,12 @@ module VagrantPlugins
       # @return [Object]
       attr_accessor :config
 
+      # Whether or not to preserve the order when merging this with a
+      # parent scope.
+      #
+      # @return [Boolean]
+      attr_accessor :preserve_order
+
       def initialize(id, name)
         @logger = Log4r::Logger.new("vagrant::config::vm::provisioner")
         @logger.debug("Provisioner defined: #{name}")
@@ -28,6 +34,7 @@ module VagrantPlugins
         @id      = id
         @invalid = false
         @name    = name
+        @preserve_order = false
 
         # Attempt to find the provisioner...
         if !Vagrant.plugin("2").manager.provisioners[name]
diff --git a/test/unit/plugins/kernel_v2/config/vm_test.rb b/test/unit/plugins/kernel_v2/config/vm_test.rb
index dd4f1f674..e7af9921c 100644
--- a/test/unit/plugins/kernel_v2/config/vm_test.rb
+++ b/test/unit/plugins/kernel_v2/config/vm_test.rb
@@ -74,6 +74,28 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
         expect(merged_provs[2].config.inline).
           to eq("foo-overload")
       end
+
+      it "can preserve order for overrides" do
+        subject.provision("shell", inline: "foo", id: "original")
+        subject.provision("shell", inline: "other", id: "other")
+
+        other = described_class.new
+        other.provision("shell", inline: "bar")
+        other.provision(
+          "shell", inline: "foo-overload", id: "original",
+          preserve_order: true)
+
+        merged = subject.merge(other)
+        merged_provs = merged.provisioners
+
+        expect(merged_provs.length).to eql(3)
+        expect(merged_provs[0].config.inline).
+          to eq("foo-overload")
+        expect(merged_provs[1].config.inline).
+          to eq("other")
+        expect(merged_provs[2].config.inline).
+          to eq("bar")
+      end
     end
   end
 end

From d864187b1abf103df71af2d9e8ef8f70ae8ee6c3 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 3 Feb 2014 22:23:26 +0100
Subject: [PATCH 7/9] provisioners/docker: configuration is mergeable

---
 plugins/provisioners/docker/config.rb         | 55 ++++++++++++++-----
 .../provisioners/docker/config_test.rb        | 50 +++++++++++++++++
 2 files changed, 90 insertions(+), 15 deletions(-)

diff --git a/plugins/provisioners/docker/config.rb b/plugins/provisioners/docker/config.rb
index e3a0ab8f8..9526bd4ce 100644
--- a/plugins/provisioners/docker/config.rb
+++ b/plugins/provisioners/docker/config.rb
@@ -3,14 +3,25 @@ require 'set'
 module VagrantPlugins
   module Docker
     class Config < Vagrant.plugin("2", :config)
-      attr_reader :build_images, :images, :containers, :build_options
+      attr_reader :images
       attr_accessor :version
 
       def initialize
         @images         = Set.new
-        @containers     = Hash.new
         @version        = UNSET_VALUE
-        @build_images   = []
+
+        @__build_images   = []
+        @__containers     = Hash.new { |h, k| h[k] = {} }
+      end
+
+      # Accessor for internal state.
+      def build_images
+        @__build_images
+      end
+
+      # Accessor for the internal state.
+      def containers
+        @__containers
       end
 
       # Defines an image to build using `docker build` within the machine.
@@ -18,7 +29,7 @@ module VagrantPlugins
       # @param [String] path Path to the Dockerfile to pass to
       #   `docker build`.
       def build_image(path, **opts)
-        @build_images << [path, opts]
+        @__build_images << [path, opts]
       end
 
       def images=(images)
@@ -30,22 +41,36 @@ module VagrantPlugins
       end
 
       def run(name, **options)
-        params = options.dup
-        params[:image] ||= name
-        params[:daemonize] = true if !params.has_key?(:daemonize)
-
-        # TODO: Validate provided parameters before assignment
-        @containers[name.to_s] = params
-      end
-
-      def finalize!
-        @version = "latest" if @version == UNSET_VALUE
-        @version = @version.to_sym
+        @__containers[name.to_s] = options.dup
       end
 
       def merge(other)
         super.tap do |result|
           result.pull_images(*(other.images + self.images))
+
+          build_images = @__build_images.dup
+          build_images += other.build_images
+          result.instance_variable_set(:@__build_images, build_images)
+
+          containers = {}
+          @__containers.each do |name, params|
+            containers[name] = params.dup
+          end
+          other.containers.each do |name, params|
+            containers[name] = @__containers[name].merge(params)
+          end
+
+          result.instance_variable_set(:@__containers, containers)
+        end
+      end
+
+      def finalize!
+        @version = "latest" if @version == UNSET_VALUE
+        @version = @version.to_sym
+
+        @__containers.each do |name, params|
+          params[:image] ||= name
+          params[:daemonize] = true if !params.has_key?(:daemonize)
         end
       end
     end
diff --git a/test/unit/plugins/provisioners/docker/config_test.rb b/test/unit/plugins/provisioners/docker/config_test.rb
index 8a8f3effa..82417573c 100644
--- a/test/unit/plugins/provisioners/docker/config_test.rb
+++ b/test/unit/plugins/provisioners/docker/config_test.rb
@@ -31,6 +31,56 @@ describe VagrantPlugins::Docker::Config do
     end
   end
 
+  describe "#merge" do
+    it "has all images to pull" do
+      subject.pull_images("1")
+
+      other = described_class.new
+      other.pull_images("2", "3")
+
+      result = subject.merge(other)
+      expect(result.images.to_a.sort).to eq(
+        ["1", "2", "3"])
+    end
+
+    it "has all the containers to run" do
+      subject.run("foo", image: "bar", daemonize: false)
+      subject.run("bar")
+
+      other = described_class.new
+      other.run("foo", image: "foo")
+
+      result = subject.merge(other)
+      result.finalize!
+
+      cs     = result.containers
+      expect(cs.length).to eq(2)
+      expect(cs["foo"]).to eq({
+        image: "foo",
+        daemonize: false,
+      })
+      expect(cs["bar"]).to eq({
+        image: "bar",
+        daemonize: true,
+      })
+    end
+
+    it "has all the containers to build" do
+      subject.build_image("foo")
+
+      other = described_class.new
+      other.build_image("bar")
+
+      result = subject.merge(other)
+      result.finalize!
+
+      images = result.build_images
+      expect(images.length).to eq(2)
+      expect(images[0]).to eq(["foo", {}])
+      expect(images[1]).to eq(["bar", {}])
+    end
+  end
+
   describe "#pull_images" do
     it "adds images to the list of images to build" do
       subject.pull_images("1")

From 59d257f832263a3b82b3f84cab240d16eb24a800 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 3 Feb 2014 22:27:23 +0100
Subject: [PATCH 8/9] provisioners/puppet: mergeable config

---
 plugins/provisioners/puppet/config/puppet.rb        | 6 ++++++
 plugins/provisioners/puppet/config/puppet_server.rb | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/plugins/provisioners/puppet/config/puppet.rb b/plugins/provisioners/puppet/config/puppet.rb
index d6e489a86..e7c9dda70 100644
--- a/plugins/provisioners/puppet/config/puppet.rb
+++ b/plugins/provisioners/puppet/config/puppet.rb
@@ -42,6 +42,12 @@ module VagrantPlugins
           end
         end
 
+        def merge(other)
+          super.tap do |result|
+            result.facter  = @facter.merge(other.facter)
+          end
+        end
+
         def finalize!
           super
 
diff --git a/plugins/provisioners/puppet/config/puppet_server.rb b/plugins/provisioners/puppet/config/puppet_server.rb
index 1ca1f8da3..9c53672d5 100644
--- a/plugins/provisioners/puppet/config/puppet_server.rb
+++ b/plugins/provisioners/puppet/config/puppet_server.rb
@@ -20,6 +20,12 @@ module VagrantPlugins
           @puppet_server           = UNSET_VALUE
         end
 
+        def merge(other)
+          super.tap do |result|
+            result.facter  = @facter.merge(other.facter)
+          end
+        end
+
         def finalize!
           super
 

From feeaa69615abc7e97c529ef289cc9e574e290dbd Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 3 Feb 2014 22:28:41 +0100
Subject: [PATCH 9/9] kernel/v2: finalize the provisioner configs

---
 plugins/kernel_v2/config/vm.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb
index 0c8a6e859..9a64eed94 100644
--- a/plugins/kernel_v2/config/vm.rb
+++ b/plugins/kernel_v2/config/vm.rb
@@ -360,6 +360,11 @@ module VagrantPlugins
           @__compiled_provider_configs[name]   = config
         end
 
+        # Finaliez all the provisioners
+        @provisioners.each do |p|
+          p.config.finalize! if !p.invalid?
+        end
+
         @__synced_folders.each do |id, options|
           if options[:nfs]
             options[:type] = :nfs