core: trigger machine_id_changed for reload [GH-3963]

CHANGELOG.md

@@ -20,10 +20,17 @@ BUG FIXES:
   - providers/docker: `vagrant share` uses correct IP of proxy VM if it
       exists. [GH-4342]
   - providers/docker: `vagrant\_vagrantfile` expands home directory. [GH-4000]
+  - providers/docker: Fix issue where multiple identical proxy VMs would
+      be created. [GH-3963]
   - providers/virtualbox: Show a human-friendly error if VirtualBox didn't
       clean up an existing VM. [GH-4681]
   - provisioners/docker: Search for docker binary in multiple places. [GH-4580]
 
+PLUGIN AUTHOR CHANGES:
+
+  - `Machine#reload` will now properly trigger the `machine\_id\_changed`
+      callback on providers.
+
 ## 1.6.5 (September 4, 2014)
 
 BUG FIXES:

lib/vagrant/machine.rb

@@ -342,6 +342,7 @@ module Vagrant
 
     # This reloads the ID of the underlying machine.
     def reload
+      old_id = @id
       @id = nil
 
       if @data_dir
@@ -350,6 +351,13 @@ module Vagrant
         id_file = @data_dir.join("id")
         @id = id_file.read.chomp if id_file.file?
       end
+
+      if @id != old_id && @provider
+        # It changed, notify the provider
+        @provider.machine_id_changed
+      end
+
+      @id
     end
 
     # This returns the SSH info for accessing this machine. This SSH info

plugins/providers/docker/action/host_machine.rb

@@ -44,6 +44,13 @@ module VagrantPlugins
           proxy_ui.opts[:prefix_spaces] = true
           proxy_ui.opts[:target] = env[:machine].name.to_s
 
+          # Reload the machine so that if it was created while we didn't
+          # hold the lock, we'll see the updated state.
+          host_machine.reload
+
+          p host_machine.id
+          p host_machine.ssh_info
+
           # See if the machine is ready already. If not, start it.
           if host_machine.communicate.ready?
             env[:machine].ui.detail(I18n.t("docker_provider.host_machine_ready"))

test/unit/vagrant/machine_test.rb

@@ -451,11 +451,12 @@ describe Vagrant::Machine do
   describe "#reload" do
     before do
       allow(provider).to receive(:machine_id_changed)
-
       subject.id = "foo"
     end
 
     it "should read the ID" do
+      expect(provider).to_not receive(:machine_id_changed)
+
       subject.reload
 
       expect(subject.id).to eq("foo")
@@ -464,6 +465,8 @@ describe Vagrant::Machine do
     it "should read the updated ID" do
       new_instance.id = "bar"
 
+      expect(provider).to receive(:machine_id_changed)
+
       subject.reload
 
       expect(subject.id).to eq("bar")