From 5a7e00c5b1deffa3329c43c9c22186cd6d49991e Mon Sep 17 00:00:00 2001
From: Ray Ruvinskiy <ray.ruvinskiy@arcticwolf.com>
Date: Sun, 7 Sep 2014 23:45:32 -0400
Subject: [PATCH 001/354] Add HTTPS download options to `box update` and `box
 outdated`

Vagrant::Box.load_metadata did not provide a way to specify the HTTPS
download options that could be specified when downloading boxes
(ca cert, ca path, client cert, insecure). As a result, while it was
possible to add a box whose metadata file needed to be downloaded with one of
those options specified, it was impossible to check for updates. The following
changes have been made to address the situation:

1. Create a DownloadMixins module to provide the --insecure, --cacert, --capth,
   and --cert command line options to all of `vagrant box add`,
   `vagrant box update`, and `vagrant box outdated`.
2. Extend `Vagrant::Box.has_update?` and `Vagrant::Box.load_metadata` to accept
   said download options.
3. Extend `box outdated` and `box update` commands to pass download options
   down.
4. Extend `Vagrant::Builtin::Action::BoxCheckOutdated` to honour download
   options.
5. Options specified on the command line take precedence over options specified
   in the machine configuration, if any.
6. Fix bug in `vagrant box add` where client cert was being passed down using
   the wrong environment key.
7. Unit test coverage in update_test and box_check_outdated_test.

Resolves #4420
---
 .../action/builtin/box_check_outdated.rb      |  12 +-
 lib/vagrant/box.rb                            |   9 +-
 plugins/commands/box/command/add.rb           |  23 +--
 .../commands/box/command/download_mixins.rb   |  29 +++
 plugins/commands/box/command/outdated.rb      |  15 +-
 plugins/commands/box/command/update.rb        |  35 +++-
 .../commands/box/command/update_test.rb       | 184 ++++++++++++++----
 .../action/builtin/box_check_outdated_test.rb |  37 +++-
 8 files changed, 275 insertions(+), 69 deletions(-)
 create mode 100644 plugins/commands/box/command/download_mixins.rb

diff --git a/lib/vagrant/action/builtin/box_check_outdated.rb b/lib/vagrant/action/builtin/box_check_outdated.rb
index cee8c6877..d39afd272 100644
--- a/lib/vagrant/action/builtin/box_check_outdated.rb
+++ b/lib/vagrant/action/builtin/box_check_outdated.rb
@@ -37,13 +37,23 @@ module Vagrant
           end
 
           constraints = machine.config.vm.box_version
+          # Have download options specified in the environment override
+          # options specified for the machine.
+          download_options = {
+            ca_cert: env[:ca_cert] || machine.config.vm.box_download_ca_cert,
+            ca_path: env[:ca_path] || machine.config.vm.box_download_ca_path,
+            client_cert: env[:client_cert] ||
+                           machine.config.vm.box_download_client_cert,
+            insecure: !env[:insecure].nil? ?
+                        env[:insecure] : machine.config.vm.box_download_insecure
+          }
 
           env[:ui].output(I18n.t(
             "vagrant.box_outdated_checking_with_refresh",
             name: box.name))
           update = nil
           begin
-            update = box.has_update?(constraints)
+            update = box.has_update?(constraints, download_options: download_options)
           rescue Errors::BoxMetadataDownloadError => e
             env[:ui].warn(I18n.t(
               "vagrant.box_outdated_metadata_download_error",
diff --git a/lib/vagrant/box.rb b/lib/vagrant/box.rb
index 537c94e2a..045b22fd3 100644
--- a/lib/vagrant/box.rb
+++ b/lib/vagrant/box.rb
@@ -115,8 +115,9 @@ module Vagrant
     # Loads the metadata URL and returns the latest metadata associated
     # with this box.
     #
+    # @param [Hash] download_options Options to pass to the downloader.
     # @return [BoxMetadata]
-    def load_metadata
+    def load_metadata(**download_options)
       tf = Tempfile.new("vagrant")
       tf.close
 
@@ -127,7 +128,7 @@ module Vagrant
         url = "file:#{url}"
       end
 
-      opts = { headers: ["Accept: application/json"] }
+      opts = { headers: ["Accept: application/json"] }.merge(download_options)
       Util::Downloader.new(url, tf.path, **opts).download!
       BoxMetadata.new(File.open(tf.path, "r"))
     rescue Errors::DownloaderError => e
@@ -148,7 +149,7 @@ module Vagrant
     #   satisfy. If nil, the version constrain defaults to being a
     #   larger version than this box.
     # @return [Array]
-    def has_update?(version=nil)
+    def has_update?(version=nil, download_options: {})
       if !@metadata_url
         raise Errors::BoxUpdateNoMetadata, name: @name
       end
@@ -156,7 +157,7 @@ module Vagrant
       version += ", " if version
       version ||= ""
       version += "> #{@version}"
-      md      = self.load_metadata
+      md      = self.load_metadata(download_options)
       newer   = md.version(version, provider: @provider)
       return nil if !newer
 
diff --git a/plugins/commands/box/command/add.rb b/plugins/commands/box/command/add.rb
index 0356ee298..e9d429433 100644
--- a/plugins/commands/box/command/add.rb
+++ b/plugins/commands/box/command/add.rb
@@ -1,9 +1,13 @@
 require 'optparse'
 
+require_relative 'download_mixins'
+
 module VagrantPlugins
   module CommandBox
     module Command
       class Add < Vagrant.plugin("2", :command)
+        include DownloadMixins
+
         def execute
           options = {}
 
@@ -21,22 +25,7 @@ module VagrantPlugins
               options[:force] = f
             end
 
-            o.on("--insecure", "Do not validate SSL certificates") do |i|
-              options[:insecure] = i
-            end
-
-            o.on("--cacert FILE", String, "CA certificate for SSL download") do |c|
-              options[:ca_cert] = c
-            end
-
-            o.on("--capath DIR", String, "CA certificate directory for SSL download") do |c|
-              options[:ca_path] = c
-            end
-
-            o.on("--cert FILE", String,
-                 "A client SSL cert, if needed") do |c|
-              options[:client_cert] = c
-            end
+            build_download_options(o, options)
 
             o.on("--provider PROVIDER", String, "Provider the box should satisfy") do |p|
               options[:provider] = p
@@ -93,7 +82,7 @@ module VagrantPlugins
             box_force: options[:force],
             box_download_ca_cert: options[:ca_cert],
             box_download_ca_path: options[:ca_path],
-            box_download_client_cert: options[:client_cert],
+            box_client_cert: options[:client_cert],
             box_download_insecure: options[:insecure],
             ui: Vagrant::UI::Prefixed.new(@env.ui, "box"),
           })
diff --git a/plugins/commands/box/command/download_mixins.rb b/plugins/commands/box/command/download_mixins.rb
new file mode 100644
index 000000000..eda31b6bf
--- /dev/null
+++ b/plugins/commands/box/command/download_mixins.rb
@@ -0,0 +1,29 @@
+module VagrantPlugins
+  module CommandBox
+    module DownloadMixins
+      # This adds common download command line flags to the given
+      # OptionParser, storing the result in the `options` dictionary.
+      #
+      # @param [OptionParser] parser
+      # @param [Hash] options
+      def build_download_options(parser, options)
+        # Add the options
+        parser.on("--insecure", "Do not validate SSL certificates") do |i|
+          options[:insecure] = i
+        end
+
+        parser.on("--cacert FILE", String, "CA certificate for SSL download") do |c|
+          options[:ca_cert] = c
+        end
+
+        parser.on("--capath DIR", String, "CA certificate directory for SSL download") do |c|
+          options[:ca_path] = c
+        end
+
+        parser.on("--cert FILE", String, "A client SSL cert, if needed") do |c|
+          options[:client_cert] = c
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/commands/box/command/outdated.rb b/plugins/commands/box/command/outdated.rb
index a686fa496..cde932e1a 100644
--- a/plugins/commands/box/command/outdated.rb
+++ b/plugins/commands/box/command/outdated.rb
@@ -1,11 +1,16 @@
 require 'optparse'
 
+require_relative 'download_mixins'
+
 module VagrantPlugins
   module CommandBox
     module Command
       class Outdated < Vagrant.plugin("2", :command)
+        include DownloadMixins
+
         def execute
           options = {}
+          download_options = {}
 
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant box outdated [options]"
@@ -20,6 +25,8 @@ module VagrantPlugins
             o.on("--global", "Check all boxes installed") do |g|
               options[:global] = g
             end
+
+            build_download_options(o, download_options)
           end
 
           argv = parse_options(opts)
@@ -27,7 +34,7 @@ module VagrantPlugins
 
           # If we're checking the boxes globally, then do that.
           if options[:global]
-            outdated_global
+            outdated_global(download_options)
             return 0
           end
 
@@ -37,11 +44,11 @@ module VagrantPlugins
               box_outdated_refresh: true,
               box_outdated_success_ui: true,
               machine: machine,
-            })
+            }.merge(download_options))
           end
         end
 
-        def outdated_global
+        def outdated_global(download_options)
           boxes = {}
           @env.boxes.all.reverse.each do |name, version, provider|
             next if boxes[name]
@@ -58,7 +65,7 @@ module VagrantPlugins
 
             md = nil
             begin
-              md = box.load_metadata
+              md = box.load_metadata(download_options)
             rescue Vagrant::Errors::DownloaderError => e
               @env.ui.error(I18n.t(
                 "vagrant.box_outdated_metadata_error",
diff --git a/plugins/commands/box/command/update.rb b/plugins/commands/box/command/update.rb
index 5633b0aaf..67d07bcc0 100644
--- a/plugins/commands/box/command/update.rb
+++ b/plugins/commands/box/command/update.rb
@@ -1,11 +1,16 @@
 require 'optparse'
 
+require_relative 'download_mixins'
+
 module VagrantPlugins
   module CommandBox
     module Command
       class Update < Vagrant.plugin("2", :command)
+        include DownloadMixins
+
         def execute
           options = {}
+          download_options = {}
 
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant box update [options]"
@@ -27,21 +32,23 @@ module VagrantPlugins
             o.on("--provider PROVIDER", String, "Update box with specific provider") do |p|
               options[:provider] = p.to_sym
             end
+
+            build_download_options(o, download_options)
           end
 
           argv = parse_options(opts)
           return if !argv
 
           if options[:box]
-            update_specific(options[:box], options[:provider])
+            update_specific(options[:box], options[:provider], download_options)
           else
-            update_vms(argv, options[:provider])
+            update_vms(argv, options[:provider], download_options)
           end
 
           0
         end
 
-        def update_specific(name, provider)
+        def update_specific(name, provider, download_options)
           boxes = {}
           @env.boxes.all.each do |n, v, p|
             boxes[n] ||= {}
@@ -74,11 +81,11 @@ module VagrantPlugins
 
           to_update.each do |n, p, v|
             box = @env.boxes.find(n, p, v)
-            box_update(box, "> #{v}", @env.ui)
+            box_update(box, "> #{v}", @env.ui, download_options)
           end
         end
 
-        def update_vms(argv, provider)
+        def update_vms(argv, provider, download_options)
           with_target_vms(argv, provider: provider) do |machine|
             if !machine.config.vm.box
               machine.ui.output(I18n.t(
@@ -95,17 +102,25 @@ module VagrantPlugins
 
             box = machine.box
             version = machine.config.vm.box_version
-            box_update(box, version, machine.ui)
+            # Get download options from machine configuration if not specified
+            # on the command line.
+            download_options[:ca_cert] ||= machine.config.vm.box_download_ca_cert
+            download_options[:ca_path] ||= machine.config.vm.box_download_ca_path
+            download_options[:client_cert] ||= machine.config.vm.box_download_client_cert
+            if download_options[:insecure].nil?
+              download_options[:insecure] = machine.config.vm.box_download_insecure
+            end
+            box_update(box, version, machine.ui, download_options)
           end
         end
 
-        def box_update(box, version, ui)
+        def box_update(box, version, ui, download_options)
           ui.output(I18n.t("vagrant.box_update_checking", name: box.name))
           ui.detail("Latest installed version: #{box.version}")
           ui.detail("Version constraints: #{version}")
           ui.detail("Provider: #{box.provider}")
 
-          update = box.has_update?(version)
+          update = box.has_update?(version, download_options: download_options)
           if !update
             ui.success(I18n.t(
               "vagrant.box_up_to_date_single",
@@ -124,6 +139,10 @@ module VagrantPlugins
             box_provider: update[2].name,
             box_version: update[1].version,
             ui: ui,
+            box_client_cert: download_options[:client_cert],
+            box_download_ca_cert: download_options[:ca_cert],
+            box_download_ca_path: download_options[:ca_path],
+            box_download_insecure: download_options[:insecure]
           })
         end
       end
diff --git a/test/unit/plugins/commands/box/command/update_test.rb b/test/unit/plugins/commands/box/command/update_test.rb
index 4477d0aa5..067d0dd35 100644
--- a/test/unit/plugins/commands/box/command/update_test.rb
+++ b/test/unit/plugins/commands/box/command/update_test.rb
@@ -19,6 +19,11 @@ describe VagrantPlugins::CommandBox::Command::Update do
   let(:action_runner) { double("action_runner") }
   let(:machine) { iso_env.machine(iso_env.machine_names[0], :dummy) }
 
+  let(:download_options) { ["--insecure",
+                            "--cacert", "foo",
+                            "--capath", "bar",
+                            "--cert", "baz"] }
+
   subject { described_class.new(argv, iso_env) }
 
   before do
@@ -86,6 +91,10 @@ describe VagrantPlugins::CommandBox::Command::Update do
             expect(opts[:box_url]).to eq(metadata_url.to_s)
             expect(opts[:box_provider]).to eq("virtualbox")
             expect(opts[:box_version]).to eq("1.1")
+            expect(opts[:box_download_ca_path]).to be_nil
+            expect(opts[:box_download_ca_cert]).to be_nil
+            expect(opts[:box_client_cert]).to be_nil
+            expect(opts[:box_download_insecure]).to be_nil
           end
 
           opts
@@ -158,6 +167,50 @@ describe VagrantPlugins::CommandBox::Command::Update do
         end
       end
 
+      context "download options are specified" do
+        let(:argv) { ["--box", "foo" ].concat(download_options) }
+
+        it "passes down download options" do
+          metadata_url.open("w") do |f|
+            f.write(<<-RAW)
+        {
+          "name": "foo",
+          "versions": [
+            {
+              "version": "1.0"
+            },
+            {
+              "version": "1.1",
+              "providers": [
+                {
+                  "name": "virtualbox",
+                  "url": "bar"
+                }
+              ]
+            }
+          ]
+        }
+            RAW
+          end
+
+          action_called = false
+          allow(action_runner).to receive(:run) do |action, opts|
+            if opts[:box_provider]
+              action_called = true
+              expect(opts[:box_download_ca_cert]).to eq("foo")
+              expect(opts[:box_download_ca_path]).to eq("bar")
+              expect(opts[:box_client_cert]).to eq("baz")
+              expect(opts[:box_download_insecure]).to be_true
+            end
+
+            opts
+          end
+
+          subject.execute
+          expect(action_called).to be_true
+        end
+      end
+
       context "with a box that doesn't exist" do
         let(:argv) { ["--box", "nope"] }
 
@@ -192,7 +245,10 @@ describe VagrantPlugins::CommandBox::Command::Update do
       it "doesn't update boxes if they're up-to-date" do
         machine.stub(box: box)
         expect(box).to receive(:has_update?).
-          with(machine.config.vm.box_version).
+          with(machine.config.vm.box_version,
+               {download_options:
+                 {ca_cert: nil, ca_path: nil, client_cert: nil,
+                  insecure: false}}).
           and_return(nil)
 
         expect(action_runner).to receive(:run).never
@@ -200,41 +256,101 @@ describe VagrantPlugins::CommandBox::Command::Update do
         subject.execute
       end
 
-      it "updates boxes if they have an update" do
-        md = Vagrant::BoxMetadata.new(StringIO.new(<<-RAW))
-      {
-        "name": "foo",
-        "versions": [
-          {
-            "version": "1.0"
-          },
-          {
-            "version": "1.1",
-            "providers": [
-              {
-                "name": "virtualbox",
-                "url": "bar"
-              }
-            ]
-          }
-        ]
-      }
-        RAW
-
-        machine.stub(box: box)
-        expect(box).to receive(:has_update?).
-          with(machine.config.vm.box_version).
-          and_return([md, md.version("1.1"), md.version("1.1").provider("virtualbox")])
-
-        expect(action_runner).to receive(:run).with { |action, opts|
-          expect(opts[:box_url]).to eq(box.metadata_url)
-          expect(opts[:box_provider]).to eq("virtualbox")
-          expect(opts[:box_version]).to eq("1.1")
-          expect(opts[:ui]).to equal(machine.ui)
-          true
+      context "boxes have an update" do
+        let(:md) {
+          md = Vagrant::BoxMetadata.new(StringIO.new(<<-RAW))
+        {
+          "name": "foo",
+          "versions": [
+            {
+              "version": "1.0"
+            },
+            {
+              "version": "1.1",
+              "providers": [
+                {
+                  "name": "virtualbox",
+                  "url": "bar"
+                }
+              ]
+            }
+          ]
+        }
+          RAW
         }
 
-        subject.execute
+        before { machine.stub(box: box) }
+
+        it "updates boxes" do
+          expect(box).to receive(:has_update?).
+            with(machine.config.vm.box_version,
+                 {download_options:
+                   {ca_cert: nil, ca_path: nil, client_cert: nil,
+                    insecure: false}}).
+            and_return([md, md.version("1.1"), md.version("1.1").provider("virtualbox")])
+
+          expect(action_runner).to receive(:run).with { |action, opts|
+            expect(opts[:box_url]).to eq(box.metadata_url)
+            expect(opts[:box_provider]).to eq("virtualbox")
+            expect(opts[:box_version]).to eq("1.1")
+            expect(opts[:ui]).to equal(machine.ui)
+            true
+          }
+
+          subject.execute
+        end
+
+        context "machine has download options" do
+          before do
+            machine.config.vm.box_download_ca_cert = "oof"
+            machine.config.vm.box_download_ca_path = "rab"
+            machine.config.vm.box_download_client_cert = "zab"
+            machine.config.vm.box_download_insecure = false
+          end
+
+          it "uses download options from machine" do
+            expect(box).to receive(:has_update?).
+              with(machine.config.vm.box_version,
+                   {download_options:
+                     {ca_cert: "oof", ca_path: "rab", client_cert: "zab",
+                      insecure: false}}).
+              and_return([md, md.version("1.1"), md.version("1.1").provider("virtualbox")])
+
+            expect(action_runner).to receive(:run).with { |action, opts|
+              expect(opts[:box_download_ca_cert]).to eq("oof")
+              expect(opts[:box_download_ca_path]).to eq("rab")
+              expect(opts[:box_client_cert]).to eq("zab")
+              expect(opts[:box_download_insecure]).to be_false
+              true
+            }
+
+            subject.execute
+          end
+
+          context "download options are specified on the command line" do
+            let(:argv) { download_options }
+
+            it "overrides download options from machine with options from CLI" do
+              expect(box).to receive(:has_update?).
+                with(machine.config.vm.box_version,
+                     {download_options:
+                       {ca_cert: "foo", ca_path: "bar", client_cert: "baz",
+                        insecure: true}}).
+                and_return([md, md.version("1.1"),
+                            md.version("1.1").provider("virtualbox")])
+
+              expect(action_runner).to receive(:run).with { |action, opts|
+                expect(opts[:box_download_ca_cert]).to eq("foo")
+                expect(opts[:box_download_ca_path]).to eq("bar")
+                expect(opts[:box_client_cert]).to eq("baz")
+                expect(opts[:box_download_insecure]).to be_true
+                true
+              }
+
+              subject.execute
+            end
+          end
+        end
       end
     end
   end
diff --git a/test/unit/vagrant/action/builtin/box_check_outdated_test.rb b/test/unit/vagrant/action/builtin/box_check_outdated_test.rb
index bcb313d1c..0bb175c59 100644
--- a/test/unit/vagrant/action/builtin/box_check_outdated_test.rb
+++ b/test/unit/vagrant/action/builtin/box_check_outdated_test.rb
@@ -117,7 +117,9 @@ describe Vagrant::Action::Builtin::BoxCheckOutdated do
       }
       RAW
 
-      expect(box).to receive(:has_update?).with(machine.config.vm.box_version).
+      expect(box).to receive(:has_update?).with(machine.config.vm.box_version,
+          {download_options:
+            {ca_cert: nil, ca_path: nil, client_cert: nil, insecure: false}}).
         and_return([md, md.version("1.1"), md.version("1.1").provider("virtualbox")])
 
       expect(app).to receive(:call).with(env).once
@@ -180,5 +182,38 @@ describe Vagrant::Action::Builtin::BoxCheckOutdated do
 
       expect { subject.call(env) }.to_not raise_error
     end
+
+    context "when machine download options are specified" do
+      before do
+        machine.config.vm.box_download_ca_cert = "foo"
+        machine.config.vm.box_download_ca_path = "bar"
+        machine.config.vm.box_download_client_cert = "baz"
+        machine.config.vm.box_download_insecure = true
+      end
+
+      it "uses download options from machine" do
+        expect(box).to receive(:has_update?).with(machine.config.vm.box_version,
+          {download_options:
+            {ca_cert: "foo", ca_path: "bar", client_cert: "baz", insecure: true}})
+
+        expect(app).to receive(:call).with(env).once
+
+        subject.call(env)
+      end
+
+      it "overrides download options from machine with options from env" do
+        expect(box).to receive(:has_update?).with(machine.config.vm.box_version,
+          {download_options:
+            {ca_cert: "oof", ca_path: "rab", client_cert: "zab", insecure: false}})
+
+        env[:ca_cert] = "oof"
+        env[:ca_path] = "rab"
+        env[:client_cert] = "zab"
+        env[:insecure] = false
+        expect(app).to receive(:call).with(env).once
+
+        subject.call(env)
+      end
+    end
   end
 end

From 14b84a4a76dc3bc3e7693b2388b37072370169b6 Mon Sep 17 00:00:00 2001
From: Rob Kinyon <rob.kinyon@gmail.com>
Date: Tue, 28 Oct 2014 21:53:41 -0400
Subject: [PATCH 002/354] Added a --plugin-clean-sources parameter that will
 allow for only those sources that are defined by the user to be used.

---
 .gitignore                                            |  4 ++++
 lib/vagrant/bundler.rb                                |  5 -----
 plugins/commands/plugin/command/mixin_install_opts.rb | 11 ++++++++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 47b95a67e..8fe665031 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,10 @@
 # OS-specific
 .DS_Store
 
+# Editor swapfiles
+.*.sw?
+*~
+
 # Vagrant stuff
 acceptance_config.yml
 boxes/*
diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb
index 05867da15..e12b89174 100644
--- a/lib/vagrant/bundler.rb
+++ b/lib/vagrant/bundler.rb
@@ -178,11 +178,6 @@ module Vagrant
 
       f = File.open(Tempfile.new("vagrant").path + "2", "w+")
       f.tap do |gemfile|
-        if !sources.include?("http://rubygems.org")
-          gemfile.puts(%Q[source "https://rubygems.org"])
-        end
-
-        gemfile.puts(%Q[source "http://gems.hashicorp.com"])
         sources.each do |source|
           next if source == ""
           gemfile.puts(%Q[source "#{source}"])
diff --git a/plugins/commands/plugin/command/mixin_install_opts.rb b/plugins/commands/plugin/command/mixin_install_opts.rb
index 0b1b0973a..ffee55cde 100644
--- a/plugins/commands/plugin/command/mixin_install_opts.rb
+++ b/plugins/commands/plugin/command/mixin_install_opts.rb
@@ -3,6 +3,11 @@ module VagrantPlugins
     module Command
       module MixinInstallOpts
         def build_install_opts(o, options)
+          options[:plugin_sources] = [
+            "https://rubygems.org",
+            "http://gems.hashicorp.com",
+          ]
+
           o.on("--entry-point NAME", String,
                "The name of the entry point file for loading the plugin.") do |entry_point|
             options[:entry_point] = entry_point
@@ -17,9 +22,13 @@ module VagrantPlugins
             puts
           end
 
+          o.on("--plugin-clean-sources", String,
+            "Remove all plugin sources defined so far (including defaults)") do
+            options[:plugin_sources] = []
+          end
+
           o.on("--plugin-source PLUGIN_SOURCE", String,
                "Add a RubyGems repository source") do |plugin_source|
-            options[:plugin_sources] ||= []
             options[:plugin_sources] << plugin_source
           end
 

From c60a020096e576243e703517511d886fd461a925 Mon Sep 17 00:00:00 2001
From: Matt Wrock <matt@mattwrock.com>
Date: Wed, 27 Aug 2014 12:17:30 -0700
Subject: [PATCH 003/354] adds a ps command to vagrant that drops the user into
 a remote powershell shell

---
 plugins/commands/ps/command.rb                | 116 ++++++++++++++++++
 plugins/commands/ps/errors.rb                 |  18 +++
 plugins/commands/ps/plugin.rb                 |  31 +++++
 .../commands/ps/scripts/enable_psremoting.ps1 |  60 +++++++++
 .../ps/scripts/reset_trustedhosts.ps1         |  12 ++
 plugins/hosts/windows/cap/ps.rb               |  50 ++++++++
 plugins/hosts/windows/plugin.rb               |   5 +
 templates/locales/command_ps.yml              |  16 +++
 8 files changed, 308 insertions(+)
 create mode 100644 plugins/commands/ps/command.rb
 create mode 100644 plugins/commands/ps/errors.rb
 create mode 100644 plugins/commands/ps/plugin.rb
 create mode 100644 plugins/commands/ps/scripts/enable_psremoting.ps1
 create mode 100644 plugins/commands/ps/scripts/reset_trustedhosts.ps1
 create mode 100644 plugins/hosts/windows/cap/ps.rb
 create mode 100644 templates/locales/command_ps.yml

diff --git a/plugins/commands/ps/command.rb b/plugins/commands/ps/command.rb
new file mode 100644
index 000000000..33eeec253
--- /dev/null
+++ b/plugins/commands/ps/command.rb
@@ -0,0 +1,116 @@
+require "optparse"
+
+require_relative "../../communicators/winrm/helper"
+
+module VagrantPlugins
+  module CommandPS
+    class Command < Vagrant.plugin("2", :command)
+      def self.synopsis
+        "connects to machine via powershell remoting"
+      end
+
+      def execute
+        options = {}
+
+        opts = OptionParser.new do |o|
+          o.banner = "Usage: vagrant ps [-- extra ps args]"
+
+          o.separator ""
+          o.separator "Options:"
+          o.separator ""
+
+          o.on("-c", "--command COMMAND", "Execute a powershell command directly") do |c|
+            options[:command] = c
+          end
+        end
+
+        # Parse out the extra args to send to the ps session, which
+        # is everything after the "--"
+        split_index = @argv.index("--")
+        if split_index
+          options[:extra_args] = @argv.drop(split_index + 1)
+          @argv                = @argv.take(split_index)
+        end
+
+        # Parse the options and return if we don't have any target.
+        argv = parse_options(opts)
+        return if !argv
+
+        # Check if the host even supports ps remoting
+        raise Errors::HostUnsupported if !@env.host.capability?(:ps_client)
+
+        # Execute ps session if we can
+        with_target_vms(argv, single_target: true) do |machine|
+          if !machine.communicate.ready?
+            raise Vagrant::Errors::VMNotCreatedError
+          end
+
+          if machine.config.vm.communicator != :winrm #|| !machine.provider.capability?(:winrm_info)
+            raise VagrantPlugins::CommunicatorWinRM::Errors::WinRMNotReady
+          end
+
+          if !options[:command].nil?
+            out_code = machine.communicate.execute options[:command]
+            if out_code == 0
+              machine.ui.detail("Command: #{options[:command]} executed succesfully with output code #{out_code}.")
+            end
+            break
+          end
+
+          ps_info = VagrantPlugins::CommunicatorWinRM::Helper.winrm_info(machine)
+          ps_info[:username] = machine.config.winrm.username
+          ps_info[:password] = machine.config.winrm.password
+          # Extra arguments if we have any
+          ps_info[:extra_args] = options[:extra_args]
+
+          result = ready_ps_remoting_for machine, ps_info
+
+          machine.ui.detail(
+            "Creating powershell session to #{ps_info[:host]}:#{ps_info[:port]}")
+          machine.ui.detail("Username: #{ps_info[:username]}")
+
+          begin
+            @env.host.capability(:ps_client, ps_info)
+          ensure
+            if !result["PreviousTrustedHosts"].nil?
+              reset_ps_remoting_for machine, ps_info
+            end
+          end
+        end
+      end
+
+      def ready_ps_remoting_for(machine, ps_info)
+        machine.ui.output(I18n.t("vagrant_ps.detecting"))
+        script_path = File.expand_path("../scripts/enable_psremoting.ps1", __FILE__)
+        args = []
+        args << "-hostname" << ps_info[:host]
+        args << "-port" << ps_info[:port].to_s
+        args << "-username" << ps_info[:username]
+        args << "-password" << ps_info[:password]
+        result = Vagrant::Util::PowerShell.execute(script_path, *args)
+        if result.exit_code != 0
+          raise Errors::PowershellError,
+            script: script_path,
+            stderr: result.stderr
+        end
+
+        result_output = JSON.parse(result.stdout)
+        raise Errors::PSRemotingUndetected if !result_output["Success"]
+        result_output
+      end
+
+      def reset_ps_remoting_for(machine, ps_info)
+        machine.ui.output(I18n.t("vagrant_ps.reseting"))
+        script_path = File.expand_path("../scripts/reset_trustedhosts.ps1", __FILE__)
+        args = []
+        args << "-hostname" << ps_info[:host]
+        result = Vagrant::Util::PowerShell.execute(script_path, *args)
+        if result.exit_code != 0
+          raise Errors::PowershellError,
+            script: script_path,
+            stderr: result.stderr
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/commands/ps/errors.rb b/plugins/commands/ps/errors.rb
new file mode 100644
index 000000000..c614fb87a
--- /dev/null
+++ b/plugins/commands/ps/errors.rb
@@ -0,0 +1,18 @@
+module VagrantPlugins
+  module CommandPS
+    module Errors
+      # A convenient superclass for all our errors.
+      class PSError < Vagrant::Errors::VagrantError
+        error_namespace("vagrant_ps.errors")
+      end
+
+      class HostUnsupported < PSError
+        error_key(:host_unsupported)
+      end
+
+      class PSRemotingUndetected < PSError
+        error_key(:ps_remoting_undetected)
+      end
+    end
+  end
+end
diff --git a/plugins/commands/ps/plugin.rb b/plugins/commands/ps/plugin.rb
new file mode 100644
index 000000000..56b84b3c5
--- /dev/null
+++ b/plugins/commands/ps/plugin.rb
@@ -0,0 +1,31 @@
+require "vagrant"
+
+module VagrantPlugins
+  module CommandPS
+    autoload :Errors, File.expand_path("../errors", __FILE__)
+
+    class Plugin < Vagrant.plugin("2")
+      name "ps command"
+      description <<-DESC
+      The ps command opens a remote powershell session to the
+      machine if it supports powershell remoting.
+      DESC
+
+      command("ps") do
+        require File.expand_path("../command", __FILE__)
+        init!
+        Command
+      end
+
+      protected
+
+      def self.init!
+        return if defined?(@_init)
+        I18n.load_path << File.expand_path(
+          "templates/locales/command_ps.yml", Vagrant.source_root)
+        I18n.reload!
+        @_init = true
+      end
+    end
+  end
+end
diff --git a/plugins/commands/ps/scripts/enable_psremoting.ps1 b/plugins/commands/ps/scripts/enable_psremoting.ps1
new file mode 100644
index 000000000..4d7ded704
--- /dev/null
+++ b/plugins/commands/ps/scripts/enable_psremoting.ps1
@@ -0,0 +1,60 @@
+Param(
+    [string]$hostname,
+    [string]$port,
+    [string]$username,
+    [string]$password
+)
+# If we are in this script, we know basic winrm is working
+# If the user is not using a domain acount and chances are
+# they are not, PS Remoting will not work if the guest is not
+# listed in the trusted hosts.
+
+$encrypted_password = ConvertTo-SecureString $password -asplaintext -force
+$creds = New-Object System.Management.Automation.PSCredential (
+    "$hostname\\$username", $encrypted_password)
+
+$result = @{
+    Success = $false
+    PreviousTrustedHosts = $null
+}
+try {
+    invoke-command -computername $hostname `
+                   -Credential $creds `
+                   -Port $port `
+                   -ScriptBlock {} `
+                   -ErrorAction Stop
+    $result.Success = $true
+} catch{}
+
+if(!$result.Success) { 
+    $newHosts = @()
+    $result.PreviousTrustedHosts=(
+        Get-Item "wsman:\localhost\client\trustedhosts").Value
+    $hostArray=$result.PreviousTrustedHosts.Split(",").Trim()
+    if($hostArray -contains "*") {
+        $result.PreviousTrustedHosts = $null
+    }
+    elseif(!($hostArray -contains $hostname)) {
+        $strNewHosts = $hostname
+        if($result.PreviousTrustedHosts.Length -gt 0){
+            $strNewHosts = $result.PreviousTrustedHosts + "," + $strNewHosts
+        }
+        Set-Item -Path "wsman:\localhost\client\trustedhosts" `
+          -Value $strNewHosts -Force
+
+        try {
+            invoke-command -computername $hostname `
+                           -Credential $creds `
+                           -Port $port `
+                           -ScriptBlock {} `
+                           -ErrorAction Stop
+            $result.Success = $true
+        } catch{
+            Set-Item -Path "wsman:\localhost\client\trustedhosts" `
+              -Value $result.PreviousTrustedHosts -Force
+            $result.PreviousTrustedHosts = $null
+        }
+    }
+}
+
+Write-Output $(ConvertTo-Json $result)
diff --git a/plugins/commands/ps/scripts/reset_trustedhosts.ps1 b/plugins/commands/ps/scripts/reset_trustedhosts.ps1
new file mode 100644
index 000000000..5865a4e77
--- /dev/null
+++ b/plugins/commands/ps/scripts/reset_trustedhosts.ps1
@@ -0,0 +1,12 @@
+Param(
+    [string]$hostname
+)
+
+$trustedHosts = (
+    Get-Item "wsman:\localhost\client\trustedhosts").Value.Replace(
+    $hostname, '')
+$trustedHosts = $trustedHosts.Replace(",,","")
+if($trustedHosts.EndsWith(",")){
+    $trustedHosts = $trustedHosts.Substring(0,$trustedHosts.length-1)
+}
+Set-Item "wsman:\localhost\client\trustedhosts" -Value $trustedHosts -Force
\ No newline at end of file
diff --git a/plugins/hosts/windows/cap/ps.rb b/plugins/hosts/windows/cap/ps.rb
new file mode 100644
index 000000000..939235915
--- /dev/null
+++ b/plugins/hosts/windows/cap/ps.rb
@@ -0,0 +1,50 @@
+require "pathname"
+require "tmpdir"
+
+require "vagrant/util/subprocess"
+
+module VagrantPlugins
+  module HostWindows
+    module Cap
+      class PS
+        def self.ps_client(env, ps_info)
+          logger = Log4r::Logger.new("vagrant::hosts::windows")
+
+          command = <<-EOS
+            $plain_password = "#{ps_info[:password]}"
+            $username = "#{ps_info[:username]}"
+            $port = "#{ps_info[:port]}"
+            $hostname = "#{ps_info[:host]}"
+            $password = ConvertTo-SecureString $plain_password -asplaintext -force
+            $creds = New-Object System.Management.Automation.PSCredential ("$hostname\\$username", $password)
+            function prompt { kill $PID }
+            Enter-PSSession -ComputerName $hostname -Credential $creds -Port $port
+          EOS
+
+          logger.debug("Starting remote powershell with command:\n#{command}")
+          command = command.chars.to_a.join("\x00").chomp
+          command << "\x00" unless command[-1].eql? "\x00"
+          if(defined?(command.encode))
+            command = command.encode('ASCII-8BIT')
+            command = Base64.strict_encode64(command)
+          else
+            command = Base64.encode64(command).chomp
+          end
+
+          args = ["-NoProfile"]
+          args << "-ExecutionPolicy"
+          args << "Bypass"
+          args << "-NoExit"
+          args << "-EncodedCommand"
+          args << command
+          if ps_info[:extra_args]
+            args << ps_info[:extra_args]
+          end
+
+          # Launch it
+          Vagrant::Util::Subprocess.execute("powershell", *args)
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/hosts/windows/plugin.rb b/plugins/hosts/windows/plugin.rb
index fe3b28923..97e8ad134 100644
--- a/plugins/hosts/windows/plugin.rb
+++ b/plugins/hosts/windows/plugin.rb
@@ -20,6 +20,11 @@ module VagrantPlugins
         require_relative "cap/rdp"
         Cap::RDP
       end
+
+      host_capability("windows", "ps_client") do
+        require_relative "cap/ps"
+        Cap::PS
+      end
     end
   end
 end
diff --git a/templates/locales/command_ps.yml b/templates/locales/command_ps.yml
new file mode 100644
index 000000000..e30e5246c
--- /dev/null
+++ b/templates/locales/command_ps.yml
@@ -0,0 +1,16 @@
+en:
+  vagrant_ps:
+    detecting: |-
+      Detecting if a remote powershell connection can be made with the guest...
+    reseting: |-
+      Reseting WinRM TrustedHosts to their original value.
+
+    errors:
+      host_unsupported: |-
+        Your host does not support powershell. A remote powershell connection
+        can only be made from a windows host.
+
+      ps_remoting_undetected: |-
+        Unable to establish a remote powershell connection with the guest. 
+        Check if the firewall rules on the guest allow connections to the 
+        windows remote management service.

From 1cd10330933fce64608ce2d47bbb72ad0756533f Mon Sep 17 00:00:00 2001
From: Matt Wrock <matt@mattwrock.com>
Date: Fri, 5 Jun 2015 00:11:06 -0700
Subject: [PATCH 004/354] fixes from @sethvargo comments.

---
 plugins/commands/ps/command.rb       | 10 +++++-----
 plugins/commands/ps/plugin.rb        |  7 +++----
 plugins/communicators/winrm/shell.rb |  2 +-
 templates/locales/command_ps.yml     |  8 ++++----
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/plugins/commands/ps/command.rb b/plugins/commands/ps/command.rb
index 33eeec253..3bcc41ba8 100644
--- a/plugins/commands/ps/command.rb
+++ b/plugins/commands/ps/command.rb
@@ -45,16 +45,16 @@ module VagrantPlugins
             raise Vagrant::Errors::VMNotCreatedError
           end
 
-          if machine.config.vm.communicator != :winrm #|| !machine.provider.capability?(:winrm_info)
+          if machine.config.vm.communicator != :winrm
             raise VagrantPlugins::CommunicatorWinRM::Errors::WinRMNotReady
           end
 
           if !options[:command].nil?
-            out_code = machine.communicate.execute options[:command]
+            out_code = machine.communicate.execute(options[:command])
             if out_code == 0
               machine.ui.detail("Command: #{options[:command]} executed succesfully with output code #{out_code}.")
             end
-            break
+            next
           end
 
           ps_info = VagrantPlugins::CommunicatorWinRM::Helper.winrm_info(machine)
@@ -63,7 +63,7 @@ module VagrantPlugins
           # Extra arguments if we have any
           ps_info[:extra_args] = options[:extra_args]
 
-          result = ready_ps_remoting_for machine, ps_info
+          result = ready_ps_remoting_for(machine, ps_info)
 
           machine.ui.detail(
             "Creating powershell session to #{ps_info[:host]}:#{ps_info[:port]}")
@@ -73,7 +73,7 @@ module VagrantPlugins
             @env.host.capability(:ps_client, ps_info)
           ensure
             if !result["PreviousTrustedHosts"].nil?
-              reset_ps_remoting_for machine, ps_info
+              reset_ps_remoting_for(machine, ps_info)
             end
           end
         end
diff --git a/plugins/commands/ps/plugin.rb b/plugins/commands/ps/plugin.rb
index 56b84b3c5..847b82c47 100644
--- a/plugins/commands/ps/plugin.rb
+++ b/plugins/commands/ps/plugin.rb
@@ -7,12 +7,12 @@ module VagrantPlugins
     class Plugin < Vagrant.plugin("2")
       name "ps command"
       description <<-DESC
-      The ps command opens a remote powershell session to the
+      The ps command opens a remote PowerShell session to the
       machine if it supports powershell remoting.
       DESC
 
       command("ps") do
-        require File.expand_path("../command", __FILE__)
+        require_relative "../command"
         init!
         Command
       end
@@ -21,8 +21,7 @@ module VagrantPlugins
 
       def self.init!
         return if defined?(@_init)
-        I18n.load_path << File.expand_path(
-          "templates/locales/command_ps.yml", Vagrant.source_root)
+        I18n.load_path << File.expand_path("templates/locales/command_ps.yml", Vagrant.source_root)
         I18n.reload!
         @_init = true
       end
diff --git a/plugins/communicators/winrm/shell.rb b/plugins/communicators/winrm/shell.rb
index d9d5f28ce..784660b5e 100644
--- a/plugins/communicators/winrm/shell.rb
+++ b/plugins/communicators/winrm/shell.rb
@@ -9,7 +9,7 @@ Vagrant::Util::SilenceWarnings.silence! do
   require "winrm"
 end
 
-require "winrm-fs/file_manager"
+require "winrm-fs"
 
 module VagrantPlugins
   module CommunicatorWinRM
diff --git a/templates/locales/command_ps.yml b/templates/locales/command_ps.yml
index e30e5246c..51bf666cc 100644
--- a/templates/locales/command_ps.yml
+++ b/templates/locales/command_ps.yml
@@ -1,16 +1,16 @@
 en:
   vagrant_ps:
     detecting: |-
-      Detecting if a remote powershell connection can be made with the guest...
+      Detecting if a remote PowerShell connection can be made with the guest...
     reseting: |-
       Reseting WinRM TrustedHosts to their original value.
 
     errors:
       host_unsupported: |-
-        Your host does not support powershell. A remote powershell connection
+        Your host does not support PowerShell. A remote PowerShell connection
         can only be made from a windows host.
 
       ps_remoting_undetected: |-
-        Unable to establish a remote powershell connection with the guest. 
+        Unable to establish a remote PowerShell connection with the guest. 
         Check if the firewall rules on the guest allow connections to the 
-        windows remote management service.
+        Windows remote management service.

From 47e57a7cd941c1a2f24e287ab175b9728d5e042b Mon Sep 17 00:00:00 2001
From: Matt Wrock <matt@mattwrock.com>
Date: Fri, 5 Jun 2015 04:17:56 -0700
Subject: [PATCH 005/354] fix relative path

---
 plugins/commands/ps/plugin.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/commands/ps/plugin.rb b/plugins/commands/ps/plugin.rb
index 847b82c47..b108658bc 100644
--- a/plugins/commands/ps/plugin.rb
+++ b/plugins/commands/ps/plugin.rb
@@ -12,7 +12,7 @@ module VagrantPlugins
       DESC
 
       command("ps") do
-        require_relative "../command"
+        require_relative "command"
         init!
         Command
       end

From cf6d4ef5a1943ec656695440d452b160aa74f676 Mon Sep 17 00:00:00 2001
From: Matt Wrock <matt@mattwrock.com>
Date: Fri, 5 Jun 2015 04:18:23 -0700
Subject: [PATCH 006/354] clean up command encoding

---
 plugins/hosts/windows/cap/ps.rb | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/plugins/hosts/windows/cap/ps.rb b/plugins/hosts/windows/cap/ps.rb
index 939235915..9960f689e 100644
--- a/plugins/hosts/windows/cap/ps.rb
+++ b/plugins/hosts/windows/cap/ps.rb
@@ -22,21 +22,13 @@ module VagrantPlugins
           EOS
 
           logger.debug("Starting remote powershell with command:\n#{command}")
-          command = command.chars.to_a.join("\x00").chomp
-          command << "\x00" unless command[-1].eql? "\x00"
-          if(defined?(command.encode))
-            command = command.encode('ASCII-8BIT')
-            command = Base64.strict_encode64(command)
-          else
-            command = Base64.encode64(command).chomp
-          end
 
           args = ["-NoProfile"]
           args << "-ExecutionPolicy"
           args << "Bypass"
           args << "-NoExit"
           args << "-EncodedCommand"
-          args << command
+          args << ::WinRM::PowershellScript.new(command).encoded
           if ps_info[:extra_args]
             args << ps_info[:extra_args]
           end

From 740877065a8fc0b777cc7aa51b4fb074307affbd Mon Sep 17 00:00:00 2001
From: Matt Wrock <matt@mattwrock.com>
Date: Fri, 5 Jun 2015 05:03:29 -0700
Subject: [PATCH 007/354] marshall back command output when passing a command
 to ps

---
 plugins/commands/ps/command.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/commands/ps/command.rb b/plugins/commands/ps/command.rb
index 3bcc41ba8..ee021d0ed 100644
--- a/plugins/commands/ps/command.rb
+++ b/plugins/commands/ps/command.rb
@@ -50,9 +50,11 @@ module VagrantPlugins
           end
 
           if !options[:command].nil?
-            out_code = machine.communicate.execute(options[:command])
+            out_code = machine.communicate.execute(options[:command].dup) do |type,data|
+              machine.ui.detail(data) if type == :stdout
+            end
             if out_code == 0
-              machine.ui.detail("Command: #{options[:command]} executed succesfully with output code #{out_code}.")
+              machine.ui.success("Command: #{options[:command]} executed succesfully with output code #{out_code}.")
             end
             next
           end

From e6daf2f17279c7ec1452cec1123ad13dccf52890 Mon Sep 17 00:00:00 2001
From: Matt Wrock <matt@mattwrock.com>
Date: Fri, 5 Jun 2015 22:24:05 -0700
Subject: [PATCH 008/354] fix pscommand error messaging

---
 plugins/commands/ps/command.rb   |  4 ++--
 plugins/commands/ps/errors.rb    | 10 +++++++---
 templates/locales/command_ps.yml | 13 ++++++++++++-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/plugins/commands/ps/command.rb b/plugins/commands/ps/command.rb
index ee021d0ed..63963491a 100644
--- a/plugins/commands/ps/command.rb
+++ b/plugins/commands/ps/command.rb
@@ -91,7 +91,7 @@ module VagrantPlugins
         args << "-password" << ps_info[:password]
         result = Vagrant::Util::PowerShell.execute(script_path, *args)
         if result.exit_code != 0
-          raise Errors::PowershellError,
+          raise Errors::PowerShellError,
             script: script_path,
             stderr: result.stderr
         end
@@ -108,7 +108,7 @@ module VagrantPlugins
         args << "-hostname" << ps_info[:host]
         result = Vagrant::Util::PowerShell.execute(script_path, *args)
         if result.exit_code != 0
-          raise Errors::PowershellError,
+          raise Errors::PowerShellError,
             script: script_path,
             stderr: result.stderr
         end
diff --git a/plugins/commands/ps/errors.rb b/plugins/commands/ps/errors.rb
index c614fb87a..4be70551a 100644
--- a/plugins/commands/ps/errors.rb
+++ b/plugins/commands/ps/errors.rb
@@ -2,17 +2,21 @@ module VagrantPlugins
   module CommandPS
     module Errors
       # A convenient superclass for all our errors.
-      class PSError < Vagrant::Errors::VagrantError
+      class PSCommandError < Vagrant::Errors::VagrantError
         error_namespace("vagrant_ps.errors")
       end
 
-      class HostUnsupported < PSError
+      class HostUnsupported < PSCommandError
         error_key(:host_unsupported)
       end
 
-      class PSRemotingUndetected < PSError
+      class PSRemotingUndetected < PSCommandError
         error_key(:ps_remoting_undetected)
       end
+
+      class PowerShellError < PSCommandError
+        error_key(:powershell_error)
+      end
     end
   end
 end
diff --git a/templates/locales/command_ps.yml b/templates/locales/command_ps.yml
index 51bf666cc..179aae842 100644
--- a/templates/locales/command_ps.yml
+++ b/templates/locales/command_ps.yml
@@ -3,7 +3,7 @@ en:
     detecting: |-
       Detecting if a remote PowerShell connection can be made with the guest...
     reseting: |-
-      Reseting WinRM TrustedHosts to their original value.
+      Resetting WinRM TrustedHosts to their original value.
 
     errors:
       host_unsupported: |-
@@ -14,3 +14,14 @@ en:
         Unable to establish a remote PowerShell connection with the guest. 
         Check if the firewall rules on the guest allow connections to the 
         Windows remote management service.
+
+      powershell_error: |-
+        An error occurred while executing a PowerShell script. This error
+        is shown below. Please read the error message and see if this is
+        a configuration error with your system. If it is not, then please
+        report a bug.
+
+        Script: %{script}
+        Error:
+
+        %{stderr}

From 209556c3cdd426cbcca51a186e0b10be52aa7dd7 Mon Sep 17 00:00:00 2001
From: Jon Burgess <jkburges@gmail.com>
Date: Fri, 17 Jul 2015 14:26:13 +1000
Subject: [PATCH 009/354] Allow provisioner instance names to be specified for
 `up` and `reload` commands and option `--provision-with`

Ref: https://github.com/mitchellh/vagrant/issues/5139
---
 plugins/commands/reload/command.rb  |  2 +-
 plugins/commands/up/command.rb      |  2 +-
 plugins/commands/up/start_mixins.rb | 23 ++++++++++++++++-------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/plugins/commands/reload/command.rb b/plugins/commands/reload/command.rb
index 33a6f8e5e..1d43d13b7 100644
--- a/plugins/commands/reload/command.rb
+++ b/plugins/commands/reload/command.rb
@@ -30,7 +30,7 @@ module VagrantPlugins
         return if !argv
 
         # Validate the provisioners
-        validate_provisioner_flags!(options)
+        validate_provisioner_flags!(options, argv)
 
         @logger.debug("'reload' each target VM...")
         machines = []
diff --git a/plugins/commands/up/command.rb b/plugins/commands/up/command.rb
index 826bea0ae..e340dad96 100644
--- a/plugins/commands/up/command.rb
+++ b/plugins/commands/up/command.rb
@@ -48,7 +48,7 @@ module VagrantPlugins
         return if !argv
 
         # Validate the provisioners
-        validate_provisioner_flags!(options)
+        validate_provisioner_flags!(options, argv)
 
         # Go over each VM and bring it up
         @logger.debug("'Up' each target VM...")
diff --git a/plugins/commands/up/start_mixins.rb b/plugins/commands/up/start_mixins.rb
index 548d889ca..8be96c68a 100644
--- a/plugins/commands/up/start_mixins.rb
+++ b/plugins/commands/up/start_mixins.rb
@@ -26,13 +26,22 @@ module VagrantPlugins
 
       # This validates the provisioner flags and raises an exception
       # if there are invalid ones.
-      def validate_provisioner_flags!(options)
-        (options[:provision_types] || []).each do |type|
-            klass = Vagrant.plugin("2").manager.provisioners[type]
-            if !klass
-              raise Vagrant::Errors::ProvisionerFlagInvalid,
-                name: type.to_s
-            end
+      def validate_provisioner_flags!(options, argv)
+        provisioner_instance_names = []
+        with_target_vms(argv) do |machine|
+          provisioner_instance_names << machine.config.vm.provisioners.map(&:name)
+        end
+
+        provisioner_instance_names.flatten!.uniq!
+
+        if (provisioner_instance_names & options[:provision_types]).empty?
+          (options[:provision_types] || []).each do |type|
+              klass = Vagrant.plugin("2").manager.provisioners[type]
+              if !klass
+                raise Vagrant::Errors::ProvisionerFlagInvalid,
+                  name: type.to_s
+              end
+          end
         end
       end
     end

From d2b0df0a7d3f63eaeca81585edb81f9d9be7f83f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20Br=C3=A6khus?= <denis@varnish-software.com>
Date: Fri, 17 Jul 2015 21:44:58 +0200
Subject: [PATCH 010/354] Specify time and don't do -h -H which is not really a
 valid usage.

---
 plugins/guests/debian8/cap/halt.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/guests/debian8/cap/halt.rb b/plugins/guests/debian8/cap/halt.rb
index 932281347..b2e5a141b 100644
--- a/plugins/guests/debian8/cap/halt.rb
+++ b/plugins/guests/debian8/cap/halt.rb
@@ -4,7 +4,7 @@ module VagrantPlugins
       class Halt
         def self.halt(machine)
           begin
-            machine.communicate.sudo("shutdown -h -H")
+            machine.communicate.sudo("shutdown -h now")
           rescue IOError
             # Do nothing, because it probably means the machine shut down
             # and SSH connection was lost.

From f349a58a1e32ba68deedeca57eae1b67a8266ec3 Mon Sep 17 00:00:00 2001
From: Mattias Appelgren <mattias@ppelgren.se>
Date: Sat, 18 Jul 2015 13:54:58 +0200
Subject: [PATCH 011/354] provisioners/puppet: Fix Puppet environment default
 manifest

Also parse the puppet variables $codedir and $environment when
resolving a manifest path from environment.conf
---
 plugins/provisioners/puppet/provisioner/puppet.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
index f1987dbd5..d1e124e85 100644
--- a/plugins/provisioners/puppet/provisioner/puppet.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -62,12 +62,16 @@ module VagrantPlugins
           # Parse out the environment manifest path since puppet apply doesnt do that for us.
           environment_conf = File.join(environments_guest_path, @config.environment, "environment.conf")
           if @machine.communicate.test("test -e #{environment_conf}", sudo: true)
-            conf = @machine.communicate.sudo("cat #{environment_conf}") do | type, data|
+            @machine.communicate.sudo("cat #{environment_conf}") do | type, data|
               if type == :stdout
                 data.each_line do |line|
                   if line =~ /^\s*manifest\s+=\s+([^\s]+)/
                     @manifest_file = $1
-                    @manifest_file.gsub! '$basemodulepath:', "#{environments_guest_path}/#{@config.environment}/"
+                    @manifest_file.gsub! "$codedir", File.dirname(environments_guest_path)
+                    @manifest_file.gsub! "$environment", @config.environment
+                    if !@manifest_file.start_with? "/"
+                      @manifest_file = File.join(environments_guest_path, @config.environment, @manifest_file)
+                    end
                     @logger.debug("Using manifest from environment.conf: #{@manifest_file}")
                   end
                 end
@@ -85,7 +89,7 @@ module VagrantPlugins
 
           # In environment mode we still need to specify a manifest file, if its not, use the one from env config if specified.
           if !@manifest_file
-            @manifest_file = "#{environments_guest_path}/#{@config.environment}/manifests/site.pp"
+            @manifest_file = "#{environments_guest_path}/#{@config.environment}/manifests"
             parse_environment_metadata
           end
           # Check that the shared folders are properly shared

From 27b948f53ccd3e5743fc223f2e70617ecf663c83 Mon Sep 17 00:00:00 2001
From: Mattias Appelgren <mattias@ppelgren.se>
Date: Sat, 18 Jul 2015 14:20:57 +0200
Subject: [PATCH 012/354] website/docs: Add more information regarding Puppet
 environments

---
 .../docs/source/v2/provisioning/puppet_apply.html.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/website/docs/source/v2/provisioning/puppet_apply.html.md b/website/docs/source/v2/provisioning/puppet_apply.html.md
index 89fe90195..b8f0a5f02 100644
--- a/website/docs/source/v2/provisioning/puppet_apply.html.md
+++ b/website/docs/source/v2/provisioning/puppet_apply.html.md
@@ -140,8 +140,9 @@ that the path is located in the "vm" at "/path/to/manifests".
 
 ## Environments
 
-If you are using Puppet 4 or higher, you can also specify the name of the
-Puppet environment and the path on the local disk to the environment files:
+If you are using Puppet 4 or higher, you can proivision using
+[Puppet Environments](https://docs.puppetlabs.com/puppet/latest/reference/environments.html) by specifying the name of the environment and the path on the
+local disk to the environment files:
 
 ```ruby
 Vagrant.configure("2") do |config|
@@ -152,6 +153,13 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+The default manifest is the environment's `manifests` directory.
+If the environment has an `environment.conf` the manifest path is parsed
+from there. Relative paths are assumed to be relative to the directory of
+the environment. If the manifest setting in `environment.conf` use
+the Puppet variables `$codedir` or `$environment` they are resoled to
+the parent directory of `environment_path` and `environment` respectively.
+
 ## Modules
 
 Vagrant also supports provisioning with [Puppet modules](http://docs.puppetlabs.com/guides/modules.html).

From 19b7bbc369b1d6dd27491a3e8da78e3e93466daa Mon Sep 17 00:00:00 2001
From: Pat O'Shea <me@patoshea.net>
Date: Sat, 18 Jul 2015 08:39:00 -0600
Subject: [PATCH 013/354] Corrected masterless example

The basic Vagrantfile file example for a masterless setup doesn't set the masterless value.  That property defaults to false. https://github.com/mitchellh/vagrant/blob/master/plugins/provisioners/salt/provisioner.rb
---
 website/docs/source/v2/provisioning/salt.html.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/website/docs/source/v2/provisioning/salt.html.md b/website/docs/source/v2/provisioning/salt.html.md
index 8169ec28e..1799a09dd 100644
--- a/website/docs/source/v2/provisioning/salt.html.md
+++ b/website/docs/source/v2/provisioning/salt.html.md
@@ -30,7 +30,8 @@ on a single minion, without a master:
 
     ## Use all the defaults:
     config.vm.provision :salt do |salt|
-
+    
+      salt.masterless = true
       salt.minion_config = "salt/minion"
       salt.run_highstate = true
 

From d34bc38bf39ce9a045dcc4c96c8f2693ef1280a3 Mon Sep 17 00:00:00 2001
From: Pat O'Shea <me@patoshea.net>
Date: Sat, 18 Jul 2015 20:53:46 -0600
Subject: [PATCH 014/354] Updated salt-minion and call ext on windows guest

Salt-minion and salt-call are batch files on a windows guest, not executables.
---
 plugins/provisioners/salt/provisioner.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/provisioners/salt/provisioner.rb b/plugins/provisioners/salt/provisioner.rb
index d74c4fa11..b5f65f1ae 100644
--- a/plugins/provisioners/salt/provisioner.rb
+++ b/plugins/provisioners/salt/provisioner.rb
@@ -35,8 +35,8 @@ module VagrantPlugins
         desired_binaries = []
         if !@config.no_minion
           if @machine.config.vm.communicator == :winrm
-            desired_binaries.push('C:\\salt\\salt-minion.exe')
-            desired_binaries.push('C:\\salt\\salt-call.exe')
+            desired_binaries.push('C:\\salt\\salt-minion.bat')
+            desired_binaries.push('C:\\salt\\salt-call.bat')
           else
             desired_binaries.push('salt-minion')
             desired_binaries.push('salt-call')
@@ -361,8 +361,8 @@ module VagrantPlugins
           else
             if @machine.config.vm.communicator == :winrm
               opts = { elevated: true }
-              @machine.communicate.execute("C:\\salt\\salt-call.exe saltutil.sync_all", opts)
-              @machine.communicate.execute("C:\\salt\\salt-call.exe state.highstate --retcode-passthrough #{get_loglevel}#{get_colorize}#{get_pillar}", opts) do |type, data|
+              @machine.communicate.execute("C:\\salt\\salt-call.bat saltutil.sync_all", opts)
+              @machine.communicate.execute("C:\\salt\\salt-call.bat state.highstate --retcode-passthrough #{get_loglevel}#{get_colorize}#{get_pillar}", opts) do |type, data|
                 if @config.verbose
                   @machine.env.ui.info(data.rstrip)
                 end

From 562ed26533a072b4a255ba7d9fe31b1260c367e6 Mon Sep 17 00:00:00 2001
From: Ievgen Prokhorenko <ievgen.prokhorenko@gmail.com>
Date: Sun, 19 Jul 2015 16:38:52 +0300
Subject: [PATCH 015/354] Fix #3570 'Box data left in ~/.vagrant.d/boxes after
 removal'

---
 lib/vagrant/action/builtin/box_remove.rb      |  1 +
 lib/vagrant/box_collection.rb                 | 28 ++++++++++++++++---
 .../vagrant/action/builtin/box_remove_test.rb | 26 +++++++++++++++++
 3 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/lib/vagrant/action/builtin/box_remove.rb b/lib/vagrant/action/builtin/box_remove.rb
index 1d0cea7fd..4c242aa97 100644
--- a/lib/vagrant/action/builtin/box_remove.rb
+++ b/lib/vagrant/action/builtin/box_remove.rb
@@ -106,6 +106,7 @@ module Vagrant
                               provider: box.provider,
                               version: box.version))
           box.destroy!
+          env[:box_collection].clean_up(box)
 
           # Passes on the removed box to the rest of the middleware chain
           env[:box_removed] = box
diff --git a/lib/vagrant/box_collection.rb b/lib/vagrant/box_collection.rb
index a7599f7c2..17c2f3927 100644
--- a/lib/vagrant/box_collection.rb
+++ b/lib/vagrant/box_collection.rb
@@ -13,6 +13,8 @@ module Vagrant
   # boxes.
   class BoxCollection
     TEMP_PREFIX = "vagrant-box-add-temp-"
+    VAGRANT_SLASH = "-VAGRANTSLASH-"
+    VAGRANT_COLON = "-VAGRANTCOLON-"
 
     # The directory where the boxes in this collection are stored.
     #
@@ -346,6 +348,19 @@ module Vagrant
       end
     end
 
+    # Removes the whole directory of a given box if there are no
+    # other versions nor providers of the box exist.
+    def clean_up(box)
+      return false if exists?(box.name)
+
+      box_directory = box.name
+        .gsub('/', VAGRANT_SLASH)
+        .gsub(':', VAGRANT_COLON)
+
+      path = File.join(directory, box_directory)
+      FileUtils.rm_r(path)
+    end
+
     protected
 
     # Returns the directory name for the box of the given name.
@@ -354,16 +369,16 @@ module Vagrant
     # @return [String]
     def dir_name(name)
       name = name.dup
-      name.gsub!(":", "-VAGRANTCOLON-") if Util::Platform.windows?
-      name.gsub!("/", "-VAGRANTSLASH-")
+      name.gsub!(":", VAGRANT_COLON) if Util::Platform.windows?
+      name.gsub!("/", VAGRANT_SLASH)
       name
     end
 
     # Returns the directory name for the box cleaned up
     def undir_name(name)
       name = name.dup
-      name.gsub!("-VAGRANTCOLON-", ":")
-      name.gsub!("-VAGRANTSLASH-", "/")
+      name.gsub!(VAGRANT_COLON, ":")
+      name.gsub!(VAGRANT_SLASH, "/")
       name
     end
 
@@ -440,5 +455,10 @@ module Vagrant
     ensure
       dir.rmtree if dir.exist?
     end
+
+    # Checks if a box with a given name exists.
+    def exists?(box_name)
+      all.any? { |box| box.first.eql?(box_name) }
+    end
   end
 end
diff --git a/test/unit/vagrant/action/builtin/box_remove_test.rb b/test/unit/vagrant/action/builtin/box_remove_test.rb
index 9de3e467b..016fec243 100644
--- a/test/unit/vagrant/action/builtin/box_remove_test.rb
+++ b/test/unit/vagrant/action/builtin/box_remove_test.rb
@@ -30,6 +30,8 @@ describe Vagrant::Action::Builtin::BoxRemove do
 
     expect(box_collection).to receive(:find).with(
       "foo", :virtualbox, "1.0").and_return(box)
+    expect(box_collection).to receive(:clean_up).with(box)
+      .and_return(true)
     expect(box).to receive(:destroy!).once
     expect(app).to receive(:call).with(env).once
 
@@ -50,6 +52,8 @@ describe Vagrant::Action::Builtin::BoxRemove do
 
     expect(box_collection).to receive(:find).with(
       "foo", :virtualbox, "1.0").and_return(box)
+    expect(box_collection).to receive(:clean_up).with(box)
+      .and_return(false)
     expect(box).to receive(:destroy!).once
     expect(app).to receive(:call).with(env).once
 
@@ -70,6 +74,8 @@ describe Vagrant::Action::Builtin::BoxRemove do
 
     expect(box_collection).to receive(:find).with(
       "foo", :virtualbox, "1.0").and_return(box)
+    expect(box_collection).to receive(:clean_up).with(box)
+      .and_return(false)
     expect(box).to receive(:destroy!).once
     expect(app).to receive(:call).with(env).once
 
@@ -78,6 +84,22 @@ describe Vagrant::Action::Builtin::BoxRemove do
     expect(env[:box_removed]).to equal(box)
   end
 
+  it "deletes the whole directory of the box if it's the last box on the system" do
+    box_collection.stub(
+      all: [
+        ["foo", "1.0", :virtualbox],
+      ])
+
+    env[:box_name] = "foo"
+
+    expect(box_collection).to receive(:find).with(
+      "foo", :virtualbox, "1.0").and_return(box)
+    expect(box_collection).to receive(:clean_up).with(box)
+      .and_return(true)
+
+    subject.call(env)
+  end
+
   context "checking if a box is in use" do
     def new_entry(name, provider, version, valid=true)
       Vagrant::MachineIndex::Entry.new.tap do |entry|
@@ -110,6 +132,8 @@ describe Vagrant::Action::Builtin::BoxRemove do
       expect(box_collection).to receive(:find).with(
         "foo", :virtualbox, "1.0").and_return(box)
       expect(box).to receive(:destroy!).once
+      expect(box_collection).to receive(:clean_up).with(box)
+        .and_return(true)
 
       subject.call(env)
     end
@@ -123,6 +147,8 @@ describe Vagrant::Action::Builtin::BoxRemove do
 
       expect(box_collection).to receive(:find).with(
         "foo", :virtualbox, "1.0").and_return(box)
+      expect(box_collection).to receive(:clean_up).with(box)
+        .and_return(true)
       expect(box).to receive(:destroy!).once
 
       subject.call(env)

From e4cdb473bd1a7ad666ddc9f398c661f62a9cfb2c Mon Sep 17 00:00:00 2001
From: Brian Dwyer <bdwyer@IEEE.org>
Date: Tue, 28 Jul 2015 12:41:51 -0400
Subject: [PATCH 016/354] Bring back `nodes_path` support for the Chef Zero
 provisioner

---
 plugins/provisioners/chef/config/chef_zero.rb      | 7 +++++++
 plugins/provisioners/chef/provisioner/chef_solo.rb | 2 ++
 plugins/provisioners/chef/provisioner/chef_zero.rb | 1 +
 templates/provisioners/chef_zero/zero.erb          | 4 ++--
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/plugins/provisioners/chef/config/chef_zero.rb b/plugins/provisioners/chef/config/chef_zero.rb
index d28de3dc9..9b1daf1a5 100644
--- a/plugins/provisioners/chef/config/chef_zero.rb
+++ b/plugins/provisioners/chef/config/chef_zero.rb
@@ -17,6 +17,10 @@ module VagrantPlugins
         # @return [String]
         attr_accessor :environments_path
 
+        # The path where nodes are stored on disk.
+        # @return [String]
+        attr_accessor :nodes_path
+
         # The path where roles are stored on disk.
         # @return [String]
         attr_accessor :roles_path
@@ -31,6 +35,7 @@ module VagrantPlugins
           @cookbooks_path      = UNSET_VALUE
           @data_bags_path      = UNSET_VALUE
           @environments_path   = UNSET_VALUE
+          @nodes_path          = UNSET_VALUE
           @roles_path          = UNSET_VALUE
           @synced_folder_type  = UNSET_VALUE
         end
@@ -47,6 +52,7 @@ module VagrantPlugins
           end
 
           @data_bags_path    = [] if @data_bags_path == UNSET_VALUE
+          @nodes_path        = [] if @nodes_path == UNSET_VALUE
           @roles_path        = [] if @roles_path == UNSET_VALUE
           @environments_path = [] if @environments_path == UNSET_VALUE
           @environments_path = [@environments_path].flatten
@@ -54,6 +60,7 @@ module VagrantPlugins
           # Make sure the path is an array.
           @cookbooks_path    = prepare_folders_config(@cookbooks_path)
           @data_bags_path    = prepare_folders_config(@data_bags_path)
+          @nodes_path        = prepare_folders_config(@nodes_path)
           @roles_path        = prepare_folders_config(@roles_path)
           @environments_path = prepare_folders_config(@environments_path)
 
diff --git a/plugins/provisioners/chef/provisioner/chef_solo.rb b/plugins/provisioners/chef/provisioner/chef_solo.rb
index f3b52f178..14ee5747c 100644
--- a/plugins/provisioners/chef/provisioner/chef_solo.rb
+++ b/plugins/provisioners/chef/provisioner/chef_solo.rb
@@ -33,12 +33,14 @@ module VagrantPlugins
           @role_folders      = expanded_folders(@config.roles_path, "roles")
           @data_bags_folders = expanded_folders(@config.data_bags_path, "data_bags")
           @environments_folders = expanded_folders(@config.environments_path, "environments")
+          @node_folders = expanded_folders(@config.nodes_path, "nodes")
 
           existing = synced_folders(@machine, cached: true)
           share_folders(root_config, "csc", @cookbook_folders, existing)
           share_folders(root_config, "csr", @role_folders, existing)
           share_folders(root_config, "csdb", @data_bags_folders, existing)
           share_folders(root_config, "cse", @environments_folders, existing)
+          share_folders(root_config, "csn", @node_folders, existing)
         end
 
         def provision
diff --git a/plugins/provisioners/chef/provisioner/chef_zero.rb b/plugins/provisioners/chef/provisioner/chef_zero.rb
index 48078a09f..70fff6854 100644
--- a/plugins/provisioners/chef/provisioner/chef_zero.rb
+++ b/plugins/provisioners/chef/provisioner/chef_zero.rb
@@ -44,6 +44,7 @@ module VagrantPlugins
             local_mode: true,
             enable_reporting: false,
             cookbooks_path: guest_paths(@cookbook_folders),
+            nodes_path: guest_paths(@node_folders),
             roles_path: guest_paths(@role_folders),
             data_bags_path: guest_paths(@data_bags_folders).first,
             environments_path: guest_paths(@environments_folders).first,
diff --git a/templates/provisioners/chef_zero/zero.erb b/templates/provisioners/chef_zero/zero.erb
index 29de30d23..8c4b76407 100644
--- a/templates/provisioners/chef_zero/zero.erb
+++ b/templates/provisioners/chef_zero/zero.erb
@@ -31,8 +31,8 @@ environment "<%= environment %>"
 chef_zero.enabled true
 local_mode true
 <% end -%>
-<% if node_path -%>
-node_path <%= node_path.inspect %>
+<% if nodes_path -%>
+node_path <%= nodes_path.inspect %>
 <% end -%>
 
 <% if formatter %>

From 15ec95328ad962ee4326e3cdcaca376af7cea8e0 Mon Sep 17 00:00:00 2001
From: Brian Dwyer <bdwyer@IEEE.org>
Date: Tue, 28 Jul 2015 13:24:39 -0400
Subject: [PATCH 017/354] Update test

---
 .../plugins/provisioners/chef/config/chef_zero_test.rb    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/unit/plugins/provisioners/chef/config/chef_zero_test.rb b/test/unit/plugins/provisioners/chef/config/chef_zero_test.rb
index 2f9cd82aa..9a1f98cd6 100644
--- a/test/unit/plugins/provisioners/chef/config/chef_zero_test.rb
+++ b/test/unit/plugins/provisioners/chef/config/chef_zero_test.rb
@@ -50,6 +50,14 @@ describe VagrantPlugins::Chef::Config::ChefZero do
     end
   end
 
+  describe "#nodes_path" do
+    it "defaults to an empty array" do
+      subject.finalize!
+      expect(subject.nodes_path).to be_a(Array)
+      expect(subject.nodes_path).to be_empty
+    end
+  end
+
   describe "#synced_folder_type" do
     it "defaults to nil" do
       subject.finalize!

From 01f0dccbdc3f26842ed74a018f7cf828e9e19234 Mon Sep 17 00:00:00 2001
From: Brian Dwyer <bdwyer@IEEE.org>
Date: Tue, 28 Jul 2015 13:25:25 -0400
Subject: [PATCH 018/354] Update documentation for Chef Zero `nodes_path`

---
 website/docs/source/v2/provisioning/chef_zero.html.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/website/docs/source/v2/provisioning/chef_zero.html.md b/website/docs/source/v2/provisioning/chef_zero.html.md
index 4f35f362a..bd2527fc9 100644
--- a/website/docs/source/v2/provisioning/chef_zero.html.md
+++ b/website/docs/source/v2/provisioning/chef_zero.html.md
@@ -41,6 +41,9 @@ available below this section.
 * `environments_path` (string) - A path where environment definitions are
   located. By default, no environments folder is set.
 
+* `nodes_path` (string or array) - A list of paths where node objects (in JSON format) are stored. By default, no
+  nodes path is set.
+
 * `environment` (string) - The environment you want the Chef run to be
   a part of. This requires Chef 11.6.0 or later, and that `environments_path`
   is set.

From 3f29be0de2e64498fa7b6d4bfcbe6414e1a5604b Mon Sep 17 00:00:00 2001
From: Ben Hines <ben_hines@playstation.sony.com>
Date: Tue, 28 Jul 2015 11:16:20 -0700
Subject: [PATCH 019/354] Fix string parse error in the environment path
 missing error message.

---
 plugins/provisioners/puppet/config/puppet.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/provisioners/puppet/config/puppet.rb b/plugins/provisioners/puppet/config/puppet.rb
index 9910c6e05..0761294ca 100644
--- a/plugins/provisioners/puppet/config/puppet.rb
+++ b/plugins/provisioners/puppet/config/puppet.rb
@@ -143,7 +143,7 @@ module VagrantPlugins
               if !expanded_environment_file.file? && !expanded_environment_file.directory?
                 errors << I18n.t("vagrant.provisioners.puppet.environment_missing",
                                  environment: environment.to_s,
-                                 environment_path: expanded_path.to_s)
+                                 environmentpath: expanded_path.to_s)
               end
             end
           end

From f13220cd748d67430f4236eefff9dfa69ef68237 Mon Sep 17 00:00:00 2001
From: Casey Lang <clang1234@gmail.com>
Date: Fri, 31 Jul 2015 14:10:57 -0400
Subject: [PATCH 020/354] Clarify config.ssh.insert_key docs

Modified the description of `config.ssh.insert_key` a bit to improve readability.
---
 website/docs/source/v2/vagrantfile/ssh_settings.html.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/docs/source/v2/vagrantfile/ssh_settings.html.md b/website/docs/source/v2/vagrantfile/ssh_settings.html.md
index b07835b75..cadeca060 100644
--- a/website/docs/source/v2/vagrantfile/ssh_settings.html.md
+++ b/website/docs/source/v2/vagrantfile/ssh_settings.html.md
@@ -68,12 +68,12 @@ is enabled. Defaults to false.
 <hr>
 
 `config.ssh.insert_key` - If `true`, Vagrant will automatically insert
-an keypair to use for SSH, replacing the default Vagrant's insecure key
+a keypair to use for SSH, replacing Vagrant's default insecure key
 inside the machine if detected. By default, this is true.
 
 This only has an effect if you don't already use private keys for
 authentication or if you are relying on the default insecure key.
-If you don't have to take care about security in your project and want to
+If you don't have to care about security in your project and want to
 keep using the default insecure key, set this to `false`.
 
 <hr>

From ea7b277f411da996fd911fe24e1219fe13800ff0 Mon Sep 17 00:00:00 2001
From: John Syrinek <john.syrinek@gmail.com>
Date: Fri, 31 Jul 2015 16:05:55 -0500
Subject: [PATCH 021/354] Prevent fatal error caused by attempting to upload
 minion config to privileged directory

---
 plugins/provisioners/salt/config.rb      | 18 ------------------
 plugins/provisioners/salt/provisioner.rb |  5 -----
 2 files changed, 23 deletions(-)

diff --git a/plugins/provisioners/salt/config.rb b/plugins/provisioners/salt/config.rb
index 9c564179e..38aaec8de 100644
--- a/plugins/provisioners/salt/config.rb
+++ b/plugins/provisioners/salt/config.rb
@@ -20,7 +20,6 @@ module VagrantPlugins
       attr_accessor :bootstrap_script
       attr_accessor :verbose
       attr_accessor :seed_master
-      attr_accessor :config_dir
       attr_reader   :pillar_data
       attr_accessor :colorize
       attr_accessor :log_level
@@ -65,7 +64,6 @@ module VagrantPlugins
         @install_command = UNSET_VALUE
         @no_minion = UNSET_VALUE
         @bootstrap_options = UNSET_VALUE
-        @config_dir = UNSET_VALUE
         @masterless = UNSET_VALUE
         @minion_id = UNSET_VALUE
         @version = UNSET_VALUE
@@ -98,7 +96,6 @@ module VagrantPlugins
         @install_command    = nil if @install_command == UNSET_VALUE
         @no_minion          = nil if @no_minion == UNSET_VALUE
         @bootstrap_options  = nil if @bootstrap_options == UNSET_VALUE
-        @config_dir         = nil if @config_dir == UNSET_VALUE
         @masterless         = false if @masterless == UNSET_VALUE
         @minion_id          = nil if @minion_id == UNSET_VALUE
         @version            = nil if @version == UNSET_VALUE
@@ -111,17 +108,6 @@ module VagrantPlugins
         @pillar_data = Vagrant::Util::DeepMerge.deep_merge(@pillar_data, data)
       end
 
-      def default_config_dir(machine)
-        guest_type = machine.config.vm.guest || :linux
-
-        # FIXME: there should be a way to do that a bit smarter
-        if guest_type == :windows
-          return "C:\\salt\\conf"
-        else
-          return "/etc/salt"
-        end
-      end
-
       def validate(machine)
         errors = _detected_errors
         if @minion_config
@@ -161,10 +147,6 @@ module VagrantPlugins
           errors << I18n.t("vagrant.provisioners.salt.must_accept_keys")
         end
 
-        if @config_dir.nil?
-          @config_dir = default_config_dir(machine)
-        end
-
         return {"salt provisioner" => errors}
       end
     end
diff --git a/plugins/provisioners/salt/provisioner.rb b/plugins/provisioners/salt/provisioner.rb
index d74c4fa11..5b217da4b 100644
--- a/plugins/provisioners/salt/provisioner.rb
+++ b/plugins/provisioners/salt/provisioner.rb
@@ -342,11 +342,6 @@ module VagrantPlugins
       end
 
       def call_highstate
-        if @config.minion_config
-          @machine.env.ui.info "Copying salt minion config to #{@config.config_dir}"
-          @machine.communicate.upload(expanded_path(@config.minion_config).to_s, @config.config_dir + "/minion")
-        end
-
         if @config.masterless
           call_masterless
         elsif @config.run_highstate

From 587c88e65ae294c4f2939937c2079c545efd17cb Mon Sep 17 00:00:00 2001
From: Mike Averto <mjaverto@otreva.com>
Date: Sun, 9 Aug 2015 12:44:49 -0400
Subject: [PATCH 022/354] Fix Win 10 Enterprise Vagrant Error

 This fixes error for Win 10 Enterprise:

An error occurred while executing a PowerShell script. This error
is shown below. Please read the error message and see if this is
a configuration error with your system. If it is not, then please
report a bug.

Script: get_vm_status.ps1
Error:

C:\HashiCorp\Vagrant\embedded\gems\gems\vagrant-1.7.4\plugins\providers\hyperv\scripts\get_vm_status.ps1 : Unable to
find type [Microsoft.HyperV.PowerShell.VirtualizationOperationFailedException].
At line:1 char:1
+ &('C:\HashiCorp\Vagrant\embedded\gems\gems\vagrant-1.7.4\plugins\prov ...
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    + CategoryInfo          : InvalidOperation: (Microsoft.Hyper...FailedException:TypeName) [get_vm_status.ps1], Ru
   ntimeException
    + FullyQualifiedErrorId : TypeNotFound,get_vm_status.ps1
---
 plugins/providers/hyperv/scripts/get_vm_status.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/providers/hyperv/scripts/get_vm_status.ps1 b/plugins/providers/hyperv/scripts/get_vm_status.ps1
index 739560190..5c1e1aa73 100644
--- a/plugins/providers/hyperv/scripts/get_vm_status.ps1
+++ b/plugins/providers/hyperv/scripts/get_vm_status.ps1
@@ -12,7 +12,7 @@ try {
     $VM = Get-VM -Id $VmId -ErrorAction "Stop"
     $State = $VM.state
     $Status = $VM.status
-} catch [Microsoft.HyperV.PowerShell.VirtualizationOperationFailedException] {
+} catch [Microsoft.HyperV.PowerShell.VirtualizationException] {
     $State = "not_created"
     $Status = $State
 }

From 6f59c8bb548c70053c23c80ca7fb62429fa99496 Mon Sep 17 00:00:00 2001
From: Victor Costan <costan@gmail.com>
Date: Sat, 15 Aug 2015 06:19:51 -0400
Subject: [PATCH 023/354] The docs typo'd the nic_type parameter

The parameter name in the VirtualBox provider source is nic_type, not nictype.

The typo is probably caused by the fact that the parameter maps to nictype args in the VirtualBox CLI.
---
 website/docs/source/v2/virtualbox/networking.html.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/website/docs/source/v2/virtualbox/networking.html.md b/website/docs/source/v2/virtualbox/networking.html.md
index 55e7d4c4c..5811373de 100644
--- a/website/docs/source/v2/virtualbox/networking.html.md
+++ b/website/docs/source/v2/virtualbox/networking.html.md
@@ -36,8 +36,8 @@ end
 
 ## VirtualBox NIC Type
 
-You can specify a specific nictype for the created network interface
-by using the `nictype` parameter. This isn't prefixed by `virtualbox__`
+You can specify a specific NIC type for the created network interface
+by using the `nic_type` parameter. This isn't prefixed by `virtualbox__`
 for legacy reasons, but is VirtualBox-specific.
 
 This is an advanced option and should only be used if you know what
@@ -48,6 +48,6 @@ Example:
 ```ruby
 Vagrant.configure("2") do |config|
   config.vm.network "private_network", ip: "192.168.50.4",
-    nictype: "virtio"
+    nic_type: "virtio"
 end
 ```

From 4425d91d863b3b36347ebc53550b13d8e6e5bc37 Mon Sep 17 00:00:00 2001
From: Victor Costan <costan@gmail.com>
Date: Sat, 15 Aug 2015 06:53:01 -0400
Subject: [PATCH 024/354] Don't warn about an .1 IP for DHCP networks

When the network's type is :dhcp, the :ip option is used to derive the DHCP server configuration, and it doesn't actually indicate the IP that will be received by the VM(s).
---
 plugins/kernel_v2/config/vm.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb
index 2de1b343f..5f2486179 100644
--- a/plugins/kernel_v2/config/vm.rb
+++ b/plugins/kernel_v2/config/vm.rb
@@ -688,7 +688,7 @@ module VagrantPlugins
               end
             end
 
-            if options[:ip] && options[:ip].end_with?(".1")
+            if options[:ip] && options[:ip].end_with?(".1") && options[:type].to_sym != :dhcp
               machine.ui.warn(I18n.t(
                 "vagrant.config.vm.network_ip_ends_in_one"))
             end

From 0f8a88f4975a68c13057d7bcb6b55d04081a0766 Mon Sep 17 00:00:00 2001
From: Justin Campbell <justin@justincampbell.me>
Date: Mon, 17 Aug 2015 11:22:24 -0400
Subject: [PATCH 025/354] website/www: Fix logos/copyright alignment

Before:

![](http://cl.ly/image/2g2h0v1Z371r/Screen%20Shot%202015-08-17%20at%2011.22.48%20AM.png)

After:

![](http://cl.ly/image/0s1e2a272o2q/Screen%20Shot%202015-08-17%20at%2011.21.31%20AM.png)
---
 website/www/source/layouts/layout.erb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/website/www/source/layouts/layout.erb b/website/www/source/layouts/layout.erb
index 4e6736743..a510d31bf 100644
--- a/website/www/source/layouts/layout.erb
+++ b/website/www/source/layouts/layout.erb
@@ -78,9 +78,11 @@
 				 </div> <!-- /row -->
 
 				 <div class="row">
-					 <h6 class="legal">
-						 Copyright &copy; <%= Time.now.year %> HashiCorp
-					 </h6>
+					<div class="span12">
+						<h6 class="legal">
+							 Copyright &copy; <%= Time.now.year %> HashiCorp
+						</h6>
+					 </div> <!-- /span -->
 				 </div> <!-- row -->
 			 </div> <!-- container -->
 			 </footer>

From c58c9a1ffccd576c6c08fb2edc721258808b9d6d Mon Sep 17 00:00:00 2001
From: Justin Campbell <justin@justincampbell.me>
Date: Mon, 17 Aug 2015 11:29:46 -0400
Subject: [PATCH 026/354] website/www: Add Atlas box search to nav

---
 website/www/source/layouts/layout.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/website/www/source/layouts/layout.erb b/website/www/source/layouts/layout.erb
index 4e6736743..cbf2b8c88 100644
--- a/website/www/source/layouts/layout.erb
+++ b/website/www/source/layouts/layout.erb
@@ -41,6 +41,7 @@
 			 <ul class="pull-right unstyled">
 				 <li class="pill"><a href="/vmware">VMware Integration</a></li>
 				 <li><a href="/downloads.html">Downloads</a></li>
+				 <li><a href="https://atlas.hashicorp.com/boxes/search">Boxes</a></li>
 				 <li><a href="https://docs.vagrantup.com/">Documentation</a></li>
 				 <li><a href="/blog.html">Blog</a></li>
 				 <li><a href="/about.html">About</a></li>

From b897fd73651e263fc2b0fd364b7d6aba2f8f905d Mon Sep 17 00:00:00 2001
From: Lonnie VanZandt <lonniev@gmail.com>
Date: Tue, 18 Aug 2015 10:56:13 -0600
Subject: [PATCH 027/354] Scrub Guest Paths for Windows Rsync leaving Dirty
 Paths for Winrm Mkdir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Windows offers no out-of-the-box rsync utility. By far, the most
commonly used external utilities for Windows rsync are built with the
GNU Cygwin libraries. The cost for this convenience is that rsync on
Windows has to be provided paths that begin “/cygdrive/c” rather than
“c:/“ like other Windows-API utilities. Compounding the situation,
rsync doesn’t create paths/to/sub/targets and so the vagrant plugin
code, when performing an rsync, is responsible for creating
intermediate directories in guest paths if there are any. Furthermore,
the mkdir utility in Windows is not another Cygwin utility like rsync
but the routine mkdir of Windows command.com. Therefore, while rsync
needs the /cygwin paths, mkdir uses the Windows paths. Later, the
chef_solo.rp provisioner running within the guest will expect to find
Windows-style paths in its solo.rb configuration file. Due to all this,
vagrant has to keep track of both the original, possibly dirty Windows
guest path and the cygwin-scrubbed guest path.
---
 plugins/guests/windows/cap/rsync.rb    | 9 +++++++++
 plugins/guests/windows/plugin.rb       | 5 +++++
 plugins/synced_folders/rsync/helper.rb | 5 +++++
 3 files changed, 19 insertions(+)

diff --git a/plugins/guests/windows/cap/rsync.rb b/plugins/guests/windows/cap/rsync.rb
index e391b92db..aa9f1bcdf 100644
--- a/plugins/guests/windows/cap/rsync.rb
+++ b/plugins/guests/windows/cap/rsync.rb
@@ -2,8 +2,17 @@ module VagrantPlugins
   module GuestWindows
     module Cap
       class RSync
+        def self.rsync_scrub_guestpath( machine, opts )
+          # Windows guests most often use cygwin-dependent rsync utilities
+          # that expect "/cygdrive/c" instead of "c:" as the path prefix
+          # some vagrant code may pass guest paths with drive-lettered paths here
+          opts[:guestpath].gsub( /^([a-zA-Z]):/, '/cygdrive/\1' )
+        end
+
         def self.rsync_pre(machine, opts)
           machine.communicate.tap do |comm|
+            # rsync does not construct any gaps in the path to the target directory
+            # make sure that all subdirectories are created
             comm.execute("mkdir '#{opts[:guestpath]}'")
           end
         end
diff --git a/plugins/guests/windows/plugin.rb b/plugins/guests/windows/plugin.rb
index 47ca67e3f..d22dc2743 100644
--- a/plugins/guests/windows/plugin.rb
+++ b/plugins/guests/windows/plugin.rb
@@ -64,6 +64,11 @@ module VagrantPlugins
         Cap::MountSharedFolder
       end
 
+      guest_capability(:windows, :rsync_scrub_guestpath) do
+        require_relative "cap/rsync"
+        Cap::RSync
+      end
+
       guest_capability(:windows, :rsync_pre) do
         require_relative "cap/rsync"
         Cap::RSync
diff --git a/plugins/synced_folders/rsync/helper.rb b/plugins/synced_folders/rsync/helper.rb
index 594410436..e155d61f7 100644
--- a/plugins/synced_folders/rsync/helper.rb
+++ b/plugins/synced_folders/rsync/helper.rb
@@ -38,6 +38,11 @@ module VagrantPlugins
         hostpath  = File.expand_path(hostpath, machine.env.root_path)
         hostpath  = Vagrant::Util::Platform.fs_real_path(hostpath).to_s
 
+        # if the guest has a guest path scrubber capability, use it
+        if machine.guest.capability?(:rsync_scrub_guestpath)
+          guestpath = machine.guest.capability(:rsync_scrub_guestpath, opts)
+        end
+
         if Vagrant::Util::Platform.windows?
           # rsync for Windows expects cygwin style paths, always.
           hostpath = Vagrant::Util::Platform.cygwin_path(hostpath)

From f71b27ff27b3061c3206ce48762ee4a79f56005d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Fri, 21 Aug 2015 12:49:36 +0300
Subject: [PATCH 028/354] fix network detection on pld-linux

pld linux uses redhat as base, but lacks :flavour
this will add it
---
 plugins/guests/pld/cap/flavor.rb | 11 +++++++++++
 plugins/guests/pld/plugin.rb     |  5 +++++
 2 files changed, 16 insertions(+)
 create mode 100644 plugins/guests/pld/cap/flavor.rb

diff --git a/plugins/guests/pld/cap/flavor.rb b/plugins/guests/pld/cap/flavor.rb
new file mode 100644
index 000000000..5ade9d18c
--- /dev/null
+++ b/plugins/guests/pld/cap/flavor.rb
@@ -0,0 +1,11 @@
+module VagrantPlugins
+  module GuestPld
+    module Cap
+      class Flavor
+        def self.flavor(machine)
+          return :pld
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/guests/pld/plugin.rb b/plugins/guests/pld/plugin.rb
index ef7939fad..697599c81 100644
--- a/plugins/guests/pld/plugin.rb
+++ b/plugins/guests/pld/plugin.rb
@@ -20,6 +20,11 @@ module VagrantPlugins
         require_relative "cap/network_scripts_dir"
         Cap::NetworkScriptsDir
       end
+
+      guest_capability("pld", "flavor") do
+        require_relative "cap/flavor"
+        Cap::Flavor
+      end
     end
   end
 end

From af0f267b5089098ded8c2c3e6b8495cbeb8cbcdd Mon Sep 17 00:00:00 2001
From: Arlo Louis O'Keeffe <mailtoarlo@gmail.com>
Date: Wed, 26 Aug 2015 00:15:03 +0200
Subject: [PATCH 029/354] Check if Schedule.Service com object is available

---
 .../communicators/winrm/scripts/elevated_shell.ps1.erb   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb b/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
index 17767e436..77529aa76 100644
--- a/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
+++ b/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
@@ -1,5 +1,13 @@
 param([String]$username, [String]$password, [String]$encoded_command)
 
+$schedule = $null
+Try {
+  $schedule = New-Object -ComObject "Schedule.Service"
+} Catch [System.Management.Automation.PSArgumentException] {
+  powershell.exe -EncodedCommand $encoded_command
+  exit $LASTEXITCODE
+}
+
 $task_name = "WinRM_Elevated_Shell"
 $out_file = "$env:SystemRoot\Temp\WinRM_Elevated_Shell.log"
 
@@ -50,7 +58,6 @@ $arguments = "/c powershell.exe -EncodedCommand $encoded_command &gt; $out_file
 $task_xml = $task_xml.Replace("{arguments}", $arguments)
 $task_xml = $task_xml.Replace("{username}", $username)
 
-$schedule = New-Object -ComObject "Schedule.Service"
 $schedule.Connect()
 $task = $schedule.NewTask($null)
 $task.XmlText = $task_xml

From be90f6b1da85b6dd9e52617f344004cf8253718e Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Thu, 27 Aug 2015 16:44:17 -0400
Subject: [PATCH 030/354] Fix Fedora /etc/hosts bug

Update so that localhost entries don't get deleted when the hostname
gets added to the 127.0.0.1 line. Closes #6202
---
 plugins/guests/fedora/cap/change_host_name.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/guests/fedora/cap/change_host_name.rb b/plugins/guests/fedora/cap/change_host_name.rb
index 2a93b9de6..f0c95eec6 100644
--- a/plugins/guests/fedora/cap/change_host_name.rb
+++ b/plugins/guests/fedora/cap/change_host_name.rb
@@ -48,7 +48,7 @@ module VagrantPlugins
         def update_etc_hosts
           ip_address = '([0-9]{1,3}\.){3}[0-9]{1,3}'
           search     = "^(#{ip_address})\\s+#{Regexp.escape(current_hostname)}(\\s.*)?$"
-          replace    = "\\1 #{fqdn} #{short_hostname}"
+          replace    = "\\1 #{fqdn} #{short_hostname} \\3"
           expression = ['s', search, replace, 'g'].join('@')
 
           sudo("sed -ri '#{expression}' /etc/hosts")
@@ -72,4 +72,4 @@ module VagrantPlugins
       end
     end
   end
-end
\ No newline at end of file
+end

From 18d229ca829536c115e351489f88891376232620 Mon Sep 17 00:00:00 2001
From: Jeremy Roberts <jeremy@robertsisland.com>
Date: Sun, 30 Aug 2015 13:09:25 -0400
Subject: [PATCH 031/354] Added execution_time_limit for WinRM.

Adds a configurable value for WinRm and the elevated permission shell ExecutionTimeLimit.

Please see mitchellh/vagrant#5506

Ex: config.winrm.execution_time_limit = "P1D"
---
 plugins/communicators/winrm/communicator.rb                | 3 ++-
 plugins/communicators/winrm/config.rb                      | 4 ++++
 plugins/communicators/winrm/scripts/elevated_shell.ps1.erb | 5 +++--
 plugins/communicators/winrm/shell.rb                       | 2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/plugins/communicators/winrm/communicator.rb b/plugins/communicators/winrm/communicator.rb
index fdb3fe615..38fda78f9 100644
--- a/plugins/communicators/winrm/communicator.rb
+++ b/plugins/communicators/winrm/communicator.rb
@@ -210,7 +210,8 @@ module VagrantPlugins
 
         "powershell -executionpolicy bypass -file \"#{guest_script_path}\" " +
           "-username \"#{shell.username}\" -password \"#{shell.password}\" " +
-          "-encoded_command \"#{wrapped_encoded_command}\""
+          "-encoded_command \"#{wrapped_encoded_command}\" " +
+          "-execution_time_limit \"#{shell.execution_time_limit}\""
       end
 
       # Handles the raw WinRM shell result and converts it to a
diff --git a/plugins/communicators/winrm/config.rb b/plugins/communicators/winrm/config.rb
index 79901d503..3387ca142 100644
--- a/plugins/communicators/winrm/config.rb
+++ b/plugins/communicators/winrm/config.rb
@@ -11,6 +11,7 @@ module VagrantPlugins
       attr_accessor :timeout
       attr_accessor :transport
       attr_accessor :ssl_peer_verification
+      attr_accessor :execution_time_limit
 
       def initialize
         @username               = UNSET_VALUE
@@ -23,6 +24,7 @@ module VagrantPlugins
         @timeout                = UNSET_VALUE
         @transport              = UNSET_VALUE
         @ssl_peer_verification  = UNSET_VALUE
+        @execution_time_limit   = UNSET_VALUE
       end
 
       def finalize!
@@ -37,6 +39,7 @@ module VagrantPlugins
         @retry_delay = 2       if @retry_delay == UNSET_VALUE
         @timeout = 1800        if @timeout == UNSET_VALUE
         @ssl_peer_verification = true if @ssl_peer_verification == UNSET_VALUE
+        @execution_time_limit = "PT2H"   if @execution_time_limit == UNSET_VALUE
       end
 
       def validate(machine)
@@ -49,6 +52,7 @@ module VagrantPlugins
         errors << "winrm.max_tries cannot be nil."   if @max_tries.nil?
         errors << "winrm.retry_delay cannot be nil." if @max_tries.nil?
         errors << "winrm.timeout cannot be nil."     if @timeout.nil?
+        errors << "winrm.execution_time_limit cannot be nil."     if @execution_time_limit.nil?
         unless @ssl_peer_verification == true || @ssl_peer_verification == false
           errors << "winrm.ssl_peer_verification must be a boolean."
         end
diff --git a/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb b/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
index 17767e436..66bc94043 100644
--- a/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
+++ b/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
@@ -1,4 +1,4 @@
-param([String]$username, [String]$password, [String]$encoded_command)
+param([String]$username, [String]$password, [String]$encoded_command, [String]$execution_time_limit)
 
 $task_name = "WinRM_Elevated_Shell"
 $out_file = "$env:SystemRoot\Temp\WinRM_Elevated_Shell.log"
@@ -33,7 +33,7 @@ $task_xml = @'
     <Hidden>false</Hidden>
     <RunOnlyIfIdle>false</RunOnlyIfIdle>
     <WakeToRun>false</WakeToRun>
-    <ExecutionTimeLimit>PT2H</ExecutionTimeLimit>
+    <ExecutionTimeLimit>{execution_time_limit}</ExecutionTimeLimit>
     <Priority>4</Priority>
   </Settings>
   <Actions Context="Author">
@@ -49,6 +49,7 @@ $arguments = "/c powershell.exe -EncodedCommand $encoded_command &gt; $out_file
 
 $task_xml = $task_xml.Replace("{arguments}", $arguments)
 $task_xml = $task_xml.Replace("{username}", $username)
+$task_xml = $task_xml.Replace("{execution_time_limit}", $execution_time_limit)
 
 $schedule = New-Object -ComObject "Schedule.Service"
 $schedule.Connect()
diff --git a/plugins/communicators/winrm/shell.rb b/plugins/communicators/winrm/shell.rb
index 9b0f4e302..967565046 100644
--- a/plugins/communicators/winrm/shell.rb
+++ b/plugins/communicators/winrm/shell.rb
@@ -37,6 +37,7 @@ module VagrantPlugins
       attr_reader :port
       attr_reader :username
       attr_reader :password
+      attr_reader :execution_time_limit
       attr_reader :config
 
       def initialize(host, port, config)
@@ -47,6 +48,7 @@ module VagrantPlugins
         @port                  = port
         @username              = config.username
         @password              = config.password
+        @execution_time_limit  = config.execution_time_limit
         @config                = config
       end
 

From 44154c92a90e32b5b5189ece0d12f086198bdd77 Mon Sep 17 00:00:00 2001
From: Jeremy Roberts <jeremy@robertsisland.com>
Date: Sun, 30 Aug 2015 21:08:39 -0400
Subject: [PATCH 032/354] Fixing WinRM communicator unit test.

---
 test/unit/plugins/communicators/winrm/communicator_test.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/unit/plugins/communicators/winrm/communicator_test.rb b/test/unit/plugins/communicators/winrm/communicator_test.rb
index ceea0985d..42588a511 100644
--- a/test/unit/plugins/communicators/winrm/communicator_test.rb
+++ b/test/unit/plugins/communicators/winrm/communicator_test.rb
@@ -20,6 +20,7 @@ describe VagrantPlugins::CommunicatorWinRM::Communicator do
   before do
     allow(shell).to receive(:username).and_return('vagrant')
     allow(shell).to receive(:password).and_return('password')
+    allow(shell).to receive(:execution_time_limit).and_return('PT2H')
   end
 
   describe ".ready?" do
@@ -56,7 +57,7 @@ describe VagrantPlugins::CommunicatorWinRM::Communicator do
       expect(shell).to receive(:upload).with(kind_of(String), "c:/tmp/vagrant-elevated-shell.ps1")
       expect(shell).to receive(:powershell) do |cmd|
         expect(cmd).to eq("powershell -executionpolicy bypass -file \"c:/tmp/vagrant-elevated-shell.ps1\" " +
-          "-username \"vagrant\" -password \"password\" -encoded_command \"ZABpAHIAOwAgAGUAeABpAHQAIAAkAEwAQQBTAFQARQBYAEkAVABDAE8ARABFAA==\"")
+          "-username \"vagrant\" -password \"password\" -encoded_command \"ZABpAHIAOwAgAGUAeABpAHQAIAAkAEwAQQBTAFQARQBYAEkAVABDAE8ARABFAA==\" -execution_time_limit \"PT2H\"")
       end.and_return({ exitcode: 0 })
       expect(subject.execute("dir", { elevated: true })).to eq(0)
     end

From c844a9c4fd587c78b8ada9c2ac521712aa99f0f2 Mon Sep 17 00:00:00 2001
From: Jeremy Roberts <jeremy@robertsisland.com>
Date: Mon, 31 Aug 2015 11:27:08 -0400
Subject: [PATCH 033/354] Adding WinRM execution_time_limit to log.

---
 plugins/communicators/winrm/communicator.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/communicators/winrm/communicator.rb b/plugins/communicators/winrm/communicator.rb
index 38fda78f9..6a11d985c 100644
--- a/plugins/communicators/winrm/communicator.rb
+++ b/plugins/communicators/winrm/communicator.rb
@@ -38,6 +38,7 @@ module VagrantPlugins
           # Got it! Let the user know what we're connecting to.
           @machine.ui.detail("WinRM address: #{shell.host}:#{shell.port}")
           @machine.ui.detail("WinRM username: #{shell.username}")
+          @machine.ui.detail("WinRM execution_time_limit: #{shell.execution_time_limit}")
           @machine.ui.detail("WinRM transport: #{shell.config.transport}")
 
           last_message = nil

From c7186236f1ae30b6f4824b5aa2c56574c2fd7e5c Mon Sep 17 00:00:00 2001
From: Jeff Goldschrafe <jeff@rabb.it>
Date: Mon, 31 Aug 2015 16:50:58 -0400
Subject: [PATCH 034/354] Better Ubuntu systemd detection

Check the running process at PID 1 to determine which init system is currently in use.
---
 plugins/guests/ubuntu/cap/change_host_name.rb | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/plugins/guests/ubuntu/cap/change_host_name.rb b/plugins/guests/ubuntu/cap/change_host_name.rb
index 706d4850a..df68a010a 100644
--- a/plugins/guests/ubuntu/cap/change_host_name.rb
+++ b/plugins/guests/ubuntu/cap/change_host_name.rb
@@ -7,7 +7,7 @@ module VagrantPlugins
         end
 
         def update_etc_hostname
-          return super unless vivid?
+          return super unless systemd?
           sudo("hostnamectl set-hostname '#{short_hostname}'")
         end
 
@@ -15,7 +15,7 @@ module VagrantPlugins
           if hardy?
             # hostname.sh returns 1, so use `true` to get a 0 exitcode
             sudo("/etc/init.d/hostname.sh start; true")
-          elsif vivid?
+          elsif systemd?
             # Service runs via hostnamectl
           else
             sudo("service hostname start")
@@ -26,19 +26,25 @@ module VagrantPlugins
           os_version("hardy")
         end
 
-        def vivid?
-          os_version("vivid")
-        end
-
         def renew_dhcp
           sudo("ifdown -a; ifup -a; ifup -a --allow=hotplug")
         end
 
       private
 
+        def init_package
+          machine.communicate.execute('cat /proc/1/comm') do |type, data|
+            return data.chomp if type == :stdout
+          end
+        end
+
         def os_version(name)
           machine.communicate.test("[ `lsb_release -c -s` = #{name} ]")
         end
+
+        def systemd?
+          init_package == 'systemd'
+        end
       end
     end
   end

From 4b32744424ee3c0307ee9a24ad9bba330e9ad5ed Mon Sep 17 00:00:00 2001
From: Jeff Kwan <jkwan@vistaprint.com>
Date: Thu, 3 Sep 2015 16:54:41 -0400
Subject: [PATCH 035/354] Use a .NET API call instead of a Win8+ cmdlet

The root cause is that Windows 7 doesn't have Get-NetIPAddress (
see:
https://stackoverflow.com/questions/19529442/gather-ip-address-information
)
but the change was to try and solve the bug that the VPN IP
addresses
aren't visible detailed
here:
https://support.microsoft.com/en-us/kb/2549091

Resolved using the
2nd solution
from
http://serverfault.com/questions/145259/powershell-win32-networkadapterconfiguration-not-seeing-ppp-adapter
---
 .../synced_folders/smb/scripts/host_info.ps1  | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/plugins/synced_folders/smb/scripts/host_info.ps1 b/plugins/synced_folders/smb/scripts/host_info.ps1
index 0e089932e..c4f13aada 100644
--- a/plugins/synced_folders/smb/scripts/host_info.ps1
+++ b/plugins/synced_folders/smb/scripts/host_info.ps1
@@ -1,11 +1,21 @@
-$ErrorAction = "Stop"
-
-$net = Get-NetIPAddress | Where-Object {
-    ($_.IPAddress -ne "127.0.0.1") -and ($_.IPAddress -ne "::1")
-} | Sort-Object $_.AddressFamily
-
-$result = @{
-	ip_addresses = $net.IPAddress
-}
-
-Write-Output $(ConvertTo-Json $result)
+$ErrorAction = "Stop"
+
+# Find all of the NICsq
+$nics = [System.Net.NetworkInformation.NetworkInterface]::GetAllNetworkInterfaces()
+
+# Save the IP addresses somewhere
+$nic_ip_addresses = @()
+
+foreach ($nic in $nics) {
+    $nic_ip_addresses += $nic.GetIPProperties().UnicastAddresses | Where-Object {
+      ($_.Address.IPAddressToString -ne "127.0.0.1") -and ($_.Address.IPAddressToString -ne "::1")
+    } | Select -ExpandProperty Address
+}
+
+$nic_ip_addresses = $nic_ip_addresses | Sort-Object $_.AddressFamily
+
+$result = @{
+	ip_addresses = $nic_ip_addresses.IPAddressToString
+}
+
+Write-Output $(ConvertTo-Json $result)

From 1911586832132f93669d2db58a2add78b70e432b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
Date: Thu, 10 Sep 2015 10:05:14 +0200
Subject: [PATCH 036/354] Better NFS status check command for SUSE

---
 plugins/hosts/suse/cap/nfs.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/hosts/suse/cap/nfs.rb b/plugins/hosts/suse/cap/nfs.rb
index 42bde6bb2..789c6cb47 100644
--- a/plugins/hosts/suse/cap/nfs.rb
+++ b/plugins/hosts/suse/cap/nfs.rb
@@ -7,7 +7,7 @@ module VagrantPlugins
         end
 
         def self.nfs_check_command(env)
-          "pidof nfsd > /dev/null"
+          "/sbin/service nfsserver status"
         end
 
         def self.nfs_start_command(env)

From 33b4d6a63d9275ce9b3156883cac32551a79038d Mon Sep 17 00:00:00 2001
From: Philip Wigg <phil@postdata.co.uk>
Date: Fri, 11 Sep 2015 20:06:21 +0100
Subject: [PATCH 037/354] Fix verify_binary for Puppet for Windows guests.

---
 plugins/provisioners/puppet/provisioner/puppet.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
index f1987dbd5..6cd8716aa 100644
--- a/plugins/provisioners/puppet/provisioner/puppet.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -150,7 +150,7 @@ module VagrantPlugins
           # This is very platform dependent.
           test_cmd = "sh -c 'command -v #{binary}'"
           if windows?
-            test_cmd = "which #{binary}"
+            test_cmd = "where #{binary}"
             if @config.binary_path
               test_cmd = "where \"#{@config.binary_path}:#{binary}\""
             end

From acde6e1b16674f3d63f6d2e94e43ce57c95641fa Mon Sep 17 00:00:00 2001
From: Rickard von Essen <rickard.von.essen@gmail.com>
Date: Sun, 20 Sep 2015 09:30:49 +0200
Subject: [PATCH 038/354] Use dnf on Fedora guests instead of yum if available.

Fixes #6286 now properly installs Docker on Fedora guests.
Fixes #6287 use dnf if available.
---
 plugins/guests/redhat/cap/nfs_client.rb       |  6 +++-
 plugins/guests/redhat/cap/rsync.rb            |  6 +++-
 plugins/guests/redhat/plugin.rb               |  4 +++
 .../cfengine/cap/redhat/cfengine_install.rb   | 12 ++++++-
 .../chef/cap/redhat/chef_install.rb           | 12 ++++++-
 .../docker/cap/fedora/docker_install.rb       | 31 +++++++++++++++++++
 plugins/provisioners/docker/plugin.rb         |  5 +++
 7 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 plugins/provisioners/docker/cap/fedora/docker_install.rb

diff --git a/plugins/guests/redhat/cap/nfs_client.rb b/plugins/guests/redhat/cap/nfs_client.rb
index ef88e9900..78e2d5bca 100644
--- a/plugins/guests/redhat/cap/nfs_client.rb
+++ b/plugins/guests/redhat/cap/nfs_client.rb
@@ -3,7 +3,11 @@ module VagrantPlugins
     module Cap
       class NFSClient
         def self.nfs_client_install(machine)
-          machine.communicate.sudo("yum -y install nfs-utils nfs-utils-lib")
+          if VagrantPlugins::GuestRedHat::Plugin.dnf?(machine)
+            machine.communicate.sudo("dnf -y install nfs-utils nfs-utils-lib")
+          else
+            machine.communicate.sudo("yum -y install nfs-utils nfs-utils-lib")
+          end
           restart_nfs(machine)
         end
 
diff --git a/plugins/guests/redhat/cap/rsync.rb b/plugins/guests/redhat/cap/rsync.rb
index 9a1cfeeac..8eace63f0 100644
--- a/plugins/guests/redhat/cap/rsync.rb
+++ b/plugins/guests/redhat/cap/rsync.rb
@@ -4,7 +4,11 @@ module VagrantPlugins
       class RSync
         def self.rsync_install(machine)
           machine.communicate.tap do |comm|
-            comm.sudo("yum -y install rsync")
+            if VagrantPlugins::GuestRedHat::Plugin.dnf?(machine)
+              comm.sudo("dnf -y install rsync")
+            else
+              comm.sudo("yum -y install rsync")
+            end
           end
         end
       end
diff --git a/plugins/guests/redhat/plugin.rb b/plugins/guests/redhat/plugin.rb
index 96e641bcb..0a97febee 100644
--- a/plugins/guests/redhat/plugin.rb
+++ b/plugins/guests/redhat/plugin.rb
@@ -45,6 +45,10 @@ module VagrantPlugins
         require_relative "cap/rsync"
         Cap::RSync
       end
+
+      def self.dnf?(machine)
+        machine.communicate.test("/usr/bin/which -s dnf")
+      end
     end
   end
 end
diff --git a/plugins/provisioners/cfengine/cap/redhat/cfengine_install.rb b/plugins/provisioners/cfengine/cap/redhat/cfengine_install.rb
index 828b336d6..f22979388 100644
--- a/plugins/provisioners/cfengine/cap/redhat/cfengine_install.rb
+++ b/plugins/provisioners/cfengine/cap/redhat/cfengine_install.rb
@@ -14,9 +14,19 @@ module VagrantPlugins
               logger.info("Installing CFEngine Community Yum Repository GPG KEY from #{config.repo_gpg_key_url}")
               comm.sudo("GPGFILE=$(mktemp) && wget -O $GPGFILE #{config.repo_gpg_key_url} && rpm --import $GPGFILE; rm -f $GPGFILE")
 
-              comm.sudo("yum -y install #{config.package_name}")
+              if dnf?(machine)
+                comm.sudo("dnf -y install #{config.package_name}")
+              else
+                comm.sudo("yum -y install #{config.package_name}")
+              end
             end
           end
+
+          protected
+
+          def self.dnf?(machine)
+            machine.communicate.test("/usr/bin/which -s dnf")
+          end
         end
       end
     end
diff --git a/plugins/provisioners/chef/cap/redhat/chef_install.rb b/plugins/provisioners/chef/cap/redhat/chef_install.rb
index c6aff7bad..7d376e7d0 100644
--- a/plugins/provisioners/chef/cap/redhat/chef_install.rb
+++ b/plugins/provisioners/chef/cap/redhat/chef_install.rb
@@ -6,11 +6,21 @@ module VagrantPlugins
       module Redhat
         module ChefInstall
           def self.chef_install(machine, version, prerelease, download_path)
-            machine.communicate.sudo("yum install -y -q curl")
+            if dnf?(machine)
+              machine.communicate.sudo("dnf install -y -q curl")
+            else
+              machine.communicate.sudo("yum install -y -q curl")
+            end
 
             command = Omnibus.build_command(version, prerelease, download_path)
             machine.communicate.sudo(command)
           end
+
+          protected
+
+          def self.dnf?(machine)
+            machine.communicate.test("/usr/bin/which -s dnf")
+          end
         end
       end
     end
diff --git a/plugins/provisioners/docker/cap/fedora/docker_install.rb b/plugins/provisioners/docker/cap/fedora/docker_install.rb
new file mode 100644
index 000000000..16377f410
--- /dev/null
+++ b/plugins/provisioners/docker/cap/fedora/docker_install.rb
@@ -0,0 +1,31 @@
+module VagrantPlugins
+  module DockerProvisioner
+    module Cap
+      module Fedora
+        module DockerInstall
+          def self.docker_install(machine, version)
+            if version != :latest
+              machine.ui.warn(I18n.t("vagrant.docker_install_with_version_not_supported"))
+            end
+
+            machine.communicate.tap do |comm|
+              if dnf?(machine)
+                comm.sudo("dnf -y install docker")
+              else
+                comm.sudo("yum -y install docker")
+              end
+              comm.sudo("systemctl start docker.service")
+              comm.sudo("systemctl enable docker.service")
+            end
+          end
+
+          protected
+
+          def self.dnf?(machine)
+            machine.communicate.test("/usr/bin/which -s dnf")
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/provisioners/docker/plugin.rb b/plugins/provisioners/docker/plugin.rb
index b606729ac..b39422cd0 100644
--- a/plugins/provisioners/docker/plugin.rb
+++ b/plugins/provisioners/docker/plugin.rb
@@ -24,6 +24,11 @@ module VagrantPlugins
         Cap::Debian::DockerStartService
       end
 
+      guest_capability("fedora", "docker_install") do
+        require_relative "cap/fedora/docker_install"
+        Cap::Fedora::DockerInstall
+      end
+
       guest_capability("redhat", "docker_install") do
         require_relative "cap/redhat/docker_install"
         Cap::Redhat::DockerInstall

From f3215f0ae62376bb9168d8868b9d5a1a7d6ad781 Mon Sep 17 00:00:00 2001
From: J Lynn <j@jaesharp.com>
Date: Wed, 23 Sep 2015 13:29:11 +1000
Subject: [PATCH 039/354] copied documentation from docs to website for
 use_dhcp_assigned_default_route in order to complete documentation

---
 .../docs/source/v2/networking/public_network.html.md  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/website/docs/source/v2/networking/public_network.html.md b/website/docs/source/v2/networking/public_network.html.md
index e52cbaf58..913f6164e 100644
--- a/website/docs/source/v2/networking/public_network.html.md
+++ b/website/docs/source/v2/networking/public_network.html.md
@@ -51,6 +51,17 @@ When DHCP is used, the IP can be determined by using `vagrant ssh` to
 SSH into the machine and using the appropriate command line tool to find
 the IP, such as `ifconfig`.
 
+### Using the DHCP Assigned Default Route
+
+Some cases require the DHCP assigned default route to be untouched. In these cases one
+my specify the :use_dhcp_assigned_default_route option. As an example:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.network "public_network", use_dhcp_assigned_default_route: true
+end
+```
+
 ## Static IP
 
 Depending on your setup, you may wish to manually set the IP of your

From f22bfcb8def85d5f4ba4634f6b7d1a81dc082aa2 Mon Sep 17 00:00:00 2001
From: J Lynn <j@jaesharp.com>
Date: Wed, 23 Sep 2015 13:58:01 +1000
Subject: [PATCH 040/354] resolve formatting issues

---
 website/docs/source/v2/networking/public_network.html.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/website/docs/source/v2/networking/public_network.html.md b/website/docs/source/v2/networking/public_network.html.md
index 913f6164e..91b2443b7 100644
--- a/website/docs/source/v2/networking/public_network.html.md
+++ b/website/docs/source/v2/networking/public_network.html.md
@@ -54,11 +54,12 @@ the IP, such as `ifconfig`.
 ### Using the DHCP Assigned Default Route
 
 Some cases require the DHCP assigned default route to be untouched. In these cases one
-my specify the :use_dhcp_assigned_default_route option. As an example:
+may specify the `use_dhcp_assigned_default_route` option. As an example:
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.network "public_network", use_dhcp_assigned_default_route: true
+  config.vm.network "public_network",
+    use_dhcp_assigned_default_route: true
 end
 ```
 

From ed1c219a07180bb525d2eaa915625656bdefc888 Mon Sep 17 00:00:00 2001
From: Trey Briggs <tbriggs@curse.com>
Date: Tue, 22 Sep 2015 23:26:02 -0500
Subject: [PATCH 041/354] version is a Symbol, convert to String before concat.

---
 plugins/provisioners/chef/cap/windows/chef_installed.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/provisioners/chef/cap/windows/chef_installed.rb b/plugins/provisioners/chef/cap/windows/chef_installed.rb
index c95ea8498..6ab3bd4b7 100644
--- a/plugins/provisioners/chef/cap/windows/chef_installed.rb
+++ b/plugins/provisioners/chef/cap/windows/chef_installed.rb
@@ -7,7 +7,7 @@ module VagrantPlugins
           # @return [true, false]
           def self.chef_installed(machine, version)
             if version != :latest
-              command = 'if ((&knife --version) -Match "Chef: "' + version + '"){ exit 0 } else { exit 1 }'
+              command = 'if ((&knife --version) -Match "Chef: "' + version.to_s + '"){ exit 0 } else { exit 1 }'
             else
               command = 'if ((&knife --version) -Match "Chef: *"){ exit 0 } else { exit 1 }'
             end

From a5b6e23e201f57dcd2ef66373046ca4be921b349 Mon Sep 17 00:00:00 2001
From: Trey Briggs <tbriggs@curse.com>
Date: Tue, 22 Sep 2015 23:28:14 -0500
Subject: [PATCH 042/354] Removed extra quote in powershell command.

---
 plugins/provisioners/chef/cap/windows/chef_installed.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/provisioners/chef/cap/windows/chef_installed.rb b/plugins/provisioners/chef/cap/windows/chef_installed.rb
index 6ab3bd4b7..b08794833 100644
--- a/plugins/provisioners/chef/cap/windows/chef_installed.rb
+++ b/plugins/provisioners/chef/cap/windows/chef_installed.rb
@@ -7,7 +7,7 @@ module VagrantPlugins
           # @return [true, false]
           def self.chef_installed(machine, version)
             if version != :latest
-              command = 'if ((&knife --version) -Match "Chef: "' + version.to_s + '"){ exit 0 } else { exit 1 }'
+              command = 'if ((&knife --version) -Match "Chef: ' + version.to_s + '"){ exit 0 } else { exit 1 }'
             else
               command = 'if ((&knife --version) -Match "Chef: *"){ exit 0 } else { exit 1 }'
             end

From e0dad41b0c04de7a35b4fbf44b23eea1b41d1e4e Mon Sep 17 00:00:00 2001
From: Maarten De Wispelaere <maarten.dewispelaere@apertoso.be>
Date: Thu, 24 Sep 2015 12:18:59 +0200
Subject: [PATCH 043/354] FIX: no exception for debian 8 needed, shutdown -h -H
 doesn't work ; use normal shutdown -h now

---
 plugins/guests/debian8/cap/halt.rb | 16 ----------------
 plugins/guests/debian8/guest.rb    |  9 ---------
 plugins/guests/debian8/plugin.rb   | 21 ---------------------
 3 files changed, 46 deletions(-)
 delete mode 100644 plugins/guests/debian8/cap/halt.rb
 delete mode 100644 plugins/guests/debian8/guest.rb
 delete mode 100644 plugins/guests/debian8/plugin.rb

diff --git a/plugins/guests/debian8/cap/halt.rb b/plugins/guests/debian8/cap/halt.rb
deleted file mode 100644
index 932281347..000000000
--- a/plugins/guests/debian8/cap/halt.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-module VagrantPlugins
-  module GuestDebian8
-    module Cap
-      class Halt
-        def self.halt(machine)
-          begin
-            machine.communicate.sudo("shutdown -h -H")
-          rescue IOError
-            # Do nothing, because it probably means the machine shut down
-            # and SSH connection was lost.
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/plugins/guests/debian8/guest.rb b/plugins/guests/debian8/guest.rb
deleted file mode 100644
index ec95e9e85..000000000
--- a/plugins/guests/debian8/guest.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module VagrantPlugins
-  module GuestDebian8
-    class Guest < Vagrant.plugin("2", :guest)
-      def detect?(machine)
-        machine.communicate.test("cat /etc/issue | grep 'Debian' | grep '8'")
-      end
-    end
-  end
-end
diff --git a/plugins/guests/debian8/plugin.rb b/plugins/guests/debian8/plugin.rb
deleted file mode 100644
index 1f566f5fa..000000000
--- a/plugins/guests/debian8/plugin.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require "vagrant"
-
-module VagrantPlugins
-  module GuestDebian8
-    class Plugin < Vagrant.plugin("2")
-      name "Debian Jessie guest"
-      description "Debian Jessie guest support."
-
-      guest("debian8", "debian") do
-        require File.expand_path("../guest", __FILE__)
-        Guest
-      end
-
-      guest_capability("debian8", "halt") do
-        require_relative "cap/halt"
-        Cap::Halt
-      end
-
-    end
-  end
-end

From 599feb5d0e179a2c0647109f238627a73016d014 Mon Sep 17 00:00:00 2001
From: Sam Handler <sam@hashicorp.com>
Date: Thu, 24 Sep 2015 16:41:40 -0700
Subject: [PATCH 044/354] Add Makefile to `website/docs`

---
 website/docs/Makefile | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 website/docs/Makefile

diff --git a/website/docs/Makefile b/website/docs/Makefile
new file mode 100644
index 000000000..63bb4cab1
--- /dev/null
+++ b/website/docs/Makefile
@@ -0,0 +1,10 @@
+all: build
+
+init:
+	bundle
+
+dev: init
+	bundle exec middleman server
+
+build: init
+	bundle exec middleman build
\ No newline at end of file

From b4bd0c925eeb4a4674d67de7f5f47436c9e04569 Mon Sep 17 00:00:00 2001
From: Sam Handler <sam@hashicorp.com>
Date: Thu, 24 Sep 2015 16:42:27 -0700
Subject: [PATCH 045/354] Point website/docs README to Makefile and /v2 url

---
 website/docs/README.md | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/website/docs/README.md b/website/docs/README.md
index ca4c038fe..e9ac25640 100644
--- a/website/docs/README.md
+++ b/website/docs/README.md
@@ -14,13 +14,7 @@ requests like any normal GitHub project, and we'll merge it in.
 
 ## Running the Site Locally
 
-Running the site locally is simple. Clone this repo and run the following
-commands:
+Running the site locally is simple. Clone this repo and run `make dev`.
 
-```
-$ bundle
-$ bundle exec middleman server
-```
-
-Then open up `localhost:4567`. Note that some URLs you may need to append
+Then open up `localhost:4567/v2`. Note that some URLs you may need to append
 ".html" to make them work (in the navigation and such).

From 73314cfcbef8ca659cf8aadcce75fcecb0c5f1c2 Mon Sep 17 00:00:00 2001
From: Sam Handler <sam@hashicorp.com>
Date: Thu, 24 Sep 2015 16:44:08 -0700
Subject: [PATCH 046/354] Add 'Edit this page' link to website/docs footer

---
 website/docs/source/layouts/layout.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/website/docs/source/layouts/layout.erb b/website/docs/source/layouts/layout.erb
index 4fedc3627..38a735de3 100644
--- a/website/docs/source/layouts/layout.erb
+++ b/website/docs/source/layouts/layout.erb
@@ -324,6 +324,8 @@
 							<li><a href="https://docs.vagrantup.com/">Documentation</a></li>
 							<li><a href="https://www.vagrantup.com/about">About</a></li>
 							<li><a href="https://www.vagrantup.com/support">Support</a></li>
+							<% github_link = 'https://github.com/mitchellh/vagrant/blob/master/' + current_page.source_file.match(/website.*/)[0] %>
+							<li class="li-under"><a href="<%= github_link %>">Edit this page</a></li>
 							<a href="https://www.vagrantup.com/downloads">
 								<li class="button inline-button">Download</li>
 							</a>

From ab590f7740628cb7cf22550d22faa16452e8a2b8 Mon Sep 17 00:00:00 2001
From: Sam Handler <sam@hashicorp.com>
Date: Thu, 24 Sep 2015 16:44:54 -0700
Subject: [PATCH 047/354] Add Makefile to `website/www`

---
 website/www/Makefile | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 website/www/Makefile

diff --git a/website/www/Makefile b/website/www/Makefile
new file mode 100644
index 000000000..63bb4cab1
--- /dev/null
+++ b/website/www/Makefile
@@ -0,0 +1,10 @@
+all: build
+
+init:
+	bundle
+
+dev: init
+	bundle exec middleman server
+
+build: init
+	bundle exec middleman build
\ No newline at end of file

From 33d602ba84a805be2e88b0ee71ef984026cb45e6 Mon Sep 17 00:00:00 2001
From: Sam Handler <sam@hashicorp.com>
Date: Thu, 24 Sep 2015 16:45:43 -0700
Subject: [PATCH 048/354] Point `website/www` README to Makefile

---
 website/www/README.md | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/website/www/README.md b/website/www/README.md
index 814da3877..3645fa52c 100644
--- a/website/www/README.md
+++ b/website/www/README.md
@@ -14,13 +14,7 @@ requests like any normal GitHub project, and we'll merge it in.
 
 ## Running the Site Locally
 
-Running the site locally is simple. Clone this repo and run the following
-commands:
-
-```
-$ bundle
-$ bundle exec middleman server
-```
+Running the site locally is simple. Clone this repo and run `make dev`.
 
 Then open up `localhost:4567`. Note that some URLs you may need to append
 ".html" to make them work (in the navigation and such).

From 094d8b89efc14a9c47c9dcd7833692e791f04025 Mon Sep 17 00:00:00 2001
From: Sam Handler <sam@hashicorp.com>
Date: Thu, 24 Sep 2015 16:47:14 -0700
Subject: [PATCH 049/354] Add 'Edit this page' link to website/www footer

---
 website/www/source/layouts/layout.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/website/www/source/layouts/layout.erb b/website/www/source/layouts/layout.erb
index 4e6736743..2daba176d 100644
--- a/website/www/source/layouts/layout.erb
+++ b/website/www/source/layouts/layout.erb
@@ -59,6 +59,10 @@
 							 <li><a href="https://docs.vagrantup.com/">Documentation</a></li>
 							 <li><a href="/about.html">About</a></li>
 							 <li><a href="/support.html">Support</a></li>
+							 <% if current_page.url != "/" %>
+							 	<% github_link = 'https://github.com/mitchellh/vagrant/blob/master/' + current_page.source_file.match(/website.*/)[0] %>
+							 	<li class="li-under"><a href="<%= github_link %>">Edit this page</a></li>
+							 <% end %>
 							 <a href="/downloads.html">
 								 <li class="button inline-button">Download</li>
 							 </a>

From 6b033f2d65b3f347f813969fb032ef5ac3f62d4b Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Fri, 25 Sep 2015 15:14:12 +0200
Subject: [PATCH 050/354] doc: mention "directory" in the file provisioner
 reference

---
 .../docs/source/v2/provisioning/file.html.md  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/website/docs/source/v2/provisioning/file.html.md b/website/docs/source/v2/provisioning/file.html.md
index ca65c8bb9..0fab619ce 100644
--- a/website/docs/source/v2/provisioning/file.html.md
+++ b/website/docs/source/v2/provisioning/file.html.md
@@ -7,8 +7,8 @@ sidebar_current: "provisioning-file"
 
 **Provisioner name: `"file"`**
 
-The file provisioner allows you to upload a file from the host machine to
-the guest machine.
+The file provisioner allows you to upload a file or directory from the host
+machine to the guest machine.
 
 File provisioning is a simple way to, for example, replicate your local
 ~/.gitconfig to the vagrant user's home directory on the guest machine so
@@ -21,19 +21,20 @@ new VM.
       config.vm.provision "file", source: "~/.gitconfig", destination: ".gitconfig"
     end
 
-Note that, unlike with synced folders, files that are uploaded will not
-be kept in sync. Continuing with the example above, if you make further
-changes to your local ~/.gitconfig, they will not be immediately reflected
-in the copy you uploaded to the guest machine.
+Note that, unlike with synced folders, files or directories that are uploaded
+will not be kept in sync. Continuing with the example above, if you make
+further changes to your local ~/.gitconfig, they will not be immediately
+reflected in the copy you uploaded to the guest machine.
 
 ## Options
 
 The file provisioner takes only two options, both of which are required:
 
-* `source` (string) - Is the local path of the file to be uploaded.
+* `source` (string) - Is the local path of the file or directory to be
+  uploaded.
 
 * `destination` (string) - Is the remote path on the guest machine where
-  the file will be uploaded to. The file is uploaded as the SSH user over
-  SCP, so this location must be writable to that user. The SSH user can be
+  the source will be uploaded to. The file/folder is uploaded as the SSH user
+  over SCP, so this location must be writable to that user. The SSH user can be
   determined by running `vagrant ssh-config`, and defaults to "vagrant".
 

From fd593a85b7034229e2428e2caa1a38355f0057e8 Mon Sep 17 00:00:00 2001
From: Brian Dwyer <bdwyer@IEEE.org>
Date: Sun, 27 Sep 2015 23:23:28 -0400
Subject: [PATCH 051/354] Add `nodes_path` support for the Chef-Solo
 provisioner

---
 plugins/provisioners/chef/config/chef_solo.rb      | 7 +++++++
 plugins/provisioners/chef/provisioner/chef_solo.rb | 2 ++
 templates/provisioners/chef_solo/solo.erb          | 4 ++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/plugins/provisioners/chef/config/chef_solo.rb b/plugins/provisioners/chef/config/chef_solo.rb
index ee4a2ac2e..a9630a7b8 100644
--- a/plugins/provisioners/chef/config/chef_solo.rb
+++ b/plugins/provisioners/chef/config/chef_solo.rb
@@ -17,6 +17,10 @@ module VagrantPlugins
         # @return [String]
         attr_accessor :environments_path
 
+        # The path where nodes are stored on disk.
+        # @return [String]
+        attr_accessor :nodes_path
+
         # A URL download a remote recipe from. Note: you should use chef-apply
         # instead.
         #
@@ -39,6 +43,7 @@ module VagrantPlugins
           @cookbooks_path      = UNSET_VALUE
           @data_bags_path      = UNSET_VALUE
           @environments_path   = UNSET_VALUE
+          @nodes_path          = UNSET_VALUE
           @recipe_url          = UNSET_VALUE
           @roles_path          = UNSET_VALUE
           @synced_folder_type  = UNSET_VALUE
@@ -86,6 +91,7 @@ module VagrantPlugins
           end
 
           @data_bags_path    = [] if @data_bags_path == UNSET_VALUE
+          @nodes_path        = [] if @nodes_path == UNSET_VALUE
           @roles_path        = [] if @roles_path == UNSET_VALUE
           @environments_path = [] if @environments_path == UNSET_VALUE
           @environments_path = [@environments_path].flatten
@@ -93,6 +99,7 @@ module VagrantPlugins
           # Make sure the path is an array.
           @cookbooks_path    = prepare_folders_config(@cookbooks_path)
           @data_bags_path    = prepare_folders_config(@data_bags_path)
+          @nodes_path        = prepare_folders_config(@nodes_path)
           @roles_path        = prepare_folders_config(@roles_path)
           @environments_path = prepare_folders_config(@environments_path)
         end
diff --git a/plugins/provisioners/chef/provisioner/chef_solo.rb b/plugins/provisioners/chef/provisioner/chef_solo.rb
index 14ee5747c..1fc29da6e 100644
--- a/plugins/provisioners/chef/provisioner/chef_solo.rb
+++ b/plugins/provisioners/chef/provisioner/chef_solo.rb
@@ -19,6 +19,7 @@ module VagrantPlugins
 
         attr_reader :environments_folders
         attr_reader :cookbook_folders
+        attr_reader :node_folders
         attr_reader :role_folders
         attr_reader :data_bags_folders
 
@@ -160,6 +161,7 @@ module VagrantPlugins
           {
             cookbooks_path: guest_paths(@cookbook_folders),
             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,
             environments_path: guest_paths(@environments_folders).first
diff --git a/templates/provisioners/chef_solo/solo.erb b/templates/provisioners/chef_solo/solo.erb
index 25d3346b7..a3b01ed3b 100644
--- a/templates/provisioners/chef_solo/solo.erb
+++ b/templates/provisioners/chef_solo/solo.erb
@@ -31,8 +31,8 @@ environment "<%= environment %>"
 <% if local_mode -%>
 local_mode true
 <% end -%>
-<% if node_path -%>
-node_path <%= node_path.inspect %>
+<% if nodes_path -%>
+node_path <%= nodes_path.inspect %>
 <% end -%>
 
 http_proxy <%= http_proxy.inspect %>

From c23610d70379f03ac27ba281356def7108aca868 Mon Sep 17 00:00:00 2001
From: Brian Dwyer <bdwyer@IEEE.org>
Date: Sun, 27 Sep 2015 23:24:01 -0400
Subject: [PATCH 052/354] Update test

---
 .../plugins/provisioners/chef/config/chef_solo_test.rb    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/unit/plugins/provisioners/chef/config/chef_solo_test.rb b/test/unit/plugins/provisioners/chef/config/chef_solo_test.rb
index d6a2a03af..2c699cbd2 100644
--- a/test/unit/plugins/provisioners/chef/config/chef_solo_test.rb
+++ b/test/unit/plugins/provisioners/chef/config/chef_solo_test.rb
@@ -57,6 +57,14 @@ describe VagrantPlugins::Chef::Config::ChefSolo do
     end
   end
 
+  describe "#nodes_path" do
+    it "defaults to an empty array" do
+      subject.finalize!
+      expect(subject.nodes_path).to be_a(Array)
+      expect(subject.nodes_path).to be_empty
+    end
+  end
+
   describe "#synced_folder_type" do
     it "defaults to nil" do
       subject.finalize!

From 8fb2e0b4a54f38a93c133928c630101aa55a7e3c Mon Sep 17 00:00:00 2001
From: Brian Dwyer <bdwyer@IEEE.org>
Date: Sun, 27 Sep 2015 23:24:40 -0400
Subject: [PATCH 053/354] Update documentation for Chef Solo `nodes_path`

---
 website/docs/source/v2/provisioning/chef_solo.html.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/website/docs/source/v2/provisioning/chef_solo.html.md b/website/docs/source/v2/provisioning/chef_solo.html.md
index a7841b90e..a43232bed 100644
--- a/website/docs/source/v2/provisioning/chef_solo.html.md
+++ b/website/docs/source/v2/provisioning/chef_solo.html.md
@@ -42,6 +42,9 @@ available below this section.
 * `environments_path` (string) - A path where environment definitions are
   located. By default, no environments folder is set.
 
+* `nodes_path` (string or array) - A list of paths where node objects (in JSON format) are stored. By default, no
+  nodes path is set.
+
 * `environment` (string) - The environment you want the Chef run to be
   a part of. This requires Chef 11.6.0 or later, and that `environments_path`
   is set.

From cfd4270cdb36833e5a4d322641c68b7a53cacc58 Mon Sep 17 00:00:00 2001
From: Maarten De Wispelaere <maarten.dewispelaere@apertoso.be>
Date: Mon, 28 Sep 2015 09:08:20 +0200
Subject: [PATCH 054/354] FIX bug introduced in #6315

---
 plugins/guests/debian/guest.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/guests/debian/guest.rb b/plugins/guests/debian/guest.rb
index be08b3605..a7f3d65de 100644
--- a/plugins/guests/debian/guest.rb
+++ b/plugins/guests/debian/guest.rb
@@ -2,7 +2,7 @@ module VagrantPlugins
   module GuestDebian
     class Guest < Vagrant.plugin("2", :guest)
       def detect?(machine)
-        machine.communicate.test("cat /etc/issue | grep 'Debian' | grep -v '8'")
+        machine.communicate.test("cat /etc/issue | grep 'Debian'")
       end
     end
   end

From 702e8d6324a9485f2d1e6c46c9cee5aa8316405d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
Date: Thu, 10 Sep 2015 10:05:41 +0200
Subject: [PATCH 055/354] Add a sudoers script for SUSE

---
 contrib/sudoers/linux-suse | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 contrib/sudoers/linux-suse

diff --git a/contrib/sudoers/linux-suse b/contrib/sudoers/linux-suse
new file mode 100644
index 000000000..30658af3f
--- /dev/null
+++ b/contrib/sudoers/linux-suse
@@ -0,0 +1,7 @@
+Cmnd_Alias VAGRANT_EXPORTS_ADD = /usr/bin/tee -a /etc/exports
+Cmnd_Alias VAGRANT_NFSD_CHECK = /sbin/service nfsserver status
+Cmnd_Alias VAGRANT_NFSD_START = /sbin/service nfsserver start
+Cmnd_Alias VAGRANT_NFSD_APPLY = /usr/sbin/exportfs -ar
+Cmnd_Alias VAGRANT_EXPORTS_REMOVE = /usr/bin/sed -r -e * d -ibak /*/exports
+Cmnd_Alias VAGRANT_EXPORTS_REMOVE_2 = /usr/bin/cp /*/exports /etc/exports
+%vagrant ALL=(root) NOPASSWD: VAGRANT_EXPORTS_ADD, VAGRANT_NFSD_CHECK, VAGRANT_NFSD_START, VAGRANT_NFSD_APPLY, VAGRANT_EXPORTS_REMOVE, VAGRANT_EXPORTS_REMOVE_2

From 04fb0d99f6fd3e878938ec31174843fa3ea8d812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
Date: Mon, 28 Sep 2015 09:17:40 +0200
Subject: [PATCH 056/354] Fix sudoers files after change to cleanup command

PR #5773 modified the cleanup command so that the
example sudoers scripts no longer match.
---
 contrib/sudoers/linux-fedora | 5 +++--
 contrib/sudoers/linux-ubuntu | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/contrib/sudoers/linux-fedora b/contrib/sudoers/linux-fedora
index f2d64b66d..5bec89189 100644
--- a/contrib/sudoers/linux-fedora
+++ b/contrib/sudoers/linux-fedora
@@ -2,5 +2,6 @@ Cmnd_Alias VAGRANT_EXPORTS_ADD = /usr/bin/tee -a /etc/exports
 Cmnd_Alias VAGRANT_NFSD_CHECK = /usr/bin/systemctl status nfs-server.service
 Cmnd_Alias VAGRANT_NFSD_START = /usr/bin/systemctl start nfs-server.service
 Cmnd_Alias VAGRANT_NFSD_APPLY = /usr/sbin/exportfs -ar
-Cmnd_Alias VAGRANT_EXPORTS_REMOVE = /bin/sed -r -e * d -ibak /etc/exports
-%vagrant ALL=(root) NOPASSWD: VAGRANT_EXPORTS_ADD, VAGRANT_NFSD_CHECK, VAGRANT_NFSD_START, VAGRANT_NFSD_APPLY, VAGRANT_EXPORTS_REMOVE
+Cmnd_Alias VAGRANT_EXPORTS_REMOVE = /bin/sed -r -e * d -ibak /*/exports
+Cmnd_Alias VAGRANT_EXPORTS_REMOVE_2 = /bin/cp /*/exports /etc/exports
+%vagrant ALL=(root) NOPASSWD: VAGRANT_EXPORTS_ADD, VAGRANT_NFSD_CHECK, VAGRANT_NFSD_START, VAGRANT_NFSD_APPLY, VAGRANT_EXPORTS_REMOVE, VAGRANT_EXPORTS_REMOVE_2
diff --git a/contrib/sudoers/linux-ubuntu b/contrib/sudoers/linux-ubuntu
index c4e786cf3..4e2cd8bde 100644
--- a/contrib/sudoers/linux-ubuntu
+++ b/contrib/sudoers/linux-ubuntu
@@ -4,5 +4,6 @@ Cmnd_Alias VAGRANT_EXPORTS_ADD = /usr/bin/tee -a /etc/exports
 Cmnd_Alias VAGRANT_NFSD_CHECK = /etc/init.d/nfs-kernel-server status
 Cmnd_Alias VAGRANT_NFSD_START = /etc/init.d/nfs-kernel-server start
 Cmnd_Alias VAGRANT_NFSD_APPLY = /usr/sbin/exportfs -ar
-Cmnd_Alias VAGRANT_EXPORTS_REMOVE = /bin/sed -r -e * d -ibak /etc/exports
-%sudo ALL=(root) NOPASSWD: VAGRANT_EXPORTS_ADD, VAGRANT_NFSD_CHECK, VAGRANT_NFSD_START, VAGRANT_NFSD_APPLY, VAGRANT_EXPORTS_REMOVE
+Cmnd_Alias VAGRANT_EXPORTS_REMOVE = /bin/sed -r -e * d -ibak /*/exports
+Cmnd_Alias VAGRANT_EXPORTS_REMOVE_2 = /bin/cp /*/exports /etc/exports
+%sudo ALL=(root) NOPASSWD: VAGRANT_EXPORTS_ADD, VAGRANT_NFSD_CHECK, VAGRANT_NFSD_START, VAGRANT_NFSD_APPLY, VAGRANT_EXPORTS_REMOVE, VAGRANT_EXPORTS_REMOVE_2

From 0556b3b040a75c3d698a5e0917722e7d83b5b001 Mon Sep 17 00:00:00 2001
From: ctammes <ctammes@gmail.com>
Date: Tue, 6 Oct 2015 14:02:45 +0200
Subject: [PATCH 057/354] Update push.rb

https://github.com/mitchellh/vagrant/issues/5570

When uploading from Windows to Linux, the Windows filepath was added to the Linux path.
---
 plugins/pushes/ftp/push.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pushes/ftp/push.rb b/plugins/pushes/ftp/push.rb
index 7a69c4f02..755304ee6 100644
--- a/plugins/pushes/ftp/push.rb
+++ b/plugins/pushes/ftp/push.rb
@@ -19,7 +19,7 @@ module VagrantPlugins
         # wait and close the (S)FTP connection as well
         files = Hash[*all_files.flat_map do |file|
           relative_path = relative_path_for(file, config.dir)
-          destination = File.expand_path(File.join(config.destination, relative_path))
+          destination = File.join(config.destination, relative_path)
           file = File.expand_path(file, env.root_path)
           [file, destination]
         end]

From 07e38f1bb3e890fa373fda3e106f08e69c7194a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Bonveh=C3=AD?= <gbonvehi@gmail.com>
Date: Wed, 7 Oct 2015 01:17:07 -0300
Subject: [PATCH 058/354] Fix Slackware Host detection and nfsd checks

Slackware's version file is /etc/slackware-version not
/etc/slackware-release.
pidof is not on PATH by default (not running as root) so call it using
full path
---
 plugins/hosts/slackware/cap/nfs.rb | 2 +-
 plugins/hosts/slackware/host.rb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/hosts/slackware/cap/nfs.rb b/plugins/hosts/slackware/cap/nfs.rb
index e7f21a094..84413236d 100644
--- a/plugins/hosts/slackware/cap/nfs.rb
+++ b/plugins/hosts/slackware/cap/nfs.rb
@@ -3,7 +3,7 @@ module VagrantPlugins
     module Cap
       class NFS
         def self.nfs_check_command(env)
-          "pidof nfsd >/dev/null"
+          "/sbin/pidof nfsd >/dev/null"
         end
 
         def self.nfs_start_command(env)
diff --git a/plugins/hosts/slackware/host.rb b/plugins/hosts/slackware/host.rb
index 2afaff8f3..ec3503ac0 100644
--- a/plugins/hosts/slackware/host.rb
+++ b/plugins/hosts/slackware/host.rb
@@ -4,7 +4,7 @@ module VagrantPlugins
   module HostSlackware
     class Host < Vagrant.plugin("2", :host)
       def detect?(env)
-        return File.exists?("/etc/slackware-release") ||
+        return File.exists?("/etc/slackware-version") ||
           !Dir.glob("/usr/lib/setup/Plamo-*").empty?
       end
     end

From 00894b5a2791afce6ac5132c08d2a7d463519c8c Mon Sep 17 00:00:00 2001
From: caleblloyd <caleblloyd@gmail.com>
Date: Wed, 7 Oct 2015 20:25:09 -0400
Subject: [PATCH 059/354] hyper-v boot device by generation fixes #6372

---
 .../providers/hyperv/scripts/import_vm.ps1    | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/plugins/providers/hyperv/scripts/import_vm.ps1 b/plugins/providers/hyperv/scripts/import_vm.ps1
index 3e8664eb2..a994c1cfb 100644
--- a/plugins/providers/hyperv/scripts/import_vm.ps1
+++ b/plugins/providers/hyperv/scripts/import_vm.ps1
@@ -81,14 +81,24 @@ if (!$switchname) {
     $switchname = (Select-Xml -xml $vmconfig -XPath "//AltSwitchName").node."#text"
 }
 
-# Determine boot device
-Switch ((Select-Xml -xml $vmconfig -XPath "//boot").node.device0."#text") {
-    "Floppy"    { $bootdevice = "floppy" }
-    "HardDrive" { $bootdevice = "IDE" }
-    "Optical"   { $bootdevice = "CD" }
-    "Network"   { $bootdevice = "LegacyNetworkAdapter" }
-    "Default"   { $bootdevice = "IDE" }
-} #switch
+if ($generation -eq 1) {
+    # Determine boot device
+    Switch ((Select-Xml -xml $vmconfig -XPath "//boot").node.device0."#text") {
+        "Floppy"    { $bootdevice = "Floppy" }
+        "HardDrive" { $bootdevice = "IDE" }
+        "Optical"   { $bootdevice = "CD" }
+        "Network"   { $bootdevice = "LegacyNetworkAdapter" }
+        "Default"   { $bootdevice = "IDE" }
+    } #switch
+} else {
+    # Determine boot device
+    Switch ((Select-Xml -xml $vmconfig -XPath "//boot").node.device0."#text") {
+        "HardDrive" { $bootdevice = "VHD" }
+        "Optical"   { $bootdevice = "CD" }
+        "Network"   { $bootdevice = "NetworkAdapter" }
+        "Default"   { $bootdevice = "VHD" }
+    } #switch
+}
 
 # Determine secure boot options
 $secure_boot_enabled = (Select-Xml -xml $vmconfig -XPath "//secure_boot_enabled").Node."#text"

From 70e9079449333fbb11dd0a5cb7026d1986cc505b Mon Sep 17 00:00:00 2001
From: Jurnell Cockhren <jurnell.cockhren@sophicware.com>
Date: Thu, 8 Oct 2015 14:00:38 -0500
Subject: [PATCH 060/354] Revert "Fix alignment of initializer"

Refers to issues #6276, #5973 and #5936

This reverts commit 27d751863673435693b775bf44e79b9f688a8968.
---
 plugins/provisioners/salt/config.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/provisioners/salt/config.rb b/plugins/provisioners/salt/config.rb
index 9c564179e..084dc457c 100644
--- a/plugins/provisioners/salt/config.rb
+++ b/plugins/provisioners/salt/config.rb
@@ -95,7 +95,7 @@ module VagrantPlugins
         @install_args       = nil if @install_args == UNSET_VALUE
         @install_master     = nil if @install_master == UNSET_VALUE
         @install_syndic     = nil if @install_syndic == UNSET_VALUE
-        @install_command    = nil if @install_command == UNSET_VALUE
+        @install_command     = nil if @install_command == UNSET_VALUE
         @no_minion          = nil if @no_minion == UNSET_VALUE
         @bootstrap_options  = nil if @bootstrap_options == UNSET_VALUE
         @config_dir         = nil if @config_dir == UNSET_VALUE

From fb611c7389ea068a9aed010fd7693ff7d9c87b25 Mon Sep 17 00:00:00 2001
From: Jurnell Cockhren <jurnell.cockhren@sophicware.com>
Date: Thu, 8 Oct 2015 14:04:44 -0500
Subject: [PATCH 061/354] Revert "Initialize the install_command salt config
 var"

Refers to issues #6276, #5973 and #5936

This reverts commit ccd735466524e5cdea353714e06d9a3c88d17bdc.
---
 plugins/provisioners/salt/config.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/provisioners/salt/config.rb b/plugins/provisioners/salt/config.rb
index 084dc457c..4d9550406 100644
--- a/plugins/provisioners/salt/config.rb
+++ b/plugins/provisioners/salt/config.rb
@@ -33,7 +33,6 @@ module VagrantPlugins
       attr_accessor :install_args
       attr_accessor :install_master
       attr_accessor :install_syndic
-      attr_accessor :install_command
       attr_accessor :no_minion
       attr_accessor :bootstrap_options
       attr_accessor :version
@@ -62,7 +61,6 @@ module VagrantPlugins
         @install_args = UNSET_VALUE
         @install_master = UNSET_VALUE
         @install_syndic = UNSET_VALUE
-        @install_command = UNSET_VALUE
         @no_minion = UNSET_VALUE
         @bootstrap_options = UNSET_VALUE
         @config_dir = UNSET_VALUE
@@ -95,7 +93,6 @@ module VagrantPlugins
         @install_args       = nil if @install_args == UNSET_VALUE
         @install_master     = nil if @install_master == UNSET_VALUE
         @install_syndic     = nil if @install_syndic == UNSET_VALUE
-        @install_command     = nil if @install_command == UNSET_VALUE
         @no_minion          = nil if @no_minion == UNSET_VALUE
         @bootstrap_options  = nil if @bootstrap_options == UNSET_VALUE
         @config_dir         = nil if @config_dir == UNSET_VALUE

From 1a7c6dcfeb7db6e726c4918a0c271c7cfe8a99cb Mon Sep 17 00:00:00 2001
From: Jurnell Cockhren <jurnell.cockhren@sophicware.com>
Date: Thu, 8 Oct 2015 14:51:40 -0500
Subject: [PATCH 062/354] Revert "Salt Provisioner: refactor custom
 install_type option to add install_command instead"

Refers to issues #6276, #5973, #5936 and #5435

This reverts commit 72e63767ac5807277dfe7f2202d3ab25804fe0df.

Conflicts:
	website/docs/source/v2/provisioning/salt.html.md
---
 plugins/provisioners/salt/provisioner.rb         | 13 +++++--------
 website/docs/source/v2/provisioning/salt.html.md |  7 +------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/plugins/provisioners/salt/provisioner.rb b/plugins/provisioners/salt/provisioner.rb
index 72365776e..fb021d418 100644
--- a/plugins/provisioners/salt/provisioner.rb
+++ b/plugins/provisioners/salt/provisioner.rb
@@ -136,20 +136,17 @@ module VagrantPlugins
         end
 
         if @config.install_type
-          options = "%s %s" % [options, @config.install_type]
+          # Allow passing install_args as an arbitrary string rather
+          # than trying to format it based on known options
+          if @config.install_type != "custom"
+            options = "%s %s" % [options, @config.install_type]
+          end
         end
 
         if @config.install_args
           options = "%s %s" % [options, @config.install_args]
         end
 
-        if @config.install_command
-          # If this is defined, we will ignore both install_type and
-          # install_args and use this instead. Every necessary command option
-          # will need to be specified by the user.
-          options = @config.install_command
-        end
-
         if @config.verbose
           @machine.env.ui.info "Using Bootstrap Options: %s" % options
         end
diff --git a/website/docs/source/v2/provisioning/salt.html.md b/website/docs/source/v2/provisioning/salt.html.md
index 938fec155..aab48b7bd 100644
--- a/website/docs/source/v2/provisioning/salt.html.md
+++ b/website/docs/source/v2/provisioning/salt.html.md
@@ -54,19 +54,14 @@ on this machine. Not supported on Windows guest machines.
 * `install_syndic`   (boolean) - Install the salt-syndic, default
 `false`. Not supported on Windows guest machines.
 
-* `install_type`  (stable | git | daily | testing) - Whether to install from a
+* `install_type`  (stable | git | daily | testing | custom) - Whether to install from a
 distribution's stable package manager, git tree-ish, daily ppa, or testing repository.
-Not supported on Windows guest machines.
 
 * `install_args` (develop) - When performing a git install,
 you can specify a branch, tag, or any treeish. If using the `custom` install type,
 you can also specify a different repository to install from.
 Not supported on Windows guest machines.
 
-* `install_command` (string) - Allow specifying an arbitrary string of arguments
-to the bootstrap script. This will completely ignore `install_type` and `install_args`
-to allow more flexibility with the bootstrap process.
-
 * `always_install`   (boolean) - Installs salt binaries even
  if they are already detected, default `false`
 

From 86e56aeac334c4d1d1ce9e20d1935a05af81549a Mon Sep 17 00:00:00 2001
From: Jurnell Cockhren <jurnell.cockhren@sophicware.com>
Date: Thu, 8 Oct 2015 14:56:48 -0500
Subject: [PATCH 063/354] Revert "Salt Provisioner: Added a 'custom' option to
 install_type to allow more flexibility in passing arguments to the bootstrap
 script. Updated the docs."

This reverts commit 0289ab986c053f7d3bc825142c82a07bcf0ae3ec.

Refers to issues #6276, #5973, #5936 and #5435

Conflicts:
	website/docs/source/v2/provisioning/salt.html.md
---
 plugins/provisioners/salt/provisioner.rb         | 6 +-----
 website/docs/source/v2/provisioning/salt.html.md | 7 ++-----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/plugins/provisioners/salt/provisioner.rb b/plugins/provisioners/salt/provisioner.rb
index fb021d418..f7b4406e9 100644
--- a/plugins/provisioners/salt/provisioner.rb
+++ b/plugins/provisioners/salt/provisioner.rb
@@ -136,11 +136,7 @@ module VagrantPlugins
         end
 
         if @config.install_type
-          # Allow passing install_args as an arbitrary string rather
-          # than trying to format it based on known options
-          if @config.install_type != "custom"
-            options = "%s %s" % [options, @config.install_type]
-          end
+          options = "%s %s" % [options, @config.install_type]
         end
 
         if @config.install_args
diff --git a/website/docs/source/v2/provisioning/salt.html.md b/website/docs/source/v2/provisioning/salt.html.md
index aab48b7bd..d4d13bf61 100644
--- a/website/docs/source/v2/provisioning/salt.html.md
+++ b/website/docs/source/v2/provisioning/salt.html.md
@@ -54,13 +54,10 @@ on this machine. Not supported on Windows guest machines.
 * `install_syndic`   (boolean) - Install the salt-syndic, default
 `false`. Not supported on Windows guest machines.
 
-* `install_type`  (stable | git | daily | testing | custom) - Whether to install from a
+* `install_type`  (stable | git | daily | testing) - Whether to install from a
 distribution's stable package manager, git tree-ish, daily ppa, or testing repository.
 
-* `install_args` (develop) - When performing a git install,
-you can specify a branch, tag, or any treeish. If using the `custom` install type,
-you can also specify a different repository to install from.
-Not supported on Windows guest machines.
+* `install_args` (develop) - When performing a git install, you can specify a branch, tag, or any treeish. Not supported on Windows.
 
 * `always_install`   (boolean) - Installs salt binaries even
  if they are already detected, default `false`

From 1b19ce1cc3c5ce454e9ecd99fd542abe7d0ddb5c Mon Sep 17 00:00:00 2001
From: Pat O'Shea <pat-oshea@pluralsight.com>
Date: Thu, 8 Oct 2015 23:56:34 -0600
Subject: [PATCH 064/354] Add windows minion requirement for ipc_mode

If this is not set to tpc, then the minion will fail to communicate with the master.
---
 website/docs/source/v2/provisioning/salt.html.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/source/v2/provisioning/salt.html.md b/website/docs/source/v2/provisioning/salt.html.md
index 938fec155..5d41b302f 100644
--- a/website/docs/source/v2/provisioning/salt.html.md
+++ b/website/docs/source/v2/provisioning/salt.html.md
@@ -90,7 +90,7 @@ a custom salt minion config file.
 * `minion_pub`  (salt/key/minion.pub) - Path to your minion
 public key
 
-* `grains_config`  (string) - Path to a custom salt grains file.
+* `grains_config`  (string) - Path to a custom salt grains file. On Windows, the minion needs `ipc_mode: tcp` set otherwise it will [fail to communicate](https://github.com/saltstack/salt/issues/22796) with the master.
 
 * `masterless`  (boolean) - Calls state.highstate in local mode. Uses `minion_id` and `pillar_data` when provided.
 

From e426455309597857d687678e0fc8dbd044e7fa7b Mon Sep 17 00:00:00 2001
From: Mikhail Zholobov <legal90@gmail.com>
Date: Fri, 9 Oct 2015 14:54:10 +0300
Subject: [PATCH 065/354] guests/darwin: Configure network following the MAC
 addresses matching

Currently `configure_networks` guest cap configures NICs following the device order and fails
when the device order is mixed. We should detect the appropriate NIC by its MAC address.
---
 .../guests/darwin/cap/configure_networks.rb   | 108 ++++++++++++++----
 1 file changed, 86 insertions(+), 22 deletions(-)

diff --git a/plugins/guests/darwin/cap/configure_networks.rb b/plugins/guests/darwin/cap/configure_networks.rb
index fefd0a2e2..1f43acd6a 100644
--- a/plugins/guests/darwin/cap/configure_networks.rb
+++ b/plugins/guests/darwin/cap/configure_networks.rb
@@ -6,45 +6,109 @@ module VagrantPlugins
   module GuestDarwin
     module Cap
       class ConfigureNetworks
+        @@logger = Log4r::Logger.new("vagrant::guest::darwin::configure_networks")
+
         include Vagrant::Util
 
         def self.configure_networks(machine, networks)
-          # Slightly different than other plugins, using the template to build commands 
-          # rather than templating the files.
+          if !machine.provider.capability?(:nic_mac_addresses)
+            raise Errors::CantReadMACAddresses,
+                  provider: machine.provider_name.to_s
+          end
 
-          machine.communicate.sudo("networksetup -detectnewhardware")
-          machine.communicate.sudo("networksetup -listnetworkserviceorder > /tmp/vagrant.interfaces")
-          tmpints = File.join(Dir.tmpdir, File.basename("#{machine.id}.interfaces"))
-          machine.communicate.download("/tmp/vagrant.interfaces",tmpints)
+          nic_mac_addresses = machine.provider.capability(:nic_mac_addresses)
+          @@logger.debug("mac addresses: #{nic_mac_addresses.inspect}")
 
-          devlist = []
-          ints = ::IO.read(tmpints)
+          mac_service_map = create_mac_service_map(machine)
+
+          networks.each do |network|
+            mac_address = nic_mac_addresses[network[:interface]+1]
+            if mac_address.nil?
+              @@logger.warn("Could not find mac address for network #{network.inspect}")
+              next
+            end
+
+            service_name = mac_service_map[mac_address]
+            if service_name.nil?
+              @@logger.warn("Could not find network service for mac address #{mac_address}")
+              next
+            end
+
+            network_type = network[:type].to_sym
+            if network_type == :static
+              command = "networksetup -setmanual \"#{service_name}\" #{network[:ip]} #{network[:netmask]}"
+            elsif network_type == :dhcp
+              command = "networksetup -setdhcp \"#{service_name}\""
+            else
+              raise "#{network_type} network type is not supported, try static or dhcp"
+            end
+
+            machine.communicate.sudo(command)
+          end
+        end
+
+        # Creates a hash mapping MAC addresses to network service name
+        # Example: { "00C100A1B2C3" => "Thunderbolt Ethernet" }
+        def self.create_mac_service_map(machine)
+          tmp_ints = File.join(Dir.tmpdir, File.basename("#{machine.id}.interfaces"))
+          tmp_hw = File.join(Dir.tmpdir, File.basename("#{machine.id}.hardware"))
+
+          machine.communicate.tap do |comm|
+            comm.sudo("networksetup -detectnewhardware")
+            comm.sudo("networksetup -listnetworkserviceorder > /tmp/vagrant.interfaces")
+            comm.sudo("networksetup -listallhardwareports > /tmp/vagrant.hardware")
+            comm.download("/tmp/vagrant.interfaces", tmp_ints)
+            comm.download("/tmp/vagrant.hardware", tmp_hw)
+          end
+
+          interface_map = {}
+          ints = ::IO.read(tmp_ints)
           ints.split(/\n\n/m).each do |i|
-            if i.match(/Hardware/) and not i.match(/Ethernet/).nil?
-              devmap = {}
+            if i.match(/Hardware/) && i.match(/Ethernet/)
               # Ethernet, should be 2 lines, 
               # (3) Thunderbolt Ethernet
               # (Hardware Port: Thunderbolt Ethernet, Device: en1)
 
               # multiline, should match "Thunderbolt Ethernet", "en1"
               devicearry = i.match(/\([0-9]+\) (.+)\n.*Device: (.+)\)/m)
-              devmap[:interface] = devicearry[2]
-              devmap[:service] = devicearry[1]
-              devlist << devmap
+              service = devicearry[1]
+              interface = devicearry[2]
+
+              # Should map interface to service { "en1" => "Thunderbolt Ethernet" }
+              interface_map[interface] = service
             end
           end
-          File.delete(tmpints)
+          File.delete(tmp_ints)
 
-          networks.each do |network|
-            service_name = devlist[network[:interface]][:service]
-            if network[:type].to_sym == :static
-              command = "networksetup -setmanual \"#{service_name}\" #{network[:ip]} #{network[:netmask]}"
-            elsif network[:type].to_sym == :dhcp
-              command = "networksetup -setdhcp \"#{service_name}\""
+          mac_service_map = {}
+          macs = ::IO.read(tmp_hw)
+          macs.split(/\n\n/m).each do |i|
+            if i.match(/Hardware/) && i.match(/Ethernet/)
+              # Ethernet, should be 3 lines,
+              # Hardware Port: Thunderbolt 1
+              # Device: en1
+              # Ethernet Address: a1:b2:c3:d4:e5:f6
+
+              # multiline, should match "en1", "00:c1:00:a1:b2:c3"
+              devicearry = i.match(/Device: (.+)\nEthernet Address: (.+)/m)
+              interface = devicearry[1]
+              naked_mac = devicearry[2].gsub(':','').upcase
+
+              # Skip hardware ports without MAC (bridges, bluetooth, etc.)
+              next if naked_mac == "N/A"
+
+              if !interface_map[interface]
+                @@logger.warn("Could not find network service for interface #{interface}")
+                next
+              end
+
+              # Should map MAC to service, { "00C100A1B2C3" => "Thunderbolt Ethernet" }
+              mac_service_map[naked_mac] = interface_map[interface]
             end
-
-            machine.communicate.sudo(command)
           end
+          File.delete(tmp_hw)
+
+          mac_service_map
         end
       end
     end

From f930fa94af0b339b6f4498844a0ba429703074e7 Mon Sep 17 00:00:00 2001
From: Mikhail Zholobov <legal90@gmail.com>
Date: Fri, 9 Oct 2015 14:56:18 +0300
Subject: [PATCH 066/354] Move "cant_read_mac_addresses" error to the global
 space

Now it is used not only by Windows, but by Darwin guests as well.
---
 lib/vagrant/errors.rb                            | 4 ++++
 plugins/guests/darwin/cap/configure_networks.rb  | 2 +-
 plugins/guests/windows/cap/configure_networks.rb | 2 +-
 plugins/guests/windows/errors.rb                 | 4 ----
 templates/locales/en.yml                         | 8 ++++++++
 templates/locales/guest_windows.yml              | 8 --------
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/vagrant/errors.rb b/lib/vagrant/errors.rb
index 906b8d9bc..82f8a5e24 100644
--- a/lib/vagrant/errors.rb
+++ b/lib/vagrant/errors.rb
@@ -248,6 +248,10 @@ module Vagrant
       error_key(:bundler_error)
     end
 
+    class CantReadMACAddresses < VagrantError
+      error_key(:cant_read_mac_addresses)
+    end
+
     class CapabilityHostExplicitNotDetected < VagrantError
       error_key(:capability_host_explicit_not_detected)
     end
diff --git a/plugins/guests/darwin/cap/configure_networks.rb b/plugins/guests/darwin/cap/configure_networks.rb
index 1f43acd6a..1be71c82f 100644
--- a/plugins/guests/darwin/cap/configure_networks.rb
+++ b/plugins/guests/darwin/cap/configure_networks.rb
@@ -12,7 +12,7 @@ module VagrantPlugins
 
         def self.configure_networks(machine, networks)
           if !machine.provider.capability?(:nic_mac_addresses)
-            raise Errors::CantReadMACAddresses,
+            raise Vagrant::Errors::CantReadMACAddresses,
                   provider: machine.provider_name.to_s
           end
 
diff --git a/plugins/guests/windows/cap/configure_networks.rb b/plugins/guests/windows/cap/configure_networks.rb
index 8e766a319..a4f4685d9 100644
--- a/plugins/guests/windows/cap/configure_networks.rb
+++ b/plugins/guests/windows/cap/configure_networks.rb
@@ -53,7 +53,7 @@ module VagrantPlugins
 
         def self.create_vm_interface_map(machine, guest_network)
           if !machine.provider.capability?(:nic_mac_addresses)
-            raise Errors::CantReadMACAddresses,
+            raise Vagrant::Errors::CantReadMACAddresses,
               provider: machine.provider_name.to_s
           end
 
diff --git a/plugins/guests/windows/errors.rb b/plugins/guests/windows/errors.rb
index d5be14ce6..e76753646 100644
--- a/plugins/guests/windows/errors.rb
+++ b/plugins/guests/windows/errors.rb
@@ -6,10 +6,6 @@ module VagrantPlugins
         error_namespace("vagrant_windows.errors")
       end
 
-      class CantReadMACAddresses < WindowsError
-        error_key(:cant_read_mac_addresses)
-      end
-
       class NetworkWinRMRequired < WindowsError
         error_key(:network_winrm_required)
       end
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 9e8c680aa..94f47371d 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -606,6 +606,14 @@ en:
         issues. The error from Bundler is:
 
         %{message}
+      cant_read_mac_addresses: |-
+        The provider you are using  ('%{provider}') doesn't support the
+        "nic_mac_addresses" provider capability which is required
+        for advanced networking to work with this guest OS. Please inform
+        the author of the provider to add this feature.
+
+        Until then, you must remove any networking configurations other
+        than forwarded ports from your Vagrantfile for Vagrant to continue.
       capability_host_explicit_not_detected: |-
         The explicit capability host specified of '%{value}' could not be
         found.
diff --git a/templates/locales/guest_windows.yml b/templates/locales/guest_windows.yml
index a648f5a09..f9a3bf997 100644
--- a/templates/locales/guest_windows.yml
+++ b/templates/locales/guest_windows.yml
@@ -1,14 +1,6 @@
 en:
   vagrant_windows:
     errors:
-      cant_read_mac_addresses: |-
-        The provider being used to start Windows ('%{provider}')
-        doesn't support the "nic_mac_addresses" capability which is required
-        for advanced networking to work with Windows guests. Please inform
-        the author of the provider to add this feature.
-
-        Until then, you must remove any networking configurations other
-        than forwarded ports from your Vagrantfile for Vagrant to continue.
       network_winrm_required: |-
         Configuring networks on Windows requires the communicator to be
         set to WinRM. To do this, add the following to your Vagrantfile:

From 99985449953d7c21fc2c4f6a4bb12f5de0f0128d Mon Sep 17 00:00:00 2001
From: Johannes Graf <graf@synyx.de>
Date: Sat, 10 Oct 2015 20:48:31 +0200
Subject: [PATCH 067/354] Fix for #6151 / provisioner puppet_server with Puppet
 Collection 1

puppet_server provisioner fails with Puppet Collection 1 with the
following error:

```bash
==> default: Running provisioner: puppet_server...
The `puppet` binary appears not to be in the PATH of the guest. This
could be because the PATH is not properly setup or perhaps Puppet is not
installed on this guest. Puppet provisioning can not continue without
Puppet properly installed.
```
---
 .../provisioners/puppet/config/puppet_server.rb   |  6 ++++++
 .../puppet/provisioner/puppet_server.rb           | 15 +++++++++++++--
 .../source/v2/provisioning/puppet_agent.html.md   |  2 ++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/plugins/provisioners/puppet/config/puppet_server.rb b/plugins/provisioners/puppet/config/puppet_server.rb
index 9c53672d5..5cab589b6 100644
--- a/plugins/provisioners/puppet/config/puppet_server.rb
+++ b/plugins/provisioners/puppet/config/puppet_server.rb
@@ -2,6 +2,10 @@ module VagrantPlugins
   module Puppet
     module Config
       class PuppetServer < Vagrant.plugin("2", :config)
+        # The path to Puppet's bin/ directory.
+        # @return [String]
+        attr_accessor :binary_path
+
         attr_accessor :client_cert_path
         attr_accessor :client_private_key_path
         attr_accessor :facter
@@ -12,6 +16,7 @@ module VagrantPlugins
         def initialize
           super
 
+          @binary_path             = UNSET_VALUE
           @client_cert_path        = UNSET_VALUE
           @client_private_key_path = UNSET_VALUE
           @facter                  = {}
@@ -29,6 +34,7 @@ module VagrantPlugins
         def finalize!
           super
 
+          @binary_path      = nil if @binary_path == UNSET_VALUE
           @client_cert_path = nil if @client_cert_path == UNSET_VALUE
           @client_private_key_path = nil if @client_private_key_path == UNSET_VALUE
           @puppet_node   = nil if @puppet_node == UNSET_VALUE
diff --git a/plugins/provisioners/puppet/provisioner/puppet_server.rb b/plugins/provisioners/puppet/provisioner/puppet_server.rb
index 9c9e9e6b7..29c1c23dc 100644
--- a/plugins/provisioners/puppet/provisioner/puppet_server.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet_server.rb
@@ -17,8 +17,14 @@ module VagrantPlugins
         end
 
         def verify_binary(binary)
+          if @config.binary_path
+            test_cmd = "test -x #{@config.binary_path}/#{binary}"
+          else
+            test_cmd = "which #{binary}"
+          end
+
           @machine.communicate.sudo(
-            "which #{binary}",
+            test_cmd,
             error_class: PuppetServerError,
             error_key: :not_detected,
             binary: binary)
@@ -83,8 +89,13 @@ module VagrantPlugins
             facter = "#{facts.join(" ")} "
           end
 
+
+          puppet_bin = "puppet"
+          if @config.binary_path
+            puppet_bin = File.join(@config.binary_path, puppet_bin)
+          end
           options = options.join(" ")
-          command = "#{facter}puppet agent --onetime --no-daemonize #{options} " +
+          command = "#{facter} #{puppet_bin} agent --onetime --no-daemonize #{options} " +
             "--server #{config.puppet_server} --detailed-exitcodes || [ $? -eq 2 ]"
 
           @machine.ui.info I18n.t("vagrant.provisioners.puppet_server.running_puppetd")
diff --git a/website/docs/source/v2/provisioning/puppet_agent.html.md b/website/docs/source/v2/provisioning/puppet_agent.html.md
index 14d2b8a7c..26f43cf2a 100644
--- a/website/docs/source/v2/provisioning/puppet_agent.html.md
+++ b/website/docs/source/v2/provisioning/puppet_agent.html.md
@@ -26,6 +26,8 @@ the set of modules and manifests from there.
 The `puppet_server` provisioner takes various options. None are strictly
 required. They are listed below:
 
+* `binary_path` (string) - Path on the guest to Puppet's `bin/` directory.
+
 * `client_cert_path` (string) - Path to the client certificate for the
   node on your disk. This defaults to nothing, in which case a client
   cert won't be uploaded.

From 8e879905996eb6e2f9bb75d0d16b892f2f405a12 Mon Sep 17 00:00:00 2001
From: Marc Siegfriedt <marc@techaccelerator.com>
Date: Fri, 21 Aug 2015 13:37:10 -0700
Subject: [PATCH 068/354] add the option to make elevated interactive scripts

---
 plugins/communicators/winrm/communicator.rb   |  7 ++-
 .../winrm/scripts/elevated_shell.ps1.erb      |  8 ++--
 plugins/communicators/winrm/shell.rb          |  1 +
 plugins/provisioners/shell/config.rb          | 43 +++++++++++--------
 plugins/provisioners/shell/provisioner.rb     |  2 +-
 templates/locales/en.yml                      |  1 +
 .../docs/source/v2/provisioning/shell.html.md | 10 ++++-
 7 files changed, 45 insertions(+), 27 deletions(-)
 mode change 100644 => 100755 plugins/communicators/winrm/communicator.rb
 mode change 100644 => 100755 plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
 mode change 100644 => 100755 plugins/communicators/winrm/shell.rb
 mode change 100644 => 100755 plugins/provisioners/shell/config.rb
 mode change 100644 => 100755 plugins/provisioners/shell/provisioner.rb
 mode change 100644 => 100755 templates/locales/en.yml
 mode change 100644 => 100755 website/docs/source/v2/provisioning/shell.html.md

diff --git a/plugins/communicators/winrm/communicator.rb b/plugins/communicators/winrm/communicator.rb
old mode 100644
new mode 100755
index b14b28efa..d4d14e064
--- a/plugins/communicators/winrm/communicator.rb
+++ b/plugins/communicators/winrm/communicator.rb
@@ -136,10 +136,11 @@ module VagrantPlugins
           error_key:   nil, # use the error_class message key
           good_exit:   0,
           shell:       :powershell,
+          interactive: false,
         }.merge(opts || {})
 
         opts[:good_exit] = Array(opts[:good_exit])
-        command = wrap_in_scheduled_task(command) if opts[:elevated]
+        command = wrap_in_scheduled_task(command, opts[:interactive]) if opts[:elevated]
         output = shell.send(opts[:shell], command, &block)
         execution_output(output, opts)
       end
@@ -195,7 +196,9 @@ module VagrantPlugins
       # @return The wrapper command to execute
       def wrap_in_scheduled_task(command)
         path = File.expand_path("../scripts/elevated_shell.ps1", __FILE__)
-        script = Vagrant::Util::TemplateRenderer.render(path)
+        script = Vagrant::Util::TemplateRenderer.render(path, options: {
+          interactive: interactive,
+        })
         guest_script_path = "c:/tmp/vagrant-elevated-shell.ps1"
         file = Tempfile.new(["vagrant-elevated-shell", "ps1"])
         begin
diff --git a/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb b/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
old mode 100644
new mode 100755
index 17767e436..778dcb0cd
--- a/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
+++ b/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
@@ -12,8 +12,8 @@ $task_xml = @'
 <Task version="1.2" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
   <Principals>
     <Principal id="Author">
-      <UserId>{username}</UserId>
-      <LogonType>Password</LogonType>
+      <UserId>{user}</UserId>
+      <LogonType><%= options[:interactive] ? 'InteractiveTokenOrPassword' : 'Password' %></LogonType>
       <RunLevel>HighestAvailable</RunLevel>
     </Principal>
   </Principals>
@@ -55,7 +55,7 @@ $schedule.Connect()
 $task = $schedule.NewTask($null)
 $task.XmlText = $task_xml
 $folder = $schedule.GetFolder("\")
-$folder.RegisterTaskDefinition($task_name, $task, 6, $username, $password, 1, $null) | Out-Null
+$folder.RegisterTaskDefinition($task_name, $task, 6, $user, $password, <%= options[:interactive] ? 3 : 1 %>, $null) | Out-Null
 
 $registered_task = $folder.GetTask("\$task_name")
 $registered_task.Run($null) | Out-Null
@@ -71,7 +71,7 @@ function SlurpOutput($out_file, $cur_line) {
   if (Test-Path $out_file) {
     get-content $out_file | select -skip $cur_line | ForEach {
       $cur_line += 1
-      Write-Host "$_" 
+      Write-Host "$_"
     }
   }
   return $cur_line
diff --git a/plugins/communicators/winrm/shell.rb b/plugins/communicators/winrm/shell.rb
old mode 100644
new mode 100755
index 9b0f4e302..1d277829a
--- a/plugins/communicators/winrm/shell.rb
+++ b/plugins/communicators/winrm/shell.rb
@@ -23,6 +23,7 @@ module VagrantPlugins
         HTTPClient::KeepAliveDisconnected,
         WinRM::WinRMHTTPTransportError,
         WinRM::WinRMAuthorizationError,
+        WinRM::WinRMWSManFault,
         Errno::EACCES,
         Errno::EADDRINUSE,
         Errno::ECONNREFUSED,
diff --git a/plugins/provisioners/shell/config.rb b/plugins/provisioners/shell/config.rb
old mode 100644
new mode 100755
index 2f4957214..19d5180a9
--- a/plugins/provisioners/shell/config.rb
+++ b/plugins/provisioners/shell/config.rb
@@ -12,29 +12,32 @@ module VagrantPlugins
       attr_accessor :keep_color
       attr_accessor :name
       attr_accessor :powershell_args
+      attr_accessor :elevated_interactive
 
       def initialize
-        @args        = UNSET_VALUE
-        @inline      = UNSET_VALUE
-        @path        = UNSET_VALUE
-        @upload_path = UNSET_VALUE
-        @privileged  = UNSET_VALUE
-        @binary      = UNSET_VALUE
-        @keep_color  = UNSET_VALUE
-        @name        = UNSET_VALUE
-        @powershell_args  = UNSET_VALUE
+        @args                  = UNSET_VALUE
+        @inline                = UNSET_VALUE
+        @path                  = UNSET_VALUE
+        @upload_path           = UNSET_VALUE
+        @privileged            = UNSET_VALUE
+        @binary                = UNSET_VALUE
+        @keep_color            = UNSET_VALUE
+        @name                  = UNSET_VALUE
+        @powershell_args       = UNSET_VALUE
+        @elevated_interactive  = UNSET_VALUE
       end
 
       def finalize!
-        @args        = nil if @args == UNSET_VALUE
-        @inline      = nil if @inline == UNSET_VALUE
-        @path        = nil if @path == UNSET_VALUE
-        @upload_path = "/tmp/vagrant-shell" if @upload_path == UNSET_VALUE
-        @privileged  = true if @privileged == UNSET_VALUE
-        @binary      = false if @binary == UNSET_VALUE
-        @keep_color  = false if @keep_color == UNSET_VALUE
-        @name        = nil if @name == UNSET_VALUE
-        @powershell_args  = "-ExecutionPolicy Bypass" if @powershell_args == UNSET_VALUE
+        @args                 = nil if @args == UNSET_VALUE
+        @inline               = nil if @inline == UNSET_VALUE
+        @path                 = nil if @path == UNSET_VALUE
+        @upload_path          = "/tmp/vagrant-shell" if @upload_path == UNSET_VALUE
+        @privileged           = true if @privileged == UNSET_VALUE
+        @binary               = false if @binary == UNSET_VALUE
+        @keep_color           = false if @keep_color == UNSET_VALUE
+        @name                 = nil if @name == UNSET_VALUE
+        @powershell_args      = "-ExecutionPolicy Bypass" if @powershell_args == UNSET_VALUE
+        @elevated_interactive = false if @elevated_interactive == UNSET_VALUE
 
         if @args && args_valid?
           @args = @args.is_a?(Array) ? @args.map { |a| a.to_s } : @args.to_s
@@ -78,6 +81,10 @@ module VagrantPlugins
           errors << I18n.t("vagrant.provisioners.shell.args_bad_type")
         end
 
+        if @elevated_interactive == true && @privileged == false
+          errors << I18n.t("vagrant.provisioners.shell.interactive_not_elevated")
+        end
+
         { "shell provisioner" => errors }
       end
 
diff --git a/plugins/provisioners/shell/provisioner.rb b/plugins/provisioners/shell/provisioner.rb
old mode 100644
new mode 100755
index 1b89d1f29..1abfc4889
--- a/plugins/provisioners/shell/provisioner.rb
+++ b/plugins/provisioners/shell/provisioner.rb
@@ -137,7 +137,7 @@ module VagrantPlugins
             end
 
             # Execute it with sudo
-            comm.sudo(command, elevated: config.privileged) do |type, data|
+            comm.sudo(command, { elevated: config.privileged, interactive: config.elevated_interactive }) do |type, data|
               handle_comm(type, data)
             end
           end
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
old mode 100644
new mode 100755
index 9e8c680aa..56846292f
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1996,6 +1996,7 @@ en:
         running: "Running: %{script}"
         runningas: "Running: %{local} as %{remote}"
         upload_path_not_set: "`upload_path` must be set for the shell provisioner."
+        interactive_not_elevated: "To be interactive, it must also be privileged."
 
       ansible:
         no_playbook: "`playbook` must be set for the Ansible provisioner."
diff --git a/website/docs/source/v2/provisioning/shell.html.md b/website/docs/source/v2/provisioning/shell.html.md
old mode 100644
new mode 100755
index ef4119668..783ce948e
--- a/website/docs/source/v2/provisioning/shell.html.md
+++ b/website/docs/source/v2/provisioning/shell.html.md
@@ -45,8 +45,9 @@ The remainder of the available options are optional:
   defaults to "true".
 
 * `privileged` (boolean) - Specifies whether to execute the shell script
-  as a privileged user or not (`sudo`). By default this is "true". This has
-  no effect for Windows guests.
+  as a privileged user or not (`sudo`). By default this is "true". Windows
+  guests use a scheduled task to run as a true administrator without the
+  WinRM limitations.
 
 * `upload_path` (string) - Is the remote path where the shell script will
   be uploaded to. The script is uploaded as the SSH user over SCP, so this
@@ -65,6 +66,11 @@ The remainder of the available options are optional:
 * `powershell_args` (string) - Extra arguments to pass to `PowerShell`
   if you're provisioning with PowerShell on Windows.
 
+* `elevated_interactive` (boolean) - Run an elevated script in interactive mode
+  on Windows. By default this is "false". Must also be `privileged`. Be sure to
+  enable auto-login for Windows as the user must be logged in for interactive
+  mode to work.
+
 <a name="inline-scripts"></a>
 ## Inline Scripts
 

From 9d87be51daa69abea4cc82457a96dfdb9b5bfd92 Mon Sep 17 00:00:00 2001
From: Dan Dunckel <dldunckel@gmail.com>
Date: Mon, 12 Oct 2015 17:55:48 -0700
Subject: [PATCH 069/354] Small refactor on conditional check and add tests

---
 plugins/provisioners/shell/config.rb                |  2 +-
 .../communicators/winrm/communicator_test.rb        |  9 +++++++++
 test/unit/plugins/provisioners/shell/config_test.rb | 13 +++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/plugins/provisioners/shell/config.rb b/plugins/provisioners/shell/config.rb
index 19d5180a9..aaadb8081 100755
--- a/plugins/provisioners/shell/config.rb
+++ b/plugins/provisioners/shell/config.rb
@@ -81,7 +81,7 @@ module VagrantPlugins
           errors << I18n.t("vagrant.provisioners.shell.args_bad_type")
         end
 
-        if @elevated_interactive == true && @privileged == false
+        if elevated_interactive && !privileged
           errors << I18n.t("vagrant.provisioners.shell.interactive_not_elevated")
         end
 
diff --git a/test/unit/plugins/communicators/winrm/communicator_test.rb b/test/unit/plugins/communicators/winrm/communicator_test.rb
index e98f646b3..829170bd6 100644
--- a/test/unit/plugins/communicators/winrm/communicator_test.rb
+++ b/test/unit/plugins/communicators/winrm/communicator_test.rb
@@ -93,6 +93,15 @@ describe VagrantPlugins::CommunicatorWinRM::Communicator do
       expect(subject.execute("dir", { elevated: true })).to eq(0)
     end
 
+    it "wraps command in elevated and interactive shell script when elevated and interactive are true" do
+      expect(shell).to receive(:upload).with(kind_of(String), "c:/tmp/vagrant-elevated-shell.ps1")
+      expect(shell).to receive(:powershell) do |cmd|
+        expect(cmd).to eq("powershell -executionpolicy bypass -file \"c:/tmp/vagrant-elevated-shell.ps1\" " +
+          "-username \"vagrant\" -password \"password\" -encoded_command \"ZABpAHIAOwAgAGUAeABpAHQAIAAkAEwAQQBTAFQARQBYAEkAVABDAE8ARABFAA==\"")
+      end.and_return({ exitcode: 0 })
+      expect(subject.execute("dir", { elevated: true, interactive: true })).to eq(0)
+    end
+
     it "can use cmd shell" do
       expect(shell).to receive(:cmd).with(kind_of(String)).and_return({ exitcode: 0 })
       expect(subject.execute("dir", { shell: :cmd })).to eq(0)
diff --git a/test/unit/plugins/provisioners/shell/config_test.rb b/test/unit/plugins/provisioners/shell/config_test.rb
index 946b4c2a8..582740162 100644
--- a/test/unit/plugins/provisioners/shell/config_test.rb
+++ b/test/unit/plugins/provisioners/shell/config_test.rb
@@ -85,6 +85,19 @@ describe "VagrantPlugins::Shell::Config" do
         I18n.t("vagrant.provisioners.shell.args_bad_type")
       ])
     end
+
+    it "returns an error if elevated_interactive is true but privileged is false" do
+      subject.path = file_that_exists
+      subject.elevated_interactive = true
+      subject.privileged = false
+      subject.finalize!
+
+      result = subject.validate(machine)
+
+      expect(result["shell provisioner"]).to eq([
+        I18n.t("vagrant.provisioners.shell.interactive_not_elevated")
+      ])
+    end
   end
 
   describe 'finalize!' do

From d859a3b75207f75f31165aacf0ec0dc137fae5b1 Mon Sep 17 00:00:00 2001
From: Dan Dunckel <dldunckel@gmail.com>
Date: Thu, 15 Oct 2015 12:36:19 -0700
Subject: [PATCH 070/354] Somehow I missed this param while resolving conflicts

---
 plugins/communicators/winrm/communicator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/communicators/winrm/communicator.rb b/plugins/communicators/winrm/communicator.rb
index d4d14e064..ade021aad 100755
--- a/plugins/communicators/winrm/communicator.rb
+++ b/plugins/communicators/winrm/communicator.rb
@@ -194,7 +194,7 @@ module VagrantPlugins
       # in place.
       #
       # @return The wrapper command to execute
-      def wrap_in_scheduled_task(command)
+      def wrap_in_scheduled_task(command, interactive)
         path = File.expand_path("../scripts/elevated_shell.ps1", __FILE__)
         script = Vagrant::Util::TemplateRenderer.render(path, options: {
           interactive: interactive,

From aec65b5d66f48fa0036a5d1abe13557fbb1a0700 Mon Sep 17 00:00:00 2001
From: Dan Dunckel <dldunckel@gmail.com>
Date: Thu, 15 Oct 2015 12:41:08 -0700
Subject: [PATCH 071/354] Fix user to username that was lost in merge conflict
 resolution

---
 plugins/communicators/winrm/scripts/elevated_shell.ps1.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb b/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
index 778dcb0cd..d98bc7554 100755
--- a/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
+++ b/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
@@ -12,7 +12,7 @@ $task_xml = @'
 <Task version="1.2" xmlns="http://schemas.microsoft.com/windows/2004/02/mit/task">
   <Principals>
     <Principal id="Author">
-      <UserId>{user}</UserId>
+      <UserId>{username}</UserId>
       <LogonType><%= options[:interactive] ? 'InteractiveTokenOrPassword' : 'Password' %></LogonType>
       <RunLevel>HighestAvailable</RunLevel>
     </Principal>
@@ -55,7 +55,7 @@ $schedule.Connect()
 $task = $schedule.NewTask($null)
 $task.XmlText = $task_xml
 $folder = $schedule.GetFolder("\")
-$folder.RegisterTaskDefinition($task_name, $task, 6, $user, $password, <%= options[:interactive] ? 3 : 1 %>, $null) | Out-Null
+$folder.RegisterTaskDefinition($task_name, $task, 6, $username, $password, <%= options[:interactive] ? 3 : 1 %>, $null) | Out-Null
 
 $registered_task = $folder.GetTask("\$task_name")
 $registered_task.Run($null) | Out-Null

From 13be9731ab89a13fd3450bf6e56b66a7fa846bf1 Mon Sep 17 00:00:00 2001
From: Timotei Dolean <timotei@users.noreply.github.com>
Date: Fri, 16 Oct 2015 16:20:15 +0300
Subject: [PATCH 072/354] Remove back tick in puppet facts definitions #6403

Starting with vagrant 1.7.3
(commit 1152b4e1df97fb5f468491954932d4f0c09875b1) we don't
save the command to be executed in the file anymore, but we send
it as a parameter, thus the back tick makes things worse.
---
 plugins/provisioners/puppet/provisioner/puppet.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
index f1987dbd5..89d39000f 100644
--- a/plugins/provisioners/puppet/provisioner/puppet.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -212,7 +212,7 @@ module VagrantPlugins
 
             # If we're on Windows, we need to use the PowerShell style
             if windows?
-              facts.map! { |v| "`$env:#{v};" }
+              facts.map! { |v| "$env:#{v};" }
             end
 
             facter = "#{facts.join(" ")} "

From 61466c8e65b476b2d580a0eca06c7512026118c0 Mon Sep 17 00:00:00 2001
From: Markus Perl <markus@www-factory.de>
Date: Sat, 17 Oct 2015 23:00:39 +0200
Subject: [PATCH 073/354] #5186: Warning: Authentication failure. Retrying...
 after packaging box

---
 plugins/providers/virtualbox/provider.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/providers/virtualbox/provider.rb b/plugins/providers/virtualbox/provider.rb
index 969fb4718..b8b88d9ca 100644
--- a/plugins/providers/virtualbox/provider.rb
+++ b/plugins/providers/virtualbox/provider.rb
@@ -59,12 +59,20 @@ module VagrantPlugins
         # If the VM is not running that we can't possibly SSH into it
         return nil if state.id != :running
 
+        # If the insecure key was automatically replaced with a newly generated key pair,
+        # use this key to connect to the machine
+        private_key_path = nil
+        if @machine.data_dir.join("private_key").file?
+          private_key_path = @machine.data_dir.join("private_key")
+        end
+
         # Return what we know. The host is always "127.0.0.1" because
         # VirtualBox VMs are always local. The port we try to discover
         # by reading the forwarded ports.
         return {
           host: "127.0.0.1",
-          port: @driver.ssh_port(@machine.config.ssh.guest_port)
+          port: @driver.ssh_port(@machine.config.ssh.guest_port),
+          private_key_path: private_key_path
         }
       end
 

From a59dc04b6953c08c96d4f015be9b65599b6b7140 Mon Sep 17 00:00:00 2001
From: Joseph Frazier <joseph@onsip.com>
Date: Sat, 17 Oct 2015 19:42:58 -0400
Subject: [PATCH 074/354] handle_forwarded_port_collisions.rb: fix typo:
 "Reparied" -> "Repaired"

---
 lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb b/lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb
index b53ba35c2..cf6477915 100644
--- a/lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb
+++ b/lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb
@@ -128,7 +128,7 @@ module Vagrant
                   port_checker[repaired_port] ||
                   lease_check(repaired_port)
                 if in_use
-                  @logger.info("Reparied port also in use: #{repaired_port}. Trying another...")
+                  @logger.info("Repaired port also in use: #{repaired_port}. Trying another...")
                   next
                 end
 

From 8392752bee81fb481e0e342893e753776db5fe2e Mon Sep 17 00:00:00 2001
From: glamouracademy <yellowspiderlove@gmail.com>
Date: Tue, 27 Oct 2015 13:06:35 -0400
Subject: [PATCH 075/354] Add links for OS links in Readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a361da9b0..0584d273d 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ between Windows, Mac OS X, and Linux.
 For the quick-start, we'll bring up a development machine on
 [VirtualBox](http://www.virtualbox.org) because it is free and works
 on all major platforms. Vagrant can, however, work with almost any
-system such as OpenStack, VMware, Docker, etc.
+system such as [OpenStack] (https://www.openstack.org/), [VMware] (http://www.vmware.com/), [Docker] (https://docs.docker.com/), etc.
 
 First, make sure your development machine has
 [VirtualBox](http://www.virtualbox.org)

From 8e7a297fb51bb49686b59af9cfb78a8f94709c54 Mon Sep 17 00:00:00 2001
From: matthewcodes <matt@mattcodes.co.uk>
Date: Wed, 28 Oct 2015 16:39:19 +0000
Subject: [PATCH 076/354] Fix for interpolated strings being used for username
 and passwords, this fix was made in commit 1dd081d but was removed by
 1152b4e. This was causing passwords with $ in them to stop working as the
 dollar sign was getting stripped out

---
 plugins/communicators/winrm/communicator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/communicators/winrm/communicator.rb b/plugins/communicators/winrm/communicator.rb
index b14b28efa..0131678a5 100644
--- a/plugins/communicators/winrm/communicator.rb
+++ b/plugins/communicators/winrm/communicator.rb
@@ -214,7 +214,7 @@ module VagrantPlugins
           "#{command}; exit $LASTEXITCODE".encode('UTF-16LE', 'UTF-8'))
 
         "powershell -executionpolicy bypass -file \"#{guest_script_path}\" " +
-          "-username \"#{shell.username}\" -password \"#{shell.password}\" " +
+          "-username \'#{shell.username}\' -password \'#{shell.password}\' " +
           "-encoded_command \"#{wrapped_encoded_command}\""
       end
 

From cbb03a02d4b42e350ed92f73ced05f3046100ae8 Mon Sep 17 00:00:00 2001
From: matthewcodes <matt@mattcodes.co.uk>
Date: Wed, 28 Oct 2015 16:46:43 +0000
Subject: [PATCH 077/354] Updating tests to check for single quote

---
 test/unit/plugins/communicators/winrm/communicator_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/plugins/communicators/winrm/communicator_test.rb b/test/unit/plugins/communicators/winrm/communicator_test.rb
index e98f646b3..29c775463 100644
--- a/test/unit/plugins/communicators/winrm/communicator_test.rb
+++ b/test/unit/plugins/communicators/winrm/communicator_test.rb
@@ -88,7 +88,7 @@ describe VagrantPlugins::CommunicatorWinRM::Communicator do
       expect(shell).to receive(:upload).with(kind_of(String), "c:/tmp/vagrant-elevated-shell.ps1")
       expect(shell).to receive(:powershell) do |cmd|
         expect(cmd).to eq("powershell -executionpolicy bypass -file \"c:/tmp/vagrant-elevated-shell.ps1\" " +
-          "-username \"vagrant\" -password \"password\" -encoded_command \"ZABpAHIAOwAgAGUAeABpAHQAIAAkAEwAQQBTAFQARQBYAEkAVABDAE8ARABFAA==\"")
+          "-username \'vagrant\' -password \'password\' -encoded_command \"ZABpAHIAOwAgAGUAeABpAHQAIAAkAEwAQQBTAFQARQBYAEkAVABDAE8ARABFAA==\"")
       end.and_return({ exitcode: 0 })
       expect(subject.execute("dir", { elevated: true })).to eq(0)
     end

From dde94a3ce7bc6f89eabbad4bde2b6f8665a37c72 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Mon, 2 Nov 2015 09:03:15 +0100
Subject: [PATCH 078/354] provisioners/ansible: add force_remote_user option

The benefits of the following "breaking change" are the following:
- default behaviour naturally fits with most common usage (i.e. always
  connect with Vagrant SSH settings)
- the autogenerated inventory is more consistent by providing both the
  SSH username and private key.
- no longer needed to explain how to override Ansible `remote_user` parameters

Important: With the `force_remote_user` option, people still can fall
back to the former behavior (prior to Vagrant 1.8.0), which means that
Vagrant integration capabilities are still quite open and flexible.
---
 CHANGELOG.md                                  | 14 ++++
 plugins/provisioners/ansible/config.rb        |  5 +-
 plugins/provisioners/ansible/provisioner.rb   | 21 +++--
 .../provisioners/ansible/config_test.rb       |  5 ++
 .../provisioners/ansible/provisioner_test.rb  | 80 ++++++++++++++-----
 .../source/v2/provisioning/ansible.html.md    | 31 +------
 6 files changed, 105 insertions(+), 51 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f78eac8bc..602956e8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,8 +9,22 @@ FEATURES:
   - **IPv6 Private Networks**: Private networking now supports IPv6. This
     only works with VirtualBox and VMware at this point. [GH-6342]
 
+BREAKING CHANGES:
+
+  - the `ansible` provisioner now can override the effective ansible remote user
+    (i.e. `ansible_ssh_user` setting) to always correspond to the vagrant ssh
+    username. This change is enabled by default, but we expect this to affect
+    only a tiny number of people as it corresponds to the common usage.
+    If you however use different remote usernames in your Ansible plays, tasks,
+    or custom inventories, you can simply set the option `force_remote_user` to
+    false to make Vagrant behave the same as before.
+
+
 IMPROVEMENTS:
 
+  - provisioners/ansible: add new `force_remote_user` option to control whether
+    `ansible_ssh_user` parameter should be applied or not [GH-6348]
+
 BUG FIXES:
 
   - communicator/winrm: respect `boot_timeout` setting [GH-6229]
diff --git a/plugins/provisioners/ansible/config.rb b/plugins/provisioners/ansible/config.rb
index 784cf48f7..f3aa99deb 100644
--- a/plugins/provisioners/ansible/config.rb
+++ b/plugins/provisioners/ansible/config.rb
@@ -2,6 +2,7 @@ module VagrantPlugins
   module Ansible
     class Config < Vagrant.plugin("2", :config)
       attr_accessor :playbook
+      attr_accessor :force_remote_user
       attr_accessor :extra_vars
       attr_accessor :inventory_path
       attr_accessor :ask_sudo_pass
@@ -24,6 +25,7 @@ module VagrantPlugins
 
       def initialize
         @playbook            = UNSET_VALUE
+        @force_remote_user   = UNSET_VALUE
         @extra_vars          = UNSET_VALUE
         @inventory_path      = UNSET_VALUE
         @ask_sudo_pass       = UNSET_VALUE
@@ -44,6 +46,7 @@ module VagrantPlugins
 
       def finalize!
         @playbook            = nil if @playbook == UNSET_VALUE
+        @force_remote_user   = true if @force_remote_user != false
         @extra_vars          = nil if @extra_vars == UNSET_VALUE
         @inventory_path      = nil if @inventory_path == UNSET_VALUE
         @ask_sudo_pass       = false unless @ask_sudo_pass == true
@@ -56,7 +59,7 @@ module VagrantPlugins
         @tags                = nil if @tags == UNSET_VALUE
         @skip_tags           = nil if @skip_tags == UNSET_VALUE
         @start_at_task       = nil if @start_at_task == UNSET_VALUE
-        @groups              = {}  if @groups == UNSET_VALUE
+        @groups              = {} if @groups == UNSET_VALUE
         @host_key_checking   = false unless @host_key_checking == true
         @raw_arguments       = nil if @raw_arguments == UNSET_VALUE
         @raw_ssh_args        = nil if @raw_ssh_args == UNSET_VALUE
diff --git a/plugins/provisioners/ansible/provisioner.rb b/plugins/provisioners/ansible/provisioner.rb
index 6dd1313e0..296345b39 100644
--- a/plugins/provisioners/ansible/provisioner.rb
+++ b/plugins/provisioners/ansible/provisioner.rb
@@ -20,13 +20,10 @@ module VagrantPlugins
         # Ansible provisioner options
         #
 
-        # By default, connect with Vagrant SSH username
-        options = %W[--user=#{@ssh_info[:username]}]
-
         # Connect with native OpenSSH client
         # Other modes (e.g. paramiko) are not officially supported,
         # but can be enabled via raw_arguments option.
-        options << "--connection=ssh"
+        options = %W[--connection=ssh]
 
         # Increase the SSH connection timeout, as the Ansible default value (10 seconds)
         # is a bit demanding for some overloaded developer boxes. This is particularly
@@ -34,6 +31,16 @@ module VagrantPlugins
         # is not controlled during vagrant boot process.
         options << "--timeout=30"
 
+        if !config.force_remote_user
+          # Pass the vagrant ssh username as Ansible default remote user, because
+          # the ansible_ssh_user parameter won't be added to the auto-generated inventory.
+          options << "--user=#{@ssh_info[:username]}"
+        elsif config.inventory_path
+          # Using an extra variable is the only way to ensure that the Ansible remote user
+          # is overridden (as the ansible inventory is not under vagrant control)
+          options << "--extra-vars=ansible_ssh_user='#{@ssh_info[:username]}'"
+        end
+
         # By default we limit by the current machine, but
         # this can be overridden by the `limit` option.
         if config.limit
@@ -127,7 +134,11 @@ module VagrantPlugins
             m = @machine.env.machine(*am)
             m_ssh_info = m.ssh_info
             if !m_ssh_info.nil?
-              inventory += "#{m.name} ansible_ssh_host=#{m_ssh_info[:host]} ansible_ssh_port=#{m_ssh_info[:port]} ansible_ssh_private_key_file='#{m_ssh_info[:private_key_path][0]}'\n"
+              forced_ssh_user = ""
+              if config.force_remote_user
+                forced_ssh_user = "ansible_ssh_user='#{m_ssh_info[:username]}' "
+              end
+              inventory += "#{m.name} ansible_ssh_host=#{m_ssh_info[:host]} ansible_ssh_port=#{m_ssh_info[:port]} #{forced_ssh_user}ansible_ssh_private_key_file='#{m_ssh_info[:private_key_path][0]}'\n"
               inventory_machines[m.name] = m
             else
               @logger.error("Auto-generated inventory: Impossible to get SSH information for machine '#{m.name} (#{m.provider_name})'. This machine should be recreated.")
diff --git a/test/unit/plugins/provisioners/ansible/config_test.rb b/test/unit/plugins/provisioners/ansible/config_test.rb
index ab1b6dca0..fdfc54c0a 100644
--- a/test/unit/plugins/provisioners/ansible/config_test.rb
+++ b/test/unit/plugins/provisioners/ansible/config_test.rb
@@ -18,6 +18,7 @@ describe VagrantPlugins::Ansible::Config do
     supported_options = %w( ask_sudo_pass
                             ask_vault_pass
                             extra_vars
+                            force_remote_user
                             groups
                             host_key_checking
                             inventory_path
@@ -41,6 +42,7 @@ describe VagrantPlugins::Ansible::Config do
 
     expect(subject.playbook).to be_nil
     expect(subject.extra_vars).to be_nil
+    expect(subject.force_remote_user).to be_true
     expect(subject.ask_sudo_pass).to be_false
     expect(subject.ask_vault_pass).to be_false
     expect(subject.vault_password_file).to be_nil
@@ -57,6 +59,9 @@ describe VagrantPlugins::Ansible::Config do
     expect(subject.raw_ssh_args).to be_nil
   end
 
+  describe "force_remote_user option" do
+    it_behaves_like "any VagrantConfigProvisioner strict boolean attribute", :force_remote_user, true
+  end
   describe "host_key_checking option" do
     it_behaves_like "any VagrantConfigProvisioner strict boolean attribute", :host_key_checking, false
   end
diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index 24863adc1..2dce27611 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -67,15 +67,17 @@ VF
   #
 
   def self.it_should_set_arguments_and_environment_variables(
-    expected_args_count = 6, expected_vars_count = 4, expected_host_key_checking = false, expected_transport_mode = "ssh")
+    expected_args_count = 5,
+    expected_vars_count = 4,
+    expected_host_key_checking = false,
+    expected_transport_mode = "ssh")
 
     it "sets implicit arguments in a specific order" do
       expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
 
         expect(args[0]).to eq("ansible-playbook")
-        expect(args[1]).to eq("--user=#{machine.ssh_info[:username]}")
-        expect(args[2]).to eq("--connection=ssh")
-        expect(args[3]).to eq("--timeout=30")
+        expect(args[1]).to eq("--connection=ssh")
+        expect(args[2]).to eq("--timeout=30")
 
         inventory_count = args.count { |x| x =~ /^--inventory-file=.+$/ }
         expect(inventory_count).to be > 0
@@ -162,13 +164,17 @@ VF
     end
   end
 
-  def self.it_should_create_and_use_generated_inventory
+  def self.it_should_create_and_use_generated_inventory(with_ssh_user = true)
     it "generates an inventory with all active machines" do
       expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
         expect(config.inventory_path).to be_nil
         expect(File.exists?(generated_inventory_file)).to be_true
         inventory_content = File.read(generated_inventory_file)
-        expect(inventory_content).to include("#{machine.name} ansible_ssh_host=#{machine.ssh_info[:host]} ansible_ssh_port=#{machine.ssh_info[:port]} ansible_ssh_private_key_file='#{machine.ssh_info[:private_key_path][0]}'\n")
+        if with_ssh_user
+          expect(inventory_content).to include("#{machine.name} ansible_ssh_host=#{machine.ssh_info[:host]} ansible_ssh_port=#{machine.ssh_info[:port]} ansible_ssh_user='#{machine.ssh_info[:username]}' ansible_ssh_private_key_file='#{machine.ssh_info[:private_key_path][0]}'\n")
+        else
+          expect(inventory_content).to include("#{machine.name} ansible_ssh_host=#{machine.ssh_info[:host]} ansible_ssh_port=#{machine.ssh_info[:port]} ansible_ssh_private_key_file='#{machine.ssh_info[:private_key_path][0]}'\n")
+        end
         expect(inventory_content).to include("# MISSING: '#{iso_env.machine_names[1]}' machine was probably removed without using Vagrant. This machine should be recreated.\n")
       }
     end
@@ -276,7 +282,7 @@ VF
         config.host_key_checking = true
       end
 
-      it_should_set_arguments_and_environment_variables 6, 4, true
+      it_should_set_arguments_and_environment_variables 5, 4, true
     end
 
     describe "with boolean (flag) options disabled" do
@@ -288,7 +294,7 @@ VF
         config.sudo_user = 'root'
       end
 
-      it_should_set_arguments_and_environment_variables 7
+      it_should_set_arguments_and_environment_variables 6
       it_should_set_optional_arguments({ "sudo_user" => "--sudo-user=root" })
 
       it "it does not set boolean flag when corresponding option is set to false" do
@@ -303,6 +309,7 @@ VF
     describe "with raw_arguments option" do
       before do
         config.sudo = false
+        config.force_remote_user = false
         config.skip_tags = %w(foo bar)
         config.limit = "all"
         config.raw_arguments = ["--connection=paramiko",
@@ -352,12 +359,29 @@ VF
       it_should_set_arguments_and_environment_variables
     end
 
+    context "with force_remote_user option disabled" do
+      before do
+        config.force_remote_user = false
+      end
+
+      it_should_create_and_use_generated_inventory false # i.e. without setting ansible_ssh_user in inventory
+
+      it_should_set_arguments_and_environment_variables 6
+
+      it "uses a --user argument to set a default remote user" do
+        expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
+          expect(args).not_to include("--extra-vars=ansible_ssh_user='#{machine.ssh_info[:username]}'")
+          expect(args).to include("--user=#{machine.ssh_info[:username]}")
+        }
+      end
+    end
+
     describe "with inventory_path option" do
       before do
         config.inventory_path = existing_file
       end
 
-      it_should_set_arguments_and_environment_variables
+      it_should_set_arguments_and_environment_variables 6
 
       it "does not generate the inventory and uses given inventory path instead" do
         expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
@@ -366,6 +390,26 @@ VF
           expect(File.exists?(generated_inventory_file)).to be_false
         }
       end
+
+      it "uses an --extra-vars argument to force ansible_ssh_user parameter" do
+        expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
+          expect(args).not_to include("--user=#{machine.ssh_info[:username]}")
+          expect(args).to include("--extra-vars=ansible_ssh_user='#{machine.ssh_info[:username]}'")
+        }
+      end
+
+      describe "with force_remote_user option disabled" do
+        before do
+          config.force_remote_user = false
+        end
+
+        it "uses a --user argument to set a default remote user" do
+          expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
+            expect(args).not_to include("--extra-vars=ansible_ssh_user='#{machine.ssh_info[:username]}'")
+            expect(args).to include("--user=#{machine.ssh_info[:username]}")
+          }
+        end
+      end
     end
 
     describe "with ask_vault_pass option" do
@@ -373,7 +417,7 @@ VF
         config.ask_vault_pass = true
       end
 
-      it_should_set_arguments_and_environment_variables 7
+      it_should_set_arguments_and_environment_variables 6
 
       it "should ask the vault password" do
         expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
@@ -387,7 +431,7 @@ VF
         config.vault_password_file = existing_file
       end
 
-      it_should_set_arguments_and_environment_variables 7
+      it_should_set_arguments_and_environment_variables 6
 
       it "uses the given vault password file" do
         expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
@@ -401,7 +445,7 @@ VF
         config.raw_ssh_args = ['-o ControlMaster=no', '-o ForwardAgent=no']
       end
 
-      it_should_set_arguments_and_environment_variables 6, 4
+      it_should_set_arguments_and_environment_variables
       it_should_explicitly_enable_ansible_ssh_control_persist_defaults
 
       it "passes custom SSH options via ANSIBLE_SSH_ARGS with the highest priority" do
@@ -435,7 +479,7 @@ VF
         ssh_info[:private_key_path] = ['/path/to/my/key', '/an/other/identity', '/yet/an/other/key']
       end
 
-      it_should_set_arguments_and_environment_variables 6, 4
+      it_should_set_arguments_and_environment_variables
       it_should_explicitly_enable_ansible_ssh_control_persist_defaults
 
       it "passes additional Identity Files via ANSIBLE_SSH_ARGS" do
@@ -452,7 +496,7 @@ VF
         ssh_info[:forward_agent] = true
       end
 
-      it_should_set_arguments_and_environment_variables 6, 4
+      it_should_set_arguments_and_environment_variables
       it_should_explicitly_enable_ansible_ssh_control_persist_defaults
 
       it "enables SSH-Forwarding via ANSIBLE_SSH_ARGS" do
@@ -468,12 +512,12 @@ VF
         config.verbose = 'v'
       end
 
-      it_should_set_arguments_and_environment_variables 7
+      it_should_set_arguments_and_environment_variables 6
       it_should_set_optional_arguments({ "verbose" => "-v" })
 
       it "shows the ansible-playbook command" do
         expect(machine.env.ui).to receive(:detail).with { |full_command|
-          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_FORCE_COLOR=true ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --user=testuser --connection=ssh --timeout=30 --limit='machine1' --inventory-file=#{generated_inventory_dir} -v playbook.yml")
+          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_FORCE_COLOR=true ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --connection=ssh --timeout=30 --limit='machine1' --inventory-file=#{generated_inventory_dir} -v playbook.yml")
         }
       end
     end
@@ -520,7 +564,7 @@ VF
         config.raw_ssh_args = ['-o ControlMaster=no']
       end
 
-      it_should_set_arguments_and_environment_variables 21, 4, true
+      it_should_set_arguments_and_environment_variables 20, 4, true
       it_should_explicitly_enable_ansible_ssh_control_persist_defaults
       it_should_set_optional_arguments({  "extra_vars"          => "--extra-vars=@#{File.expand_path(__FILE__)}",
                                           "sudo"                => "--sudo",
@@ -547,7 +591,7 @@ VF
 
       it "shows the ansible-playbook command, with additional quotes when required" do
         expect(machine.env.ui).to receive(:detail).with { |full_command|
-          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_HOST_KEY_CHECKING=true ANSIBLE_FORCE_COLOR=true ANSIBLE_SSH_ARGS='-o IdentitiesOnly=yes -o IdentityFile=/my/key1 -o IdentityFile=/my/key2 -o ForwardAgent=yes -o ControlMaster=no -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --user=testuser --connection=ssh --timeout=30 --limit='machine*:&vagrant:!that_one' --inventory-file=#{generated_inventory_dir} --extra-vars=@#{File.expand_path(__FILE__)} --sudo --sudo-user=deployer -vvv --ask-sudo-pass --ask-vault-pass --vault-password-file=#{File.expand_path(__FILE__)} --tags=db,www --skip-tags=foo,bar --start-at-task='an awesome task' --why-not --su-user=foot --ask-su-pass --limit='all' --private-key=./myself.key playbook.yml")
+          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_HOST_KEY_CHECKING=true ANSIBLE_FORCE_COLOR=true ANSIBLE_SSH_ARGS='-o IdentitiesOnly=yes -o IdentityFile=/my/key1 -o IdentityFile=/my/key2 -o ForwardAgent=yes -o ControlMaster=no -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --connection=ssh --timeout=30 --limit='machine*:&vagrant:!that_one' --inventory-file=#{generated_inventory_dir} --extra-vars=@#{File.expand_path(__FILE__)} --sudo --sudo-user=deployer -vvv --ask-sudo-pass --ask-vault-pass --vault-password-file=#{File.expand_path(__FILE__)} --tags=db,www --skip-tags=foo,bar --start-at-task='an awesome task' --why-not --su-user=foot --ask-su-pass --limit='all' --private-key=./myself.key playbook.yml")
         }
       end
     end
diff --git a/website/docs/source/v2/provisioning/ansible.html.md b/website/docs/source/v2/provisioning/ansible.html.md
index 381cf5bd1..719e893fe 100644
--- a/website/docs/source/v2/provisioning/ansible.html.md
+++ b/website/docs/source/v2/provisioning/ansible.html.md
@@ -61,8 +61,8 @@ Vagrant would generate an inventory file that might look like:
 ```
 # Generated by Vagrant
 
-machine1 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2200 ansible_ssh_private_key_file=/home/.../.vagrant/machines/machine1/virtualbox/private_key
-machine2 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2201 ansible_ssh_private_key_file=/home/.../.vagrant/machines/machine2/virtualbox/private_key
+machine1 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2200 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../'.vagrant/machines/machine1/virtualbox/private_key
+machine2 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2201 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../'.vagrant/machines/machine2/virtualbox/private_key
 
 [group1]
 machine1
@@ -80,6 +80,7 @@ group2
  * The generation of group variables blocks (e.g. `[group1:vars]`) are intentionally not supported, as it is [not recommended to store group variables in the main inventory file](http://docs.ansible.com/intro_inventory.html#splitting-out-host-and-group-specific-data). A good practice is to store these group (or host) variables in `YAML` files stored in `group_vars/` or `host_vars/` directories in the playbook (or inventory) directory.
  * Unmanaged machines and undefined groups are not added to the inventory, to avoid useless Ansible errors (e.g. *unreachable host* or *undefined child group*)
  * Prior to Vagrant 1.7.3, the `ansible_ssh_private_key_file` variable was not set in generated inventory, but passed as command line argument to `ansible-playbook` command.
+ * Prior to Vagrant 1.8.0, the `ansible_ssh_user` variable was not set in generated inventory, but passed as command line argument to `ansible-playbook` command. See also the `force_remote_user` option to enable the former behavior.
 
 For example, `machine3`, `group3` and `group1:vars` in the example below would not be added to the generated inventory file:
 
@@ -220,6 +221,7 @@ by the sudo command.
 * `ansible.raw_arguments` can be set to an array of strings corresponding to a list of `ansible-playbook` arguments (e.g. `['--check', '-M /my/modules']`). It is an *unsafe wildcard* that can be used to apply Ansible options that are not (yet) supported by this Vagrant provisioner. As of Vagrant 1.7, `raw_arguments` has the highest priority and its values can potentially override or break other Vagrant settings.
 * `ansible.raw_ssh_args` can be set to an array of strings corresponding to a list of OpenSSH client parameters (e.g. `['-o ControlMaster=no']`). It is an *unsafe wildcard* that can be used to pass additional SSH settings to Ansible via `ANSIBLE_SSH_ARGS` environment variable.
 * `ansible.host_key_checking` can be set to `true` which will enable host key checking. As of Vagrant 1.5, the default value is `false` and as of Vagrant 1.7 the user known host file (e.g. `~/.ssh/known_hosts`) is no longer read nor modified. In other words: by default, the Ansible provisioner behaves the same as Vagrant native commands (e.g `vagrant ssh`).
+* `ansible.force_remote_user` can be set to `false` which will enable the `remote_user` parameters of your Ansible plays or tasks. Otherwise, Vagrant will set the `ansible_ssh_user` setting in the generated inventory, or as an extra variable when a static inventory is used. In this case, all the Ansible `remote_user` parameters will be overridden by the value of `config.ssh.username` of the [Vagrant SSH Settings](/v2/vagrantfile/ssh_settings.html).
 
 ## Tips and Tricks
 
@@ -273,31 +275,6 @@ As `ansible-playbook` command looks for local `ansible.cfg` configuration file i
 
 Note that it is also possible to reference an Ansible configuration file via `ANSIBLE_CONFIG` environment variable, if you want to be flexible about the location of this file.
 
-### Why does the Ansible provisioner connect as the wrong user?
-
-It is good to know that the following Ansible settings always override the `config.ssh.username` option defined in [Vagrant SSH Settings](/v2/vagrantfile/ssh_settings.html):
-
-* `ansible_ssh_user` variable
-* `remote_user` (or `user`) play attribute
-* `remote_user` task attribute
-
-Be aware that copying snippets from the Ansible documentation might lead to this problem, as `root` is used as the remote user in many [examples](http://docs.ansible.com/playbooks_intro.html#hosts-and-users).
-
-Example of an SSH error (with `vvv` log level), where an undefined remote user `xyz` has replaced `vagrant`:
-
-```
-TASK: [my_role | do something] *****************
-<127.0.0.1> ESTABLISH CONNECTION FOR USER: xyz
-<127.0.0.1> EXEC ['ssh', '-tt', '-vvv', '-o', 'ControlMaster=auto',...
-fatal: [ansible-devbox] => SSH encountered an unknown error. We recommend you re-run the command using -vvvv, which will enable SSH debugging output to help diagnose the issue.
-```
-
-In a situation like the above, to override the `remote_user` specified in a play you can use the following line in your Vagrantfile `vm.provision` block:
-
-```
-ansible.extra_vars = { ansible_ssh_user: 'vagrant' }
-```
-
 ### Force Paramiko Connection Mode
 
 The Ansible provisioner is implemented with native OpenSSH support in mind, and there is no official support for [paramiko](https://github.com/paramiko/paramiko/) (A native Python SSHv2 protocol library).

From 84408c1682a9c5cb2915c2bc0f1a36510bfe3401 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Mon, 2 Nov 2015 20:34:14 -0500
Subject: [PATCH 079/354] Enable log_level and colorize for salt masterless

---
 plugins/provisioners/salt/provisioner.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/provisioners/salt/provisioner.rb b/plugins/provisioners/salt/provisioner.rb
index 72365776e..84bf17e7c 100644
--- a/plugins/provisioners/salt/provisioner.rb
+++ b/plugins/provisioners/salt/provisioner.rb
@@ -329,11 +329,10 @@ module VagrantPlugins
 
       def call_masterless
         @machine.env.ui.info "Calling state.highstate in local mode... (this may take a while)"
-        cmd = "salt-call state.highstate --local"
+        cmd = "salt-call state.highstate --local#{get_loglevel}#{get_colorize}#{get_pillar}"
         if @config.minion_id
           cmd += " --id #{@config.minion_id}"
         end
-        cmd += " -l debug#{get_pillar}"
         @machine.communicate.sudo(cmd) do |type, data|
           if @config.verbose
             @machine.env.ui.info(data)

From 879977832cb4161638eb3bcf125eb05c495da48a Mon Sep 17 00:00:00 2001
From: Eric Winkelmann <eric@nikelmwann.io>
Date: Mon, 2 Nov 2015 23:39:06 -0800
Subject: [PATCH 080/354] Prefer xfreerdp for RDP connections on Linux hosts.

Rather than only using rdesktop (which does not work properly with newer
versions of RDP), use xfreerdp if available and fall back to rdesktop if
not.
---
 plugins/hosts/linux/cap/rdp.rb | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/plugins/hosts/linux/cap/rdp.rb b/plugins/hosts/linux/cap/rdp.rb
index 7146ef890..61f231f7b 100644
--- a/plugins/hosts/linux/cap/rdp.rb
+++ b/plugins/hosts/linux/cap/rdp.rb
@@ -5,17 +5,35 @@ module VagrantPlugins
     module Cap
       class RDP
         def self.rdp_client(env, rdp_info)
-          if !Vagrant::Util::Which.which("rdesktop")
-            raise Vagrant::Errors::LinuxRDesktopNotFound
-          end
+          # Detect if an RDP client is available.
+          # Prefer xfreerdp as it supports newer versions of RDP.
+          rdp_client =
+            if Vagrant::Util::Which.which("xfreerdp")
+              "xfreerdp"
+            elsif Vagrant::Util::Which.which("rdesktop")
+              "rdesktop"
+            else
+              raise Vagrant::Errors::LinuxRDesktopNotFound
+            end
 
           args = []
-          args << "-u" << rdp_info[:username]
-          args << "-p" << rdp_info[:password] if rdp_info[:password]
-          args += rdp_info[:extra_args] if rdp_info[:extra_args]
-          args << "#{rdp_info[:host]}:#{rdp_info[:port]}"
 
-          Vagrant::Util::Subprocess.execute("rdesktop", *args)
+          # Build appropriate arguments for the RDP client.
+          case rdp_client
+          when "xfreerdp"
+            args << "/u:#{rdp_info[:username]}"
+            args << "/p:#{rdp_info[:password]}" if rdp_info[:password]
+            args << "/v:#{rdp_info[:host]}:#{rdp_info[:port]}"
+            args += rdp_info[:extra_args] if rdp_info[:extra_args]
+          when "rdesktop"
+            args << "-u" << rdp_info[:username]
+            args << "-p" << rdp_info[:password] if rdp_info[:password]
+            args += rdp_info[:extra_args] if rdp_info[:extra_args]
+            args << "#{rdp_info[:host]}:#{rdp_info[:port]}"
+          end
+
+          # Finally, run the client.
+          Vagrant::Util::Subprocess.execute(rdp_client, *args)
         end
       end
     end

From e687f81fce3ae12d8d89a6ca11811ca2c31b2c7a Mon Sep 17 00:00:00 2001
From: Eric Winkelmann <eric@nikelmwann.io>
Date: Mon, 2 Nov 2015 23:42:01 -0800
Subject: [PATCH 081/354] Re-word Linux RDP error to include `xfreerdp`.

Changed the name of the error LinuxRDesktopNotFound to
LinuxRDPClientNotFound and re-worded error text in
templates/locales/en.yml to include `xfreerdp` when listing supported
RDP clients.
---
 lib/vagrant/errors.rb          | 4 ++--
 plugins/hosts/linux/cap/rdp.rb | 2 +-
 templates/locales/en.yml       | 9 +++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/vagrant/errors.rb b/lib/vagrant/errors.rb
index 906b8d9bc..aee0f3472 100644
--- a/lib/vagrant/errors.rb
+++ b/lib/vagrant/errors.rb
@@ -408,8 +408,8 @@ module Vagrant
       error_key(:linux_nfs_mount_failed)
     end
 
-    class LinuxRDesktopNotFound < VagrantError
-      error_key(:linux_rdesktop_not_found)
+    class LinuxRDPClientNotFound < VagrantError
+      error_key(:linux_rdp_client_not_found)
     end
 
     class LocalDataDirectoryNotAccessible < VagrantError
diff --git a/plugins/hosts/linux/cap/rdp.rb b/plugins/hosts/linux/cap/rdp.rb
index 61f231f7b..76476fc9b 100644
--- a/plugins/hosts/linux/cap/rdp.rb
+++ b/plugins/hosts/linux/cap/rdp.rb
@@ -13,7 +13,7 @@ module VagrantPlugins
             elsif Vagrant::Util::Which.which("rdesktop")
               "rdesktop"
             else
-              raise Vagrant::Errors::LinuxRDesktopNotFound
+              raise Vagrant::Errors::LinuxRDPClientNotFound
             end
 
           args = []
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 9e8c680aa..8dce0806b 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -818,10 +818,11 @@ en:
         that the NFS client software is properly installed, and consult any resources
         specific to the linux distro you're using for more information on how to
         do this.
-      linux_rdesktop_not_found: |-
-        The `rdesktop` application was not found. Vagrant requires this
-        in order to connect via RDP to the Vagrant environment. Please ensure
-        this application is installed and available on the path and try again.
+      linux_rdp_client_not_found: |-
+        An appropriate RDP client was not found. Vagrant requires either
+        `xfreerdp` or `rdesktop` in order to connect via RDP to the Vagrant
+        environment. Please ensure one of these applications is installed and
+        available on the path and try again.
       machine_action_locked: |-
         An action '%{action}' was attempted on the machine '%{name}',
         but another process is already executing an action on the machine.

From c60e1161215592d8098776d0bb024647d29eac64 Mon Sep 17 00:00:00 2001
From: Mikhail Zholobov <legal90@gmail.com>
Date: Tue, 3 Nov 2015 17:16:31 +0200
Subject: [PATCH 082/354] Remove redundant app call from action
 "handle_forwarded_port_collisions"

This call should not be in the `handle` helper method. It is specified in the `call` method already.
---
 lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb b/lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb
index b53ba35c2..e9ea90493 100644
--- a/lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb
+++ b/lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb
@@ -156,8 +156,6 @@ module Vagrant
                                    new_port:   repaired_port.to_s))
             end
           end
-
-          @app.call(env)
         end
 
         def lease_check(port)

From ea66e22d2ed36501087eaa9b4bfe7bc4d8255421 Mon Sep 17 00:00:00 2001
From: Indrek Ardel <indrek@ardel.eu>
Date: Thu, 5 Nov 2015 18:55:34 +0200
Subject: [PATCH 083/354] Use UNC paths for shared folders on Windows host

---
 plugins/providers/virtualbox/driver/version_4_3.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/providers/virtualbox/driver/version_4_3.rb b/plugins/providers/virtualbox/driver/version_4_3.rb
index f895739d3..b77b2a4f9 100644
--- a/plugins/providers/virtualbox/driver/version_4_3.rb
+++ b/plugins/providers/virtualbox/driver/version_4_3.rb
@@ -610,6 +610,9 @@ module VagrantPlugins
         def share_folders(folders)
           folders.each do |folder|
             hostpath = folder[:hostpath]
+            if Vagrant::Util::Platform.windows?
+              hostpath = Vagrant::Util::Platform.windows_unc_path(hostpath)
+            end
             args = ["--name",
               folder[:name],
               "--hostpath",

From 4a7aa83e58fb8269740e4783ea30a862af5c7124 Mon Sep 17 00:00:00 2001
From: Indrek Ardel <indrek@ardel.eu>
Date: Thu, 5 Nov 2015 18:56:24 +0200
Subject: [PATCH 084/354] Use UNC paths for shared folders on Windows host

---
 plugins/providers/virtualbox/driver/version_5_0.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/plugins/providers/virtualbox/driver/version_5_0.rb b/plugins/providers/virtualbox/driver/version_5_0.rb
index d13330c00..75a71c4f1 100644
--- a/plugins/providers/virtualbox/driver/version_5_0.rb
+++ b/plugins/providers/virtualbox/driver/version_5_0.rb
@@ -611,14 +611,9 @@ module VagrantPlugins
         def share_folders(folders)
           folders.each do |folder|
             hostpath = folder[:hostpath]
-
-=begin
-            # Removed for GH-5933 until further research.
             if Vagrant::Util::Platform.windows?
               hostpath = Vagrant::Util::Platform.windows_unc_path(hostpath)
             end
-=end
-
             args = ["--name",
               folder[:name],
               "--hostpath",

From d863242538703dc97d4d59eda28ee613dd0e9e77 Mon Sep 17 00:00:00 2001
From: Clayton O'Neill <clayton@oneill.net>
Date: Thu, 5 Nov 2015 15:40:27 -0500
Subject: [PATCH 085/354] Add Errno::ENETUNREACH to SSH rescue

This changes the ssh ready? method to treat ENETUNREACH the same way as
EHOSTUNREACH errors.

When attempting to SSH into a box, it tries up to 5 times to connect to
the box, ignoring various errors.  Later it will catch and gracefully
handle most of those errors so that callers don't have to know the
details.

However, the Errno::ENETUNREACH error is not caught, which means that
callers that expect a clean boolean return from ready? don't get that,
and instead get an exception they probably aren't expecting.
---
 plugins/communicators/ssh/communicator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/communicators/ssh/communicator.rb b/plugins/communicators/ssh/communicator.rb
index 8297329f9..035ef5f61 100644
--- a/plugins/communicators/ssh/communicator.rb
+++ b/plugins/communicators/ssh/communicator.rb
@@ -420,7 +420,7 @@ module VagrantPlugins
         rescue Errno::EHOSTDOWN
           # This is raised if we get an ICMP DestinationUnknown error.
           raise Vagrant::Errors::SSHHostDown
-        rescue Errno::EHOSTUNREACH
+        rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH
           # This is raised if we can't work out how to route traffic.
           raise Vagrant::Errors::SSHNoRoute
         rescue Net::SSH::Exception => e

From df32f6ac5195e487e8d4c28d12a46025926be261 Mon Sep 17 00:00:00 2001
From: Luca Invernizzi <invernizzi.l@gmail.com>
Date: Thu, 5 Nov 2015 13:56:13 -0800
Subject: [PATCH 086/354] Update docker installer to work on custom kernels

The current docker installer attempt to install the linux-image-extra-`uname -r` DEB package on Debian systems.
This package may not exist, for example on custom kernels (e.g., Linode servers).
If this happens, Vagrant halts the provisioning. However, this package is not really needed in newer Debian releases (such as Ubuntu 14.04).

This small patch checks if the linux-image-extra-`uname -r` package exists, and it will install it if it does. In either case, it will continue provisioning.
---
 plugins/provisioners/docker/cap/debian/docker_install.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/provisioners/docker/cap/debian/docker_install.rb b/plugins/provisioners/docker/cap/debian/docker_install.rb
index b598ee785..b9fbed673 100644
--- a/plugins/provisioners/docker/cap/debian/docker_install.rb
+++ b/plugins/provisioners/docker/cap/debian/docker_install.rb
@@ -11,7 +11,9 @@ module VagrantPlugins
               comm.sudo("apt-get update -y")
               # TODO: Perform check on the host machine if aufs is installed and using LXC
               if machine.provider_name != :lxc
-                comm.sudo("lsmod | grep aufs || modprobe aufs || apt-get install -y linux-image-extra-`uname -r`")
+                # Attempt to install linux-image-extra for this kernel, if it exists
+                 package_name = "linux-image-extra-`uname -r`"
+                 comm.sudo("lsmod | grep aufs || modprobe aufs || apt-cache show #{package_name} && apt-get install -y #{package_name} || true")
               end
               comm.sudo("apt-get install -y --force-yes -q curl")
               comm.sudo("curl -sSL https://get.docker.com/gpg | apt-key add -")

From 9bfdaf7e75d710aac42c65f68d9999c4f7c92798 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Tue, 10 Feb 2015 15:28:00 +0100
Subject: [PATCH 087/354] provisioners/ansible: introduce ansible_local

With this change, the existing host-based Ansible provisioner is
refactored to share a maximum of code with this new guest-based Ansible
provisioner.

At this stage of development, the existing unit tests are intentionally
modified as little as possible, to keep safe the existing funtionalities.

Other issues resolved by this changeset:
 - Display a warning when running from a Windows host [GH-5292]
 - Do not run `ansible-playbook` in verbose mode when the `verbose` option
   is set to an empty string.
---
 lib/vagrant/errors.rb                         |   8 -
 .../ansible/cap/guest/arch/ansible_install.rb |  19 ++
 .../cap/guest/debian/ansible_install.rb       |  28 ++
 .../ansible/cap/guest/epel/ansible_install.rb |  39 +++
 .../cap/guest/freebsd/ansible_install.rb      |  18 ++
 .../cap/guest/posix/ansible_installed.rb      |  25 ++
 .../ansible/cap/guest/suse/ansible_install.rb |  18 ++
 .../cap/guest/ubuntu/ansible_install.rb       |  22 ++
 plugins/provisioners/ansible/config.rb        | 128 --------
 plugins/provisioners/ansible/config/base.rb   | 105 ++++++
 plugins/provisioners/ansible/config/guest.rb  |  63 ++++
 plugins/provisioners/ansible/config/host.rb   |  61 ++++
 plugins/provisioners/ansible/errors.rb        |  27 ++
 plugins/provisioners/ansible/helpers.rb       |  37 +++
 plugins/provisioners/ansible/plugin.rb        |  68 +++-
 plugins/provisioners/ansible/provisioner.rb   | 302 ------------------
 .../provisioners/ansible/provisioner/base.rb  | 151 +++++++++
 .../provisioners/ansible/provisioner/guest.rb | 135 ++++++++
 .../provisioners/ansible/provisioner/host.rb  | 198 ++++++++++++
 templates/locales/en.yml                      |  62 +++-
 .../provisioners/ansible/config_test.rb       |  45 +--
 .../provisioners/ansible/provisioner_test.rb  | 114 ++++---
 .../provisioners/support/shared/config.rb     |   6 +
 website/docs/source/layouts/layout.erb        |   1 +
 .../source/v2/provisioning/ansible.html.md    | 215 ++-----------
 .../v2/provisioning/ansible_common.html.md    |  86 +++++
 .../v2/provisioning/ansible_intro.html.md     | 208 ++++++++++++
 .../v2/provisioning/ansible_local.html.md     | 147 +++++++++
 28 files changed, 1627 insertions(+), 709 deletions(-)
 create mode 100644 plugins/provisioners/ansible/cap/guest/arch/ansible_install.rb
 create mode 100644 plugins/provisioners/ansible/cap/guest/debian/ansible_install.rb
 create mode 100644 plugins/provisioners/ansible/cap/guest/epel/ansible_install.rb
 create mode 100644 plugins/provisioners/ansible/cap/guest/freebsd/ansible_install.rb
 create mode 100644 plugins/provisioners/ansible/cap/guest/posix/ansible_installed.rb
 create mode 100644 plugins/provisioners/ansible/cap/guest/suse/ansible_install.rb
 create mode 100644 plugins/provisioners/ansible/cap/guest/ubuntu/ansible_install.rb
 delete mode 100644 plugins/provisioners/ansible/config.rb
 create mode 100644 plugins/provisioners/ansible/config/base.rb
 create mode 100644 plugins/provisioners/ansible/config/guest.rb
 create mode 100644 plugins/provisioners/ansible/config/host.rb
 create mode 100644 plugins/provisioners/ansible/errors.rb
 create mode 100644 plugins/provisioners/ansible/helpers.rb
 delete mode 100644 plugins/provisioners/ansible/provisioner.rb
 create mode 100644 plugins/provisioners/ansible/provisioner/base.rb
 create mode 100644 plugins/provisioners/ansible/provisioner/guest.rb
 create mode 100644 plugins/provisioners/ansible/provisioner/host.rb
 create mode 100644 website/docs/source/v2/provisioning/ansible_common.html.md
 create mode 100644 website/docs/source/v2/provisioning/ansible_intro.html.md
 create mode 100644 website/docs/source/v2/provisioning/ansible_local.html.md

diff --git a/lib/vagrant/errors.rb b/lib/vagrant/errors.rb
index c76f3cbe9..ea3811cbe 100644
--- a/lib/vagrant/errors.rb
+++ b/lib/vagrant/errors.rb
@@ -108,14 +108,6 @@ module Vagrant
       error_key(:active_machine_with_different_provider)
     end
 
-    class AnsibleFailed < VagrantError
-      error_key(:ansible_failed)
-    end
-
-    class AnsiblePlaybookAppNotFound < VagrantError
-      error_key(:ansible_playbook_app_not_found)
-    end
-
     class BatchMultiError < VagrantError
       error_key(:batch_multi_error)
     end
diff --git a/plugins/provisioners/ansible/cap/guest/arch/ansible_install.rb b/plugins/provisioners/ansible/cap/guest/arch/ansible_install.rb
new file mode 100644
index 000000000..62e1e2141
--- /dev/null
+++ b/plugins/provisioners/ansible/cap/guest/arch/ansible_install.rb
@@ -0,0 +1,19 @@
+
+module VagrantPlugins
+  module Ansible
+    module Cap
+      module Guest
+        module Arch
+          module AnsibleInstall
+
+            def self.ansible_install(machine)
+              machine.communicate.sudo("pacman -Syy --noconfirm")
+              machine.communicate.sudo("pacman -S --noconfirm ansible")
+            end
+
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/provisioners/ansible/cap/guest/debian/ansible_install.rb b/plugins/provisioners/ansible/cap/guest/debian/ansible_install.rb
new file mode 100644
index 000000000..05308d03d
--- /dev/null
+++ b/plugins/provisioners/ansible/cap/guest/debian/ansible_install.rb
@@ -0,0 +1,28 @@
+
+module VagrantPlugins
+  module Ansible
+    module Cap
+      module Guest
+        module Debian
+          module AnsibleInstall
+
+            def self.ansible_install(machine)
+
+install_backports_if_wheezy_release = <<INLINE_CRIPT
+CODENAME=`lsb_release -cs`
+if [ x$CODENAME == 'xwheezy' ]; then
+  echo 'deb http://http.debian.net/debian wheezy-backports main' > /etc/apt/sources.list.d/wheezy-backports.list
+fi
+INLINE_CRIPT
+
+              machine.communicate.sudo(install_backports_if_wheezy_release)
+              machine.communicate.sudo("apt-get update -y -qq")
+              machine.communicate.sudo("apt-get install -y -qq ansible")
+            end
+
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/provisioners/ansible/cap/guest/epel/ansible_install.rb b/plugins/provisioners/ansible/cap/guest/epel/ansible_install.rb
new file mode 100644
index 000000000..6ae10b091
--- /dev/null
+++ b/plugins/provisioners/ansible/cap/guest/epel/ansible_install.rb
@@ -0,0 +1,39 @@
+
+module VagrantPlugins
+  module Ansible
+    module Cap
+      module Guest
+        module EPEL # Extra Packages for Enterprise Linux (for RedHat-family distributions)
+          module AnsibleInstall
+
+            # This should work on recent Fedora releases, and any other members of the
+            # RedHat family which supports YUM and http://fedoraproject.org/wiki/EPEL
+            def self.ansible_install(machine)
+
+              configure_epel = <<INLINE_CRIPT
+cat <<EOM >/etc/yum.repos.d/epel-bootstrap.repo
+[epel]
+name=Bootstrap EPEL
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-\$releasever&arch=\$basearch
+failovermethod=priority
+enabled=0
+gpgcheck=0
+EOM
+
+yum --assumeyes --quiet --enablerepo=epel install epel-release
+rm -f /etc/yum.repos.d/epel-bootstrap.repo
+INLINE_CRIPT
+
+              ansible_is_installable = machine.communicate.execute("yum info ansible", :error_check => false)
+              if ansible_is_installable != 0
+                machine.communicate.sudo(configure_epel)
+              end
+              machine.communicate.sudo("yum --assumeyes --quiet --enablerepo=epel install ansible")
+            end
+
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/provisioners/ansible/cap/guest/freebsd/ansible_install.rb b/plugins/provisioners/ansible/cap/guest/freebsd/ansible_install.rb
new file mode 100644
index 000000000..4cf7b1807
--- /dev/null
+++ b/plugins/provisioners/ansible/cap/guest/freebsd/ansible_install.rb
@@ -0,0 +1,18 @@
+
+module VagrantPlugins
+  module Ansible
+    module Cap
+      module Guest
+        module FreeBSD
+          module AnsibleInstall
+
+            def self.ansible_install(machine)
+              machine.communicate.sudo("yes | pkg install ansible")
+            end
+
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/provisioners/ansible/cap/guest/posix/ansible_installed.rb b/plugins/provisioners/ansible/cap/guest/posix/ansible_installed.rb
new file mode 100644
index 000000000..16abae9bf
--- /dev/null
+++ b/plugins/provisioners/ansible/cap/guest/posix/ansible_installed.rb
@@ -0,0 +1,25 @@
+module VagrantPlugins
+  module Ansible
+    module Cap
+      module Guest
+        module POSIX
+          module AnsibleInstalled
+
+            # Check if Ansible is installed (at the given version).
+            # @return [true, false]
+            def self.ansible_installed(machine, version)
+              command = 'test -x "$(command -v ansible)"'
+
+              if !version.empty?
+                command << "&& ansible --version | grep 'ansible #{version}'"
+              end
+
+              machine.communicate.test(command, sudo: false)
+            end
+
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/provisioners/ansible/cap/guest/suse/ansible_install.rb b/plugins/provisioners/ansible/cap/guest/suse/ansible_install.rb
new file mode 100644
index 000000000..64f3cd41c
--- /dev/null
+++ b/plugins/provisioners/ansible/cap/guest/suse/ansible_install.rb
@@ -0,0 +1,18 @@
+
+module VagrantPlugins
+  module Ansible
+    module Cap
+      module Guest
+        module SUSE
+          module AnsibleInstall
+
+            def self.ansible_install(machine)
+              machine.communicate.sudo("zypper --non-interactive --quiet install ansible")
+            end
+
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/provisioners/ansible/cap/guest/ubuntu/ansible_install.rb b/plugins/provisioners/ansible/cap/guest/ubuntu/ansible_install.rb
new file mode 100644
index 000000000..92182fe06
--- /dev/null
+++ b/plugins/provisioners/ansible/cap/guest/ubuntu/ansible_install.rb
@@ -0,0 +1,22 @@
+
+module VagrantPlugins
+  module Ansible
+    module Cap
+      module Guest
+        module Ubuntu
+          module AnsibleInstall
+
+            def self.ansible_install(machine)
+              machine.communicate.sudo("apt-get update -y -qq")
+              machine.communicate.sudo("apt-get install -y -qq software-properties-common python-software-properties")
+              machine.communicate.sudo("add-apt-repository ppa:ansible/ansible -y")
+              machine.communicate.sudo("apt-get update -y -qq")
+              machine.communicate.sudo("apt-get install -y -qq ansible")
+            end
+
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/provisioners/ansible/config.rb b/plugins/provisioners/ansible/config.rb
deleted file mode 100644
index 784cf48f7..000000000
--- a/plugins/provisioners/ansible/config.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-module VagrantPlugins
-  module Ansible
-    class Config < Vagrant.plugin("2", :config)
-      attr_accessor :playbook
-      attr_accessor :extra_vars
-      attr_accessor :inventory_path
-      attr_accessor :ask_sudo_pass
-      attr_accessor :ask_vault_pass
-      attr_accessor :vault_password_file
-      attr_accessor :limit
-      attr_accessor :sudo
-      attr_accessor :sudo_user
-      attr_accessor :verbose
-      attr_accessor :tags
-      attr_accessor :skip_tags
-      attr_accessor :start_at_task
-      attr_accessor :groups
-      attr_accessor :host_key_checking
-
-      # Joker attribute, used to pass unsupported arguments to ansible-playbook anyway
-      attr_accessor :raw_arguments
-      # Joker attribute, used to set additional SSH parameters for ansible-playbook anyway
-      attr_accessor :raw_ssh_args
-
-      def initialize
-        @playbook            = UNSET_VALUE
-        @extra_vars          = UNSET_VALUE
-        @inventory_path      = UNSET_VALUE
-        @ask_sudo_pass       = UNSET_VALUE
-        @ask_vault_pass      = UNSET_VALUE
-        @vault_password_file = UNSET_VALUE
-        @limit               = UNSET_VALUE
-        @sudo                = UNSET_VALUE
-        @sudo_user           = UNSET_VALUE
-        @verbose             = UNSET_VALUE
-        @tags                = UNSET_VALUE
-        @skip_tags           = UNSET_VALUE
-        @start_at_task       = UNSET_VALUE
-        @groups              = UNSET_VALUE
-        @host_key_checking   = UNSET_VALUE
-        @raw_arguments       = UNSET_VALUE
-        @raw_ssh_args        = UNSET_VALUE
-      end
-
-      def finalize!
-        @playbook            = nil if @playbook == UNSET_VALUE
-        @extra_vars          = nil if @extra_vars == UNSET_VALUE
-        @inventory_path      = nil if @inventory_path == UNSET_VALUE
-        @ask_sudo_pass       = false unless @ask_sudo_pass == true
-        @ask_vault_pass      = false unless @ask_vault_pass == true
-        @vault_password_file = nil if @vault_password_file == UNSET_VALUE
-        @limit               = nil if @limit == UNSET_VALUE
-        @sudo                = false unless @sudo == true
-        @sudo_user           = nil if @sudo_user == UNSET_VALUE
-        @verbose             = nil if @verbose == UNSET_VALUE
-        @tags                = nil if @tags == UNSET_VALUE
-        @skip_tags           = nil if @skip_tags == UNSET_VALUE
-        @start_at_task       = nil if @start_at_task == UNSET_VALUE
-        @groups              = {}  if @groups == UNSET_VALUE
-        @host_key_checking   = false unless @host_key_checking == true
-        @raw_arguments       = nil if @raw_arguments == UNSET_VALUE
-        @raw_ssh_args        = nil if @raw_ssh_args == UNSET_VALUE
-      end
-
-      def validate(machine)
-        errors = _detected_errors
-
-        # Validate that a playbook path was provided
-        if !playbook
-          errors << I18n.t("vagrant.provisioners.ansible.no_playbook")
-        end
-
-        # Validate the existence of said playbook on the host
-        if playbook
-          expanded_path = Pathname.new(playbook).expand_path(machine.env.root_path)
-          if !expanded_path.file?
-            errors << I18n.t("vagrant.provisioners.ansible.playbook_path_invalid",
-                              path: expanded_path)
-          end
-        end
-
-        # Validate that extra_vars is either a hash, or a path to an
-        # existing file
-        if extra_vars
-          extra_vars_is_valid = extra_vars.kind_of?(Hash) || extra_vars.kind_of?(String)
-          if extra_vars.kind_of?(String)
-            # Accept the usage of '@' prefix in Vagrantfile (e.g. '@vars.yml'
-            # and 'vars.yml' are both supported)
-            match_data = /^@?(.+)$/.match(extra_vars)
-            extra_vars_path = match_data[1].to_s
-            expanded_path = Pathname.new(extra_vars_path).expand_path(machine.env.root_path)
-            extra_vars_is_valid = expanded_path.exist?
-            if extra_vars_is_valid
-              @extra_vars = '@' + extra_vars_path
-            end
-          end
-
-          if !extra_vars_is_valid
-            errors << I18n.t("vagrant.provisioners.ansible.extra_vars_invalid",
-                              type:  extra_vars.class.to_s,
-                              value: extra_vars.to_s
-                            )
-          end
-        end
-
-        # Validate the existence of the inventory_path, if specified
-        if inventory_path
-          expanded_path = Pathname.new(inventory_path).expand_path(machine.env.root_path)
-          if !expanded_path.exist?
-            errors << I18n.t("vagrant.provisioners.ansible.inventory_path_invalid",
-                              path: expanded_path)
-          end
-        end
-
-        # Validate the existence of the vault_password_file, if specified
-        if vault_password_file
-          expanded_path = Pathname.new(vault_password_file).expand_path(machine.env.root_path)
-          if !expanded_path.exist?
-            errors << I18n.t("vagrant.provisioners.ansible.vault_password_file_invalid",
-                              path: expanded_path)
-          end
-        end
-
-        { "ansible provisioner" => errors }
-      end
-    end
-  end
-end
diff --git a/plugins/provisioners/ansible/config/base.rb b/plugins/provisioners/ansible/config/base.rb
new file mode 100644
index 000000000..e0b610a27
--- /dev/null
+++ b/plugins/provisioners/ansible/config/base.rb
@@ -0,0 +1,105 @@
+module VagrantPlugins
+  module Ansible
+    module Config
+      class Base < Vagrant.plugin("2", :config)
+
+        attr_accessor :extra_vars
+        attr_accessor :groups
+        attr_accessor :inventory_path
+        attr_accessor :limit
+        attr_accessor :playbook
+        attr_accessor :raw_arguments
+        attr_accessor :skip_tags
+        attr_accessor :start_at_task
+        attr_accessor :sudo
+        attr_accessor :sudo_user
+        attr_accessor :tags
+        attr_accessor :vault_password_file
+        attr_accessor :verbose
+
+        def initialize
+          @extra_vars          = UNSET_VALUE
+          @groups              = UNSET_VALUE
+          @inventory_path      = UNSET_VALUE
+          @limit               = UNSET_VALUE
+          @playbook            = UNSET_VALUE
+          @raw_arguments       = UNSET_VALUE
+          @skip_tags           = UNSET_VALUE
+          @start_at_task       = UNSET_VALUE
+          @sudo                = UNSET_VALUE
+          @sudo_user           = UNSET_VALUE
+          @tags                = UNSET_VALUE
+          @vault_password_file = UNSET_VALUE
+          @verbose             = UNSET_VALUE
+        end
+
+        def finalize!
+          @extra_vars          = nil   if @extra_vars           == UNSET_VALUE
+          @groups              = {}    if @groups               == UNSET_VALUE
+          @inventory_path      = nil   if @inventory_path       == UNSET_VALUE
+          @limit               = nil   if @limit                == UNSET_VALUE
+          @playbook            = nil   if @playbook             == UNSET_VALUE
+          @raw_arguments       = nil   if @raw_arguments        == UNSET_VALUE
+          @skip_tags           = nil   if @skip_tags            == UNSET_VALUE
+          @start_at_task       = nil   if @start_at_task        == UNSET_VALUE
+          @sudo                = false if @sudo                 != true
+          @sudo_user           = nil   if @sudo_user            == UNSET_VALUE
+          @tags                = nil   if @tags                 == UNSET_VALUE
+          @vault_password_file = nil   if @vault_password_file  == UNSET_VALUE
+          @verbose             = false if @verbose              == UNSET_VALUE
+        end
+
+        # Just like the normal configuration "validate" method except that
+        # it returns an array of errors that should be merged into some
+        # other error accumulator.
+        def validate(machine)
+          @errors = _detected_errors
+
+          # Validate that a playbook path was provided
+          if !playbook
+            @errors << I18n.t("vagrant.provisioners.ansible.no_playbook")
+          end
+
+          # Validate the existence of the playbook
+          if playbook
+            check_path_is_a_file(machine, playbook, "vagrant.provisioners.ansible.playbook_path_invalid")
+          end
+
+          # Validate the existence of the inventory_path, if specified
+          if inventory_path
+            check_path_exists(machine, inventory_path, "vagrant.provisioners.ansible.inventory_path_invalid")
+          end
+
+          # Validate the existence of the vault_password_file, if specified
+          if vault_password_file
+            check_path_is_a_file(machine, vault_password_file, "vagrant.provisioners.ansible.vault_password_file_invalid")
+          end
+
+          # Validate that extra_vars is either a hash, or a path to an
+          # existing file
+          if extra_vars
+            extra_vars_is_valid = extra_vars.kind_of?(Hash) || extra_vars.kind_of?(String)
+            if extra_vars.kind_of?(String)
+              # Accept the usage of '@' prefix in Vagrantfile (e.g. '@vars.yml'
+              # and 'vars.yml' are both supported)
+              match_data = /^@?(.+)$/.match(extra_vars)
+              extra_vars_path = match_data[1].to_s
+              extra_vars_is_valid = check_path_is_a_file(machine, extra_vars_path)
+              if extra_vars_is_valid
+                @extra_vars = '@' + extra_vars_path
+              end
+            end
+
+            if !extra_vars_is_valid
+              @errors << I18n.t(
+                "vagrant.provisioners.ansible.extra_vars_invalid",
+                type:  extra_vars.class.to_s,
+                value: extra_vars.to_s)
+            end
+          end
+
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/provisioners/ansible/config/guest.rb b/plugins/provisioners/ansible/config/guest.rb
new file mode 100644
index 000000000..a7f3bf44e
--- /dev/null
+++ b/plugins/provisioners/ansible/config/guest.rb
@@ -0,0 +1,63 @@
+require_relative "base"
+
+module VagrantPlugins
+  module Ansible
+    module Config
+      class Guest < Base
+
+        attr_accessor :provisioning_path
+        attr_accessor :tmp_path
+        attr_accessor :install
+        attr_accessor :version
+
+        def initialize
+          super
+
+          @install           = UNSET_VALUE
+          @provisioning_path = UNSET_VALUE
+          @tmp_path          = UNSET_VALUE
+          @version           = UNSET_VALUE
+        end
+
+        def finalize!
+          super
+
+          @install           = true                   if @install           == UNSET_VALUE
+          @provisioning_path = "/vagrant"             if provisioning_path  == UNSET_VALUE
+          @tmp_path          = "/tmp/vagrant-ansible" if tmp_path           == UNSET_VALUE
+          @version           = ""                     if @version           == UNSET_VALUE
+        end
+
+        def validate(machine)
+          super
+
+          { "ansible local provisioner" => @errors }
+        end
+
+        protected
+
+        def check_path(machine, path, test_args, error_message_key = nil)
+          remote_path = Pathname.new(path).expand_path(@provisioning_path)
+          if machine.communicate.ready? && !machine.communicate.test("test #{test_args} #{remote_path}")
+            if error_message_key
+              @errors << I18n.t(error_message_key, path: remote_path, system: "guest")
+            end
+            return false
+          end
+          # when the machine is not ready for SSH communication,
+          # the check is "optimistically" by passed.
+          true
+        end
+
+        def check_path_is_a_file(machine, path, error_message_key = nil)
+          check_path(machine, path, "-f", error_message_key)
+        end
+
+        def check_path_exists(machine, path, error_message_key = nil)
+          check_path(machine, path, "-e", error_message_key)
+        end
+
+      end
+    end
+  end
+end
diff --git a/plugins/provisioners/ansible/config/host.rb b/plugins/provisioners/ansible/config/host.rb
new file mode 100644
index 000000000..fa5d79d19
--- /dev/null
+++ b/plugins/provisioners/ansible/config/host.rb
@@ -0,0 +1,61 @@
+require_relative "base"
+
+module VagrantPlugins
+  module Ansible
+    module Config
+      class Host < Base
+
+        attr_accessor :ask_sudo_pass
+        attr_accessor :ask_vault_pass
+        attr_accessor :host_key_checking
+        attr_accessor :raw_ssh_args
+
+        def initialize
+          super
+
+          @ask_sudo_pass       = false
+          @ask_vault_pass      = false
+          @host_key_checking   = false
+          @raw_ssh_args        = UNSET_VALUE
+        end
+
+        def finalize!
+          super
+
+          @ask_sudo_pass       = false if @ask_sudo_pass     != true
+          @ask_vault_pass      = false if @ask_vault_pass    != true
+          @host_key_checking   = false if @host_key_checking != true
+          @raw_ssh_args        = nil   if @raw_ssh_args      == UNSET_VALUE
+        end
+
+        def validate(machine)
+          super
+
+          { "ansible remote provisioner" => @errors }
+        end
+
+        protected
+
+        def check_path(machine, path, path_test_method, error_message_key = nil)
+          expanded_path = Pathname.new(path).expand_path(machine.env.root_path)
+          if !expanded_path.public_send(path_test_method)
+            if error_message_key
+              @errors << I18n.t(error_message_key, path: expanded_path, system: "host")
+            end
+            return false
+          end
+          true
+        end
+
+        def check_path_is_a_file(machine, path, error_message_key = nil)
+          check_path(machine, path, "file?", error_message_key)
+        end
+
+        def check_path_exists(machine, path, error_message_key = nil)
+          check_path(machine, path, "exist?", error_message_key)
+        end
+
+      end
+    end
+  end
+end
diff --git a/plugins/provisioners/ansible/errors.rb b/plugins/provisioners/ansible/errors.rb
new file mode 100644
index 000000000..2a6f8dbbd
--- /dev/null
+++ b/plugins/provisioners/ansible/errors.rb
@@ -0,0 +1,27 @@
+require "vagrant"
+
+module VagrantPlugins
+  module Ansible
+    module Errors
+      class AnsibleError < Vagrant::Errors::VagrantError
+        error_namespace("vagrant.provisioners.ansible.errors")
+      end
+
+      class AnsiblePlaybookAppFailed < AnsibleError
+        error_key(:ansible_playbook_app_failed)
+      end
+
+      class AnsiblePlaybookAppNotFoundOnHost < AnsibleError
+        error_key(:ansible_playbook_app_not_found_on_host)
+      end
+
+      class AnsiblePlaybookAppNotFoundOnGuest < AnsibleError
+        error_key(:ansible_playbook_app_not_found_on_guest)
+      end
+
+      class AnsibleVersionNotFoundOnGuest < AnsibleError
+        error_key(:ansible_version_not_found_on_guest)
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/plugins/provisioners/ansible/helpers.rb b/plugins/provisioners/ansible/helpers.rb
new file mode 100644
index 000000000..1bdb57366
--- /dev/null
+++ b/plugins/provisioners/ansible/helpers.rb
@@ -0,0 +1,37 @@
+require "vagrant"
+
+module VagrantPlugins
+  module Ansible
+    class Helpers
+      def self.stringify_ansible_playbook_command(env, command)
+        shell_command = ''
+        env.each_pair do |k, v|
+          if k == 'ANSIBLE_SSH_ARGS'
+            shell_command += "#{k}='#{v}' "
+          else
+            shell_command += "#{k}=#{v} "
+          end
+        end
+
+        shell_arg = []
+        command.each do |arg|
+          if arg =~ /(--start-at-task|--limit)=(.+)/
+            shell_arg << "#{$1}='#{$2}'"
+          else
+            shell_arg << arg
+          end
+        end
+
+        shell_command += shell_arg.join(' ')
+      end
+
+      def self.as_list_argument(v)
+        v.kind_of?(Array) ? v.join(',') : v
+      end
+
+      def self.as_array(v)
+        v.kind_of?(Array) ? v : [v]
+      end
+   end
+  end
+end
\ No newline at end of file
diff --git a/plugins/provisioners/ansible/plugin.rb b/plugins/provisioners/ansible/plugin.rb
index 0cafe47fb..3be60f8ad 100644
--- a/plugins/provisioners/ansible/plugin.rb
+++ b/plugins/provisioners/ansible/plugin.rb
@@ -3,21 +3,73 @@ require "vagrant"
 module VagrantPlugins
   module Ansible
     class Plugin < Vagrant.plugin("2")
+
       name "ansible"
       description <<-DESC
-      Provides support for provisioning your virtual machines with
-      Ansible playbooks.
+      Provides support for provisioning your virtual machines with Ansible
+      from the Vagrant host (`ansible`) or from the guests (`ansible_local`).
       DESC
 
-      config(:ansible, :provisioner) do
-        require File.expand_path("../config", __FILE__)
-        Config
+      config("ansible", :provisioner) do
+        require_relative "config/host"
+        Config::Host
       end
 
-      provisioner(:ansible) do
-        require File.expand_path("../provisioner", __FILE__)
-        Provisioner
+      config("ansible_local", :provisioner) do
+        require_relative "config/guest"
+        Config::Guest
       end
+
+      provisioner("ansible") do
+        require_relative "provisioner/host"
+        Provisioner::Host
+      end
+
+      provisioner("ansible_local") do
+        require_relative "provisioner/guest"
+        Provisioner::Guest
+      end
+
+      guest_capability(:linux, :ansible_installed) do
+        require_relative "cap/guest/posix/ansible_installed"
+        Cap::Guest::POSIX::AnsibleInstalled
+      end
+
+      guest_capability(:freebsd, :ansible_installed) do
+        require_relative "cap/guest/posix/ansible_installed"
+        Cap::Guest::POSIX::AnsibleInstalled
+      end
+
+      guest_capability(:arch, :ansible_install) do
+        require_relative "cap/guest/arch/ansible_install"
+        Cap::Guest::Arch::AnsibleInstall
+      end
+
+      guest_capability(:debian, :ansible_install) do
+        require_relative "cap/guest/debian/ansible_install"
+        Cap::Guest::Debian::AnsibleInstall
+      end
+
+      guest_capability(:ubuntu, :ansible_install) do
+        require_relative "cap/guest/ubuntu/ansible_install"
+        Cap::Guest::Ubuntu::AnsibleInstall
+      end
+
+      guest_capability(:redhat, :ansible_install) do
+        require_relative "cap/guest/epel/ansible_install"
+        Cap::Guest::EPEL::AnsibleInstall
+      end
+
+      guest_capability(:suse, :ansible_install) do
+        require_relative "cap/guest/suse/ansible_install"
+        Cap::Guest::SUSE::AnsibleInstall
+      end
+
+      guest_capability(:freebsd, :ansible_install) do
+        require_relative "cap/guest/freebsd/ansible_install"
+        Cap::Guest::FreeBSD::AnsibleInstall
+      end
+
     end
   end
 end
diff --git a/plugins/provisioners/ansible/provisioner.rb b/plugins/provisioners/ansible/provisioner.rb
deleted file mode 100644
index 6dd1313e0..000000000
--- a/plugins/provisioners/ansible/provisioner.rb
+++ /dev/null
@@ -1,302 +0,0 @@
-require "vagrant/util/platform"
-require "thread"
-
-module VagrantPlugins
-  module Ansible
-    class Provisioner < Vagrant.plugin("2", :provisioner)
-
-      @@lock = Mutex.new
-
-      def initialize(machine, config)
-        super
-
-        @logger = Log4r::Logger.new("vagrant::provisioners::ansible")
-      end
-
-      def provision
-        @ssh_info = @machine.ssh_info
-
-        #
-        # Ansible provisioner options
-        #
-
-        # By default, connect with Vagrant SSH username
-        options = %W[--user=#{@ssh_info[:username]}]
-
-        # Connect with native OpenSSH client
-        # Other modes (e.g. paramiko) are not officially supported,
-        # but can be enabled via raw_arguments option.
-        options << "--connection=ssh"
-
-        # Increase the SSH connection timeout, as the Ansible default value (10 seconds)
-        # is a bit demanding for some overloaded developer boxes. This is particularly
-        # helpful when additional virtual networks are configured, as their availability
-        # is not controlled during vagrant boot process.
-        options << "--timeout=30"
-
-        # By default we limit by the current machine, but
-        # this can be overridden by the `limit` option.
-        if config.limit
-          options << "--limit=#{as_list_argument(config.limit)}"
-        else
-          options << "--limit=#{@machine.name}"
-        end
-
-        options << "--inventory-file=#{self.setup_inventory_file}"
-        options << "--extra-vars=#{self.get_extra_vars_argument}" if config.extra_vars
-        options << "--sudo" if config.sudo
-        options << "--sudo-user=#{config.sudo_user}" if config.sudo_user
-        options << "#{self.get_verbosity_argument}" if config.verbose
-        options << "--ask-sudo-pass" if config.ask_sudo_pass
-        options << "--ask-vault-pass" if config.ask_vault_pass
-        options << "--vault-password-file=#{config.vault_password_file}" if config.vault_password_file
-        options << "--tags=#{as_list_argument(config.tags)}" if config.tags
-        options << "--skip-tags=#{as_list_argument(config.skip_tags)}" if config.skip_tags
-        options << "--start-at-task=#{config.start_at_task}" if config.start_at_task
-
-        # Finally, add the raw configuration options, which has the highest precedence
-        # and can therefore potentially override any other options of this provisioner.
-        options.concat(self.as_array(config.raw_arguments)) if config.raw_arguments
-
-        #
-        # Assemble the full ansible-playbook command
-        #
-
-        command = (%w(ansible-playbook) << options << config.playbook).flatten
-
-        env = {
-          # Ensure Ansible output isn't buffered so that we receive output
-          # on a task-by-task basis.
-          "PYTHONUNBUFFERED" => 1,
-
-          # Some Ansible options must be passed as environment variables,
-          # as there is no equivalent command line arguments
-          "ANSIBLE_HOST_KEY_CHECKING" => "#{config.host_key_checking}",
-        }
-
-        # When Ansible output is piped in Vagrant integration, its default colorization is
-        # automatically disabled and the only way to re-enable colors is to use ANSIBLE_FORCE_COLOR.
-        env["ANSIBLE_FORCE_COLOR"] = "true" if @machine.env.ui.color?
-        # Setting ANSIBLE_NOCOLOR is "unnecessary" at the moment, but this could change in the future
-        # (e.g. local provisioner [GH-2103], possible change in vagrant/ansible integration, etc.)
-        env["ANSIBLE_NOCOLOR"] = "true" if !@machine.env.ui.color?
-
-        # ANSIBLE_SSH_ARGS is required for Multiple SSH keys, SSH forwarding and custom SSH settings
-        env["ANSIBLE_SSH_ARGS"] = ansible_ssh_args unless ansible_ssh_args.empty?
-
-        show_ansible_playbook_command(env, command) if config.verbose
-
-        # Write stdout and stderr data, since it's the regular Ansible output
-        command << {
-          env: env,
-          notify: [:stdout, :stderr],
-          workdir: @machine.env.root_path.to_s
-        }
-
-        begin
-          result = Vagrant::Util::Subprocess.execute(*command) do |type, data|
-            if type == :stdout || type == :stderr
-              @machine.env.ui.info(data, new_line: false, prefix: false)
-            end
-          end
-
-          raise Vagrant::Errors::AnsibleFailed if result.exit_code != 0
-        rescue Vagrant::Util::Subprocess::LaunchError
-          raise Vagrant::Errors::AnsiblePlaybookAppNotFound
-        end
-      end
-
-      protected
-
-      # Auto-generate "safe" inventory file based on Vagrantfile,
-      # unless inventory_path is explicitly provided
-      def setup_inventory_file
-        return config.inventory_path if config.inventory_path
-
-        # Managed machines
-        inventory_machines = {}
-
-        generated_inventory_dir = @machine.env.local_data_path.join(File.join(%w(provisioners ansible inventory)))
-        FileUtils.mkdir_p(generated_inventory_dir) unless File.directory?(generated_inventory_dir)
-        generated_inventory_file = generated_inventory_dir.join('vagrant_ansible_inventory')
-
-        inventory = "# Generated by Vagrant\n\n"
-
-        @machine.env.active_machines.each do |am|
-          begin
-            m = @machine.env.machine(*am)
-            m_ssh_info = m.ssh_info
-            if !m_ssh_info.nil?
-              inventory += "#{m.name} ansible_ssh_host=#{m_ssh_info[:host]} ansible_ssh_port=#{m_ssh_info[:port]} ansible_ssh_private_key_file='#{m_ssh_info[:private_key_path][0]}'\n"
-              inventory_machines[m.name] = m
-            else
-              @logger.error("Auto-generated inventory: Impossible to get SSH information for machine '#{m.name} (#{m.provider_name})'. This machine should be recreated.")
-              # Let a note about this missing machine
-              inventory += "# MISSING: '#{m.name}' machine was probably removed without using Vagrant. This machine should be recreated.\n"
-            end
-          rescue Vagrant::Errors::MachineNotFound => e
-            @logger.info("Auto-generated inventory: Skip machine '#{am[0]} (#{am[1]})', which is not configured for this Vagrant environment.")
-          end
-        end
-
-        # Write out groups information.
-        # All defined groups will be included, but only supported
-        # machines and defined child groups will be included.
-        # Group variables are intentionally skipped.
-        groups_of_groups = {}
-        defined_groups = []
-
-        config.groups.each_pair do |gname, gmembers|
-          # Require that gmembers be an array
-          # (easier to be tolerant and avoid error management of few value)
-          gmembers = [gmembers] if !gmembers.is_a?(Array)
-
-          if gname.end_with?(":children")
-            groups_of_groups[gname] = gmembers
-            defined_groups << gname.sub(/:children$/, '')
-          elsif !gname.include?(':vars')
-          defined_groups << gname
-          inventory += "\n[#{gname}]\n"
-            gmembers.each do |gm|
-              inventory += "#{gm}\n" if inventory_machines.include?(gm.to_sym)
-            end
-          end
-        end
-
-        defined_groups.uniq!
-        groups_of_groups.each_pair do |gname, gmembers|
-          inventory += "\n[#{gname}]\n"
-          gmembers.each do |gm|
-            inventory += "#{gm}\n" if defined_groups.include?(gm)
-          end
-        end
-
-        @@lock.synchronize do
-          if ! File.exists?(generated_inventory_file) or
-             inventory != File.read(generated_inventory_file)
-
-            generated_inventory_file.open('w') do |file|
-              file.write(inventory)
-            end
-          end
-        end
-
-        return generated_inventory_dir.to_s
-      end
-
-      def get_extra_vars_argument
-        if config.extra_vars.kind_of?(String) and config.extra_vars =~ /^@.+$/
-          # A JSON or YAML file is referenced (requires Ansible 1.3+)
-          return config.extra_vars
-        else
-          # Expected to be a Hash after config validation. (extra_vars as
-          # JSON requires Ansible 1.2+, while YAML requires Ansible 1.3+)
-          return config.extra_vars.to_json
-        end
-      end
-
-      def get_verbosity_argument
-        if config.verbose.to_s =~ /^v+$/
-          # ansible-playbook accepts "silly" arguments like '-vvvvv' as '-vvvv' for now
-          return "-#{config.verbose}"
-        else
-          # safe default, in case input strays
-          return '-v'
-        end
-      end
-
-      def ansible_ssh_args
-        @ansible_ssh_args ||= get_ansible_ssh_args
-      end
-
-      # Use ANSIBLE_SSH_ARGS to pass some OpenSSH options that are not wrapped by
-      # an ad-hoc Ansible option. Last update corresponds to Ansible 1.8
-      def get_ansible_ssh_args
-        ssh_options = []
-
-        # Use an SSH ProxyCommand when using the Docker provider with the intermediate host
-        if @machine.provider_name == :docker && machine.provider.host_vm?
-          docker_host_ssh_info = machine.provider.host_vm.ssh_info
-
-          proxy_cmd = "ssh #{docker_host_ssh_info[:username]}@#{docker_host_ssh_info[:host]}" +
-            " -p #{docker_host_ssh_info[:port]} -i #{docker_host_ssh_info[:private_key_path][0]}"
-
-          # Use same options than plugins/providers/docker/communicator.rb
-          # Note: this could be improved (DRY'ed) by sharing these settings.
-          proxy_cmd += " -o Compression=yes -o ConnectTimeout=5 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-
-          proxy_cmd += " -o ForwardAgent=yes" if @ssh_info[:forward_agent]
-
-          proxy_cmd += " exec nc %h %p 2>/dev/null"
-
-          ssh_options << "-o ProxyCommand='#{ proxy_cmd }'"
-        end
-
-        # Don't access user's known_hosts file, except when host_key_checking is enabled.
-        ssh_options << "-o UserKnownHostsFile=/dev/null" unless config.host_key_checking
-
-        # Set IdentitiesOnly=yes to avoid authentication errors when the host has more than 5 ssh keys.
-        # Notes:
-        #  - Solaris/OpenSolaris/Illumos uses SunSSH which doesn't support the IdentitiesOnly option.
-        #  - this could be improved by sharing logic with lib/vagrant/util/ssh.rb
-        ssh_options << "-o IdentitiesOnly=yes" unless Vagrant::Util::Platform.solaris?
-
-        # Multiple Private Keys
-        unless !config.inventory_path && @ssh_info[:private_key_path].size == 1
-          @ssh_info[:private_key_path].each do |key|
-            ssh_options << "-o IdentityFile=#{key}"
-          end
-        end
-
-        # SSH Forwarding
-        ssh_options << "-o ForwardAgent=yes" if @ssh_info[:forward_agent]
-
-        # Unchecked SSH Parameters
-        ssh_options.concat(self.as_array(config.raw_ssh_args)) if config.raw_ssh_args
-
-        # Re-enable ControlPersist Ansible defaults,
-        # which are lost when ANSIBLE_SSH_ARGS is defined.
-        unless ssh_options.empty?
-          ssh_options << "-o ControlMaster=auto"
-          ssh_options << "-o ControlPersist=60s"
-          # Intentionally keep ControlPath undefined to let ansible-playbook
-          # automatically sets this option to Ansible default value
-        end
-
-        ssh_options.join(' ')
-      end
-
-      def as_list_argument(v)
-        v.kind_of?(Array) ? v.join(',') : v
-      end
-
-      def as_array(v)
-        v.kind_of?(Array) ? v : [v]
-      end
-
-      def show_ansible_playbook_command(env, command)
-        shell_command = ''
-        env.each_pair do |k, v|
-          if k == 'ANSIBLE_SSH_ARGS'
-            shell_command += "#{k}='#{v}' "
-          else
-            shell_command += "#{k}=#{v} "
-          end
-        end
-
-        shell_arg = []
-        command.each do |arg|
-          if arg =~ /(--start-at-task|--limit)=(.+)/
-            shell_arg << "#{$1}='#{$2}'"
-          else
-            shell_arg << arg
-          end
-        end
-
-        shell_command += shell_arg.join(' ')
-
-        @machine.env.ui.detail(shell_command)
-      end
-    end
-  end
-end
diff --git a/plugins/provisioners/ansible/provisioner/base.rb b/plugins/provisioners/ansible/provisioner/base.rb
new file mode 100644
index 000000000..051473271
--- /dev/null
+++ b/plugins/provisioners/ansible/provisioner/base.rb
@@ -0,0 +1,151 @@
+require_relative "../errors"
+require_relative "../helpers"
+
+module VagrantPlugins
+  module Ansible
+    module Provisioner
+
+      # This class is a base class where the common functionality shared between
+      # both Ansible provisioners are stored.
+      # This is **not an actual provisioner**.
+      # Instead, {Host} (ansible) or {Guest} (ansible_local) should be used.
+
+      class Base < Vagrant.plugin("2", :provisioner)
+
+        protected
+
+        def initialize(machine, config)
+          super
+
+          @command_arguments = []
+          @environment_variables = {}
+          @inventory_machines = {}
+          @inventory_path = nil
+        end
+
+        def prepare_common_command_arguments
+          # By default we limit by the current machine,
+          # but this can be overridden by the `limit` option.
+          if config.limit
+            @command_arguments << "--limit=#{Helpers::as_list_argument(config.limit)}"
+          else
+            @command_arguments << "--limit=#{@machine.name}"
+          end
+
+          @command_arguments << "--inventory-file=#{inventory_path}"
+          @command_arguments << "--extra-vars=#{extra_vars_argument}" if config.extra_vars
+          @command_arguments << "--sudo" if config.sudo
+          @command_arguments << "--sudo-user=#{config.sudo_user}" if config.sudo_user
+          @command_arguments << "#{verbosity_argument}" if verbosity_is_enabled?
+          @command_arguments << "--vault-password-file=#{config.vault_password_file}" if config.vault_password_file
+          @command_arguments << "--tags=#{Helpers::as_list_argument(config.tags)}" if config.tags
+          @command_arguments << "--skip-tags=#{Helpers::as_list_argument(config.skip_tags)}" if config.skip_tags
+          @command_arguments << "--start-at-task=#{config.start_at_task}" if config.start_at_task
+
+          # Finally, add the raw configuration options, which has the highest precedence
+          # and can therefore potentially override any other options of this provisioner.
+          @command_arguments.concat(Helpers::as_array(config.raw_arguments)) if config.raw_arguments
+        end
+
+        def prepare_common_environment_variables
+          # Ensure Ansible output isn't buffered so that we receive output
+          # on a task-by-task basis.
+          @environment_variables["PYTHONUNBUFFERED"] = 1
+
+          # When Ansible output is piped in Vagrant integration, its default colorization is
+          # automatically disabled and the only way to re-enable colors is to use ANSIBLE_FORCE_COLOR.
+          @environment_variables["ANSIBLE_FORCE_COLOR"] = "true" if @machine.env.ui.color?
+          # Setting ANSIBLE_NOCOLOR is "unnecessary" at the moment, but this could change in the future
+          # (e.g. local provisioner [GH-2103], possible change in vagrant/ansible integration, etc.)
+          @environment_variables["ANSIBLE_NOCOLOR"] = "true" if !@machine.env.ui.color?
+        end
+
+        # Auto-generate "safe" inventory file based on Vagrantfile,
+        # unless inventory_path is explicitly provided
+        def inventory_path
+          if config.inventory_path
+            config.inventory_path
+          else
+            @inventory_path ||= generate_inventory
+          end
+        end
+
+        def generate_inventory
+          inventory = "# Generated by Vagrant\n\n"
+
+            # This "abstract" step must fill the @inventory_machines list
+            # and return the list of supported host(s)
+          inventory += generate_inventory_machines
+
+          inventory += generate_inventory_groups
+
+          # This "abstract" step must create the inventory file and
+          # return its location path
+          # TODO: explain possible race conditions, etc.
+          @inventory_path = ship_generated_inventory(inventory)
+        end
+
+        # Write out groups information.
+        # All defined groups will be included, but only supported
+        # machines and defined child groups will be included.
+        # Group variables are intentionally skipped.
+        def generate_inventory_groups
+          groups_of_groups = {}
+          defined_groups = []
+          inventory_groups = ""
+
+          config.groups.each_pair do |gname, gmembers|
+            # Require that gmembers be an array
+            # (easier to be tolerant and avoid error management of few value)
+            gmembers = [gmembers] if !gmembers.is_a?(Array)
+
+            if gname.end_with?(":children")
+              groups_of_groups[gname] = gmembers
+              defined_groups << gname.sub(/:children$/, '')
+            elsif !gname.include?(':vars')
+              defined_groups << gname
+              inventory_groups += "\n[#{gname}]\n"
+              gmembers.each do |gm|
+                inventory_groups += "#{gm}\n" if @inventory_machines.include?(gm.to_sym)
+              end
+            end
+          end
+
+          defined_groups.uniq!
+          groups_of_groups.each_pair do |gname, gmembers|
+            inventory_groups += "\n[#{gname}]\n"
+            gmembers.each do |gm|
+              inventory_groups += "#{gm}\n" if defined_groups.include?(gm)
+            end
+          end
+
+          return inventory_groups
+        end
+
+        def extra_vars_argument
+          if config.extra_vars.kind_of?(String) and config.extra_vars =~ /^@.+$/
+            # A JSON or YAML file is referenced.
+            config.extra_vars
+          else
+            # Expected to be a Hash after config validation.
+            config.extra_vars.to_json
+          end
+        end
+
+        def verbosity_is_enabled?
+          config.verbose && !config.verbose.to_s.empty?
+        end
+
+        def verbosity_argument
+          if config.verbose.to_s =~ /^-?(v+)$/
+            "-#{$+}"
+          else
+            # safe default, in case input strays
+            '-v'
+          end
+        end
+
+      end
+    end
+  end
+end
diff --git a/plugins/provisioners/ansible/provisioner/guest.rb b/plugins/provisioners/ansible/provisioner/guest.rb
new file mode 100644
index 000000000..3ac35bea1
--- /dev/null
+++ b/plugins/provisioners/ansible/provisioner/guest.rb
@@ -0,0 +1,135 @@
+require 'tempfile'
+
+require_relative "base"
+
+module VagrantPlugins
+  module Ansible
+    module Provisioner
+      class Guest < Base
+
+        def initialize(machine, config)
+          super
+          @logger = Log4r::Logger.new("vagrant::provisioners::ansible_guest")
+        end
+
+        def provision
+          check_and_install_ansible
+          prepare_common_command_arguments
+          prepare_common_environment_variables
+          execute_ansible_playbook_on_guest
+        end
+
+        protected
+
+        #
+        # This handles verifying the Ansible installation, installing it if it was
+        # requested, and so on. This method will raise exceptions if things are wrong.
+        #
+        # Current limitations:
+        #   - The installation of a specific Ansible version is not supported.
+        #     Such feature is difficult to systematically provide via package repositories (apt, yum, ...).
+        #     Installing via pip python packaging or directly from github source would be appropriate,
+        #     but these approaches require more dependency burden.
+        #   - There is no guarantee that the automated installation will replace
+        #     a previous Ansible installation.
+        #
+        def check_and_install_ansible
+          @logger.info("Checking for Ansible installation...")
+
+          # If the guest cannot check if Ansible is installed,
+          # print a warning and try to continue without any installation attempt...
+          if !@machine.guest.capability?(:ansible_installed)
+            @machine.ui.warn(I18n.t("vagrant.provisioners.ansible.cannot_detect"))
+            return
+          end
+
+          # Try to install Ansible (if needed and requested)
+          if config.install &&
+             (config.version == :latest ||
+              !@machine.guest.capability(:ansible_installed, config.version))
+            @machine.ui.detail(I18n.t("vagrant.provisioners.ansible.installing"))
+            @machine.guest.capability(:ansible_install)
+          end
+
+          # Check for the existence of ansible-playbook binary on the guest,
+          @machine.communicate.execute(
+            "ansible-playbook --help",
+            :error_class => Ansible::Errors::AnsibleError,
+            :error_key => :ansible_playbook_app_not_found_on_guest)
+
+          # Check if requested ansible version is available
+          if (!config.version.empty? &&
+              config.version != :latest &&
+              !@machine.guest.capability(:ansible_installed, config.version))
+            raise Ansible::Errors::AnsibleVersionNotFoundOnGuest, required_version: config.version.to_s
+          end
+        end
+
+        def execute_ansible_playbook_on_guest
+          command = (%w(ansible-playbook) << @command_arguments << config.playbook).flatten
+          remote_command = "cd #{config.provisioning_path} && #{Helpers::stringify_ansible_playbook_command(@environment_variables, command)}"
+
+          # TODO: generic HOOK ???    
+          # Show the ansible command in use
+          if verbosity_is_enabled?
+            @machine.env.ui.detail(remote_command)
+          end
+
+          result = execute_on_guest(remote_command)
+          raise Ansible::Errors::AnsiblePlaybookAppFailed if result != 0
+        end
+
+        def execute_on_guest(command)
+          @machine.communicate.execute(command, :error_check => false) do |type, data|
+            if [:stderr, :stdout].include?(type)
+              @machine.env.ui.info(data, :new_line => false, :prefix => false)
+            end
+          end
+        end
+
+        def ship_generated_inventory(inventory_content)
+          inventory_basedir = File.join(config.tmp_path, "inventory")
+          inventory_path = File.join(inventory_basedir, "vagrant_ansible_local_inventory")
+
+          temp_inventory = Tempfile.new("vagrant_ansible_local_inventory_#{@machine.name}")
+          temp_inventory.write(inventory_content)
+          temp_inventory.close
+
+          create_and_chown_remote_folder(inventory_basedir)
+          @machine.communicate.tap do |comm|
+            comm.sudo("rm -f #{inventory_path}", error_check: false)
+            comm.upload(temp_inventory.path, inventory_path)
+          end
+
+          return inventory_path
+        end
+
+        def generate_inventory_machines
+          machines = ""
+
+          # TODO: Instead, why not loop over active_machines and skip missing guests, like in Host?
+          machine.env.machine_names.each do |machine_name|
+            begin
+              @inventory_machines[machine_name] = machine_name
+              if @machine.name == machine_name
+                machines += "#{machine_name} ansible_connection=local\n"
+              else
+                machines += "#{machine_name}\n"
+              end
+            end
+          end
+
+          return machines
+        end
+
+        def create_and_chown_remote_folder(path)
+          @machine.communicate.tap do |comm|
+            comm.sudo("mkdir -p #{path}")
+            comm.sudo("chown -h #{@machine.ssh_info[:username]} #{path}")
+          end
+        end
+
+      end
+    end
+  end
+end
diff --git a/plugins/provisioners/ansible/provisioner/host.rb b/plugins/provisioners/ansible/provisioner/host.rb
new file mode 100644
index 000000000..c72fa8728
--- /dev/null
+++ b/plugins/provisioners/ansible/provisioner/host.rb
@@ -0,0 +1,198 @@
+require "thread"
+
+require_relative "base"
+
+module VagrantPlugins
+  module Ansible
+    module Provisioner
+      class Host < Base
+
+        @@lock = Mutex.new
+
+        def initialize(machine, config)
+          super
+          @logger = Log4r::Logger.new("vagrant::provisioners::ansible_host")
+        end
+
+        def provision
+          # At this stage, the SSH access is guaranteed to be ready
+          @ssh_info = @machine.ssh_info
+
+          warn_for_unsupported_platform
+          prepare_command_arguments
+          prepare_environment_variables
+          execute_ansible_playbook_from_host
+        end
+
+        protected
+
+        def warn_for_unsupported_platform
+          if Vagrant::Util::Platform.windows?
+            @machine.env.ui.warn(I18n.t("vagrant.provisioners.ansible.windows_not_supported_for_control_machine"))
+          end
+        end
+
+        def prepare_command_arguments
+          # By default, connect with Vagrant SSH username
+          @command_arguments << "--user=#{@ssh_info[:username]}"
+
+          # Connect with native OpenSSH client
+          # Other modes (e.g. paramiko) are not officially supported,
+          # but can be enabled via raw_arguments option.
+          @command_arguments << "--connection=ssh"
+
+          # Increase the SSH connection timeout, as the Ansible default value (10 seconds)
+          # is a bit demanding for some overloaded developer boxes. This is particularly
+          # helpful when additional virtual networks are configured, as their availability
+          # is not controlled during vagrant boot process.
+          @command_arguments << "--timeout=30"
+
+          @command_arguments << "--ask-sudo-pass" if config.ask_sudo_pass
+          @command_arguments << "--ask-vault-pass" if config.ask_vault_pass
+
+          prepare_common_command_arguments
+        end
+
+
+        def prepare_environment_variables
+          prepare_common_environment_variables
+
+          # Some Ansible options must be passed as environment variables,
+          # as there is no equivalent command line arguments
+          @environment_variables["ANSIBLE_HOST_KEY_CHECKING"] = "#{config.host_key_checking}"
+
+          # ANSIBLE_SSH_ARGS is required for Multiple SSH keys, SSH forwarding and custom SSH settings
+          @environment_variables["ANSIBLE_SSH_ARGS"] = ansible_ssh_args unless ansible_ssh_args.empty?
+        end
+
+        def execute_ansible_playbook_from_host
+          # Assemble the full ansible-playbook command
+          command = (%w(ansible-playbook) << @command_arguments << config.playbook).flatten
+
+          # TODO: generic HOOK ???    
+          # Show the ansible command in use
+          if verbosity_is_enabled?
+            @machine.env.ui.detail(Helpers::stringify_ansible_playbook_command(@environment_variables, command))
+          end
+
+          # Write stdout and stderr data, since it's the regular Ansible output
+          command << {
+            env: @environment_variables,
+            notify: [:stdout, :stderr],
+            workdir: @machine.env.root_path.to_s
+          }
+
+          begin
+            result = Vagrant::Util::Subprocess.execute(*command) do |type, data|
+              if type == :stdout || type == :stderr
+                @machine.env.ui.info(data, new_line: false, prefix: false)
+              end
+            end
+            raise Ansible::Errors::AnsiblePlaybookAppFailed if result.exit_code != 0
+          rescue Vagrant::Errors::CommandUnavailable
+            raise Ansible::Errors::AnsiblePlaybookAppNotFoundOnHost
+          end
+        end
+
+        def ship_generated_inventory(inventory_content)
+          inventory_path = Pathname.new(File.join(@machine.env.local_data_path.join, %w(provisioners ansible inventory)))
+          FileUtils.mkdir_p(inventory_path) unless File.directory?(inventory_path)
+
+          inventory_file = Pathname.new(File.join(inventory_path, 'vagrant_ansible_inventory'))
+          @@lock.synchronize do
+            if !File.exists?(inventory_file) or inventory_content != File.read(inventory_file)
+              inventory_file.open('w') do |file|
+                file.write(inventory_content)
+              end
+            end
+          end
+
+          return inventory_path
+        end
+
+        def generate_inventory_machines
+          machines = ""
+
+          @machine.env.active_machines.each do |am|
+            begin
+              m = @machine.env.machine(*am)
+              m_ssh_info = m.ssh_info
+              if !m_ssh_info.nil?
+                machines += "#{m.name} ansible_ssh_host=#{m_ssh_info[:host]} ansible_ssh_port=#{m_ssh_info[:port]} ansible_ssh_private_key_file='#{m_ssh_info[:private_key_path][0]}'\n"
+                @inventory_machines[m.name] = m
+              else
+                @logger.error("Auto-generated inventory: Impossible to get SSH information for machine '#{m.name} (#{m.provider_name})'. This machine should be recreated.")
+                # Let a note about this missing machine
+                machines += "# MISSING: '#{m.name}' machine was probably removed without using Vagrant. This machine should be recreated.\n"
+              end
+            rescue Vagrant::Errors::MachineNotFound => e
+              @logger.info("Auto-generated inventory: Skip machine '#{am[0]} (#{am[1]})', which is not configured for this Vagrant environment.")
+            end
+          end
+
+          return machines
+        end
+
+        def ansible_ssh_args
+          @ansible_ssh_args ||= prepare_ansible_ssh_args
+        end
+
+        def prepare_ansible_ssh_args
+          ssh_options = []
+
+          # Use an SSH ProxyCommand when using the Docker provider with the intermediate host
+          if @machine.provider_name == :docker && machine.provider.host_vm?
+            docker_host_ssh_info = machine.provider.host_vm.ssh_info
+
+            proxy_cmd = "ssh #{docker_host_ssh_info[:username]}@#{docker_host_ssh_info[:host]}" +
+              " -p #{docker_host_ssh_info[:port]} -i #{docker_host_ssh_info[:private_key_path][0]}"
+
+            # Use same options than plugins/providers/docker/communicator.rb
+            # Note: this could be improved (DRY'ed) by sharing these settings.
+            proxy_cmd += " -o Compression=yes -o ConnectTimeout=5 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+
+            proxy_cmd += " -o ForwardAgent=yes" if @ssh_info[:forward_agent]
+
+            proxy_cmd += " exec nc %h %p 2>/dev/null"
+
+            ssh_options << "-o ProxyCommand='#{ proxy_cmd }'"
+          end
+
+          # Don't access user's known_hosts file, except when host_key_checking is enabled.
+          ssh_options << "-o UserKnownHostsFile=/dev/null" unless config.host_key_checking
+
+          # Set IdentitiesOnly=yes to avoid authentication errors when the host has more than 5 ssh keys.
+          # Notes:
+          #  - Solaris/OpenSolaris/Illumos uses SunSSH which doesn't support the IdentitiesOnly option.
+          #  - this could be improved by sharing logic with lib/vagrant/util/ssh.rb
+          ssh_options << "-o IdentitiesOnly=yes" unless Vagrant::Util::Platform.solaris?
+
+          # Multiple Private Keys
+          unless !config.inventory_path && @ssh_info[:private_key_path].size == 1
+            @ssh_info[:private_key_path].each do |key|
+              ssh_options << "-o IdentityFile=#{key}"
+            end
+          end
+
+          # SSH Forwarding
+          ssh_options << "-o ForwardAgent=yes" if @ssh_info[:forward_agent]
+
+          # Unchecked SSH Parameters
+          ssh_options.concat(Helpers::as_array(config.raw_ssh_args)) if config.raw_ssh_args
+
+          # Re-enable ControlPersist Ansible defaults,
+          # which are lost when ANSIBLE_SSH_ARGS is defined.
+          unless ssh_options.empty?
+            ssh_options << "-o ControlMaster=auto"
+            ssh_options << "-o ControlPersist=60s"
+            # Intentionally keep ControlPath undefined to let ansible-playbook
+            # automatically sets this option to Ansible default value
+          end
+
+          ssh_options.join(' ')
+        end
+
+      end
+    end
+  end
+end
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 3b7094310..dcd7fef14 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -371,17 +371,6 @@ en:
         Machine name: %{name}
         Active provider: %{active_provider}
         Requested provider: %{requested_provider}
-      ansible_failed: |-
-        Ansible failed to complete successfully. Any error output should be
-        visible above. Please fix these errors and try again.
-      ansible_playbook_app_not_found: |-
-        The "ansible-playbook" program could not be found! Please verify
-        that "ansible-playbook" is available on the PATH of your host
-        system, and try again.
-
-        If you haven't installed Ansible yet, please install Ansible
-        on your system. Vagrant can't do this for you in a safe, automated
-        way. Please see ansible.cc for more info.
       batch_multi_error: |-
         An error occurred while executing multiple actions in parallel.
         Any errors that occurred are shown below.
@@ -2050,11 +2039,52 @@ en:
         upload_path_not_set: "`upload_path` must be set for the shell provisioner."
 
       ansible:
-        no_playbook: "`playbook` must be set for the Ansible provisioner."
-        playbook_path_invalid: "`playbook` for the Ansible provisioner does not exist on the host system: %{path}"
-        inventory_path_invalid: "`inventory_path` for the Ansible provisioner does not exist on the host system: %{path}"
-        vault_password_file_invalid: "`vault_password_file` for the Ansible provisioner does not exist on the host system: %{path}"
-        extra_vars_invalid: "`extra_vars` for the Ansible provisioner must be a hash or a path to an existing file. Received: %{value} (as %{type})"
+        errors:
+          ansible_playbook_app_failed: |-
+            Ansible failed to complete successfully. Any error output should be
+            visible above. Please fix these errors and try again.
+          ansible_playbook_app_not_found_on_guest: |-
+            The "ansible-playbook" program could not be found! Please verify
+            that Ansible is correctly installed on your guest system.
+
+            If you haven't installed Ansible yet, please install Ansible
+            on your Vagrant basebox, or enable the automated setup with the
+            `install` option of this provisioner. Please check
+            http://docs.vagrantup.com/v2/provisioning/ansible_local.html
+            for more information.
+          ansible_version_not_found_on_guest: |-
+            The requested Ansible version (%{required_version}) was not found on the guest.
+            Please check the ansible installation on your guest system,
+            or adapt the `version` option of this provisioner in your Vagrantfile.
+            See http://docs.vagrantup.com/v2/provisioning/ansible_local.html
+            for more information.
+          ansible_playbook_app_not_found_on_host: |-
+            The "ansible-playbook" program could not be found! Please verify
+            that Ansible is correctly installed on your host system.
+
+            If you haven't installed Ansible yet, please install Ansible
+            on your host system. Vagrant can't do this for you in a safe and
+            automated way.
+            Please check http://docs.ansible.com for more information.
+        extra_vars_invalid: |-
+          `extra_vars` for the Ansible provisioner must be a hash or a path to an existing file. Received: %{value} (as %{type})
+        inventory_path_invalid: |-
+          `inventory_path` for the Ansible provisioner does not exist on the %{system}: %{path}
+        no_playbook: |-
+          `playbook` must be set for the Ansible provisioner.
+        playbook_path_invalid: |-
+          `playbook` for the Ansible provisioner does not exist on the %{system}: %{path}
+        vault_password_file_invalid: |-
+          `vault_password_file` for the Ansible provisioner does not exist on the %{system}: %{path}
+        cannot_detect: |-
+          Vagrant does not support detecting whether Ansible is installed
+          for the guest OS running in the machine. Vagrant will assume it is
+          installed and attempt to continue.
+        installing: |-
+          Installing Ansible...
+        windows_not_supported_for_control_machine: |-
+          Windows is not officially supported for the Ansible Control Machine.
+          Please check http://docs.ansible.com/intro_installation.html#control-machine-requirements
 
       docker:
         not_running: "Docker is not running on the guest VM."
diff --git a/test/unit/plugins/provisioners/ansible/config_test.rb b/test/unit/plugins/provisioners/ansible/config_test.rb
index ab1b6dca0..c4d76bcf3 100644
--- a/test/unit/plugins/provisioners/ansible/config_test.rb
+++ b/test/unit/plugins/provisioners/ansible/config_test.rb
@@ -1,9 +1,9 @@
 require_relative "../../../base"
 require_relative "../support/shared/config"
 
-require Vagrant.source_root.join("plugins/provisioners/ansible/config")
+require Vagrant.source_root.join("plugins/provisioners/ansible/config/host")
 
-describe VagrantPlugins::Ansible::Config do
+describe VagrantPlugins::Ansible::Config::Host do
   include_context "unit"
 
   subject { described_class.new }
@@ -15,6 +15,7 @@ describe VagrantPlugins::Ansible::Config do
   it "supports a list of options" do
     config_options = subject.public_methods(false).find_all { |i| i.to_s.end_with?('=') }
     config_options.map! { |i| i.to_s.sub('=', '') }
+
     supported_options = %w( ask_sudo_pass
                             ask_vault_pass
                             extra_vars
@@ -33,7 +34,7 @@ describe VagrantPlugins::Ansible::Config do
                             vault_password_file
                             verbose )
 
-    expect(config_options.sort).to eql(supported_options)
+    expect(get_provisioner_option_names(described_class)).to eql(supported_options)
   end
 
   it "assigns default values to unset options" do
@@ -47,7 +48,7 @@ describe VagrantPlugins::Ansible::Config do
     expect(subject.limit).to be_nil
     expect(subject.sudo).to be_false
     expect(subject.sudo_user).to be_nil
-    expect(subject.verbose).to be_nil
+    expect(subject.verbose).to be_false
     expect(subject.tags).to be_nil
     expect(subject.skip_tags).to be_nil
     expect(subject.start_at_task).to be_nil
@@ -79,7 +80,7 @@ describe VagrantPlugins::Ansible::Config do
       subject.finalize!
 
       result = subject.validate(machine)
-      expect(result["ansible provisioner"]).to eql([])
+      expect(result["ansible remote provisioner"]).to eql([])
     end
 
     it "returns an error if the playbook option is undefined" do
@@ -87,7 +88,7 @@ describe VagrantPlugins::Ansible::Config do
       subject.finalize!
 
       result = subject.validate(machine)
-      expect(result["ansible provisioner"]).to eql([
+      expect(result["ansible remote provisioner"]).to eql([
         I18n.t("vagrant.provisioners.ansible.no_playbook")
       ])
     end
@@ -97,9 +98,9 @@ describe VagrantPlugins::Ansible::Config do
       subject.finalize!
 
       result = subject.validate(machine)
-      expect(result["ansible provisioner"]).to eql([
+      expect(result["ansible remote provisioner"]).to eql([
         I18n.t("vagrant.provisioners.ansible.playbook_path_invalid",
-               path: non_existing_file)
+               path: non_existing_file, system: "host")
       ])
     end
 
@@ -108,7 +109,7 @@ describe VagrantPlugins::Ansible::Config do
       subject.finalize!
 
       result = subject.validate(machine)
-      expect(result["ansible provisioner"]).to eql([])
+      expect(result["ansible remote provisioner"]).to eql([])
     end
 
     it "passes if the extra_vars option is a hash" do
@@ -116,7 +117,7 @@ describe VagrantPlugins::Ansible::Config do
       subject.finalize!
 
       result = subject.validate(machine)
-      expect(result["ansible provisioner"]).to eql([])
+      expect(result["ansible remote provisioner"]).to eql([])
     end
 
     it "returns an error if the extra_vars option refers to a file that does not exist" do
@@ -124,7 +125,7 @@ describe VagrantPlugins::Ansible::Config do
       subject.finalize!
 
       result = subject.validate(machine)
-      expect(result["ansible provisioner"]).to eql([
+      expect(result["ansible remote provisioner"]).to eql([
         I18n.t("vagrant.provisioners.ansible.extra_vars_invalid",
                type:  subject.extra_vars.class.to_s,
                value: subject.extra_vars.to_s)
@@ -136,7 +137,7 @@ describe VagrantPlugins::Ansible::Config do
       subject.finalize!
 
       result = subject.validate(machine)
-      expect(result["ansible provisioner"]).to eql([
+      expect(result["ansible remote provisioner"]).to eql([
         I18n.t("vagrant.provisioners.ansible.extra_vars_invalid",
                type:  subject.extra_vars.class.to_s,
                value: subject.extra_vars.to_s)
@@ -148,7 +149,7 @@ describe VagrantPlugins::Ansible::Config do
       subject.finalize!
 
       result = subject.validate(machine)
-      expect(result["ansible provisioner"]).to eql([])
+      expect(result["ansible remote provisioner"]).to eql([])
     end
 
     it "returns an error if inventory_path is specified, but does not exist" do
@@ -156,9 +157,9 @@ describe VagrantPlugins::Ansible::Config do
       subject.finalize!
 
       result = subject.validate(machine)
-      expect(result["ansible provisioner"]).to eql([
+      expect(result["ansible remote provisioner"]).to eql([
         I18n.t("vagrant.provisioners.ansible.inventory_path_invalid",
-               path: non_existing_file)
+               path: non_existing_file, system: "host")
       ])
     end
 
@@ -167,9 +168,9 @@ describe VagrantPlugins::Ansible::Config do
       subject.finalize!
 
       result = subject.validate(machine)
-      expect(result["ansible provisioner"]).to eql([
+      expect(result["ansible remote provisioner"]).to eql([
         I18n.t("vagrant.provisioners.ansible.vault_password_file_invalid",
-               path: non_existing_file)
+               path: non_existing_file, system: "host")
       ])
     end
 
@@ -180,16 +181,16 @@ describe VagrantPlugins::Ansible::Config do
       subject.finalize!
 
       result = subject.validate(machine)
-      expect(result["ansible provisioner"]).to include(
+      expect(result["ansible remote provisioner"]).to include(
         I18n.t("vagrant.provisioners.ansible.playbook_path_invalid",
-               path: non_existing_file))
-      expect(result["ansible provisioner"]).to include(
+               path: non_existing_file, system: "host"))
+      expect(result["ansible remote provisioner"]).to include(
         I18n.t("vagrant.provisioners.ansible.extra_vars_invalid",
                type:  subject.extra_vars.class.to_s,
                value: subject.extra_vars.to_s))
-      expect(result["ansible provisioner"]).to include(
+      expect(result["ansible remote provisioner"]).to include(
         I18n.t("vagrant.provisioners.ansible.inventory_path_invalid",
-               path: non_existing_file))
+               path: non_existing_file, system: "host"))
     end
 
   end
diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index 24863adc1..29e744a1f 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -1,7 +1,7 @@
 require_relative "../../../base"
 
-require Vagrant.source_root.join("plugins/provisioners/ansible/config")
-require Vagrant.source_root.join("plugins/provisioners/ansible/provisioner")
+require Vagrant.source_root.join("plugins/provisioners/ansible/config/host")
+require Vagrant.source_root.join("plugins/provisioners/ansible/provisioner/host")
 
 #
 # Helper Functions
@@ -15,7 +15,7 @@ def find_last_argument_after(ref_index, ansible_playbook_args, arg_pattern)
   return false
 end
 
-describe VagrantPlugins::Ansible::Provisioner do
+describe VagrantPlugins::Ansible::Provisioner::Host do
   include_context "unit"
 
   subject { described_class.new(machine, config) }
@@ -37,7 +37,7 @@ VF
   end
 
   let(:machine) { iso_env.machine(iso_env.machine_names[0], :dummy) }
-  let(:config)  { VagrantPlugins::Ansible::Config.new }
+  let(:config)  { VagrantPlugins::Ansible::Config::Host.new }
   let(:ssh_info) {{
     private_key_path: ['/path/to/my/key'],
     username: 'testuser',
@@ -202,7 +202,7 @@ VF
         config.finalize!
         Vagrant::Util::Subprocess.stub(execute: Vagrant::Util::Subprocess::Result.new(1, "", ""))
 
-        expect {subject.provision}.to raise_error(Vagrant::Errors::AnsibleFailed)
+        expect {subject.provision}.to raise_error(VagrantPlugins::Ansible::Errors::AnsiblePlaybookAppFailed)
       end
     end
 
@@ -215,16 +215,13 @@ VF
           inventory_content = File.read(generated_inventory_file)
           expect(inventory_content).to_not match(/^\s*\[^\\+\]\s*$/)
 
-          # Note:
-          # The expectation below is a workaround to a possible misuse (or bug) in RSpec/Ruby stack.
-          # If 'args' variable is not required by in this block, the "Vagrant::Util::Subprocess).to receive"
-          # surprisingly expects to receive "no args".
-          # This problem can be "solved" by using args the "unnecessary" (but harmless) expectation below:
-          expect(args.length).to be > 0
+          # Ending this block with a negative expectation (to_not / not_to)
+          # would lead to a failure of the above expectation.
+          true
         }
       end
 
-      it "does not show the ansible-playbook command" do
+      it "doesn't show the ansible-playbook command" do
         expect(machine.env.ui).not_to receive(:detail).with { |full_command|
           expect(full_command).to include("ansible-playbook")
         }
@@ -463,19 +460,69 @@ VF
       end
     end
 
-    describe "with verbose option" do
-      before do
-        config.verbose = 'v'
+    context "with verbose option defined" do
+      %w(vv vvvv).each do |verbose_option|
+
+        describe "with a value of '#{verbose_option}'" do
+          before do
+            config.verbose = verbose_option
+          end
+
+          it_should_set_arguments_and_environment_variables 7
+          it_should_set_optional_arguments({ "verbose" => "-#{verbose_option}" })
+
+          it "shows the ansible-playbook command and set verbosity to '-#{verbose_option}' level" do
+            expect(machine.env.ui).to receive(:detail).with { |full_command|
+              expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --user=testuser --connection=ssh --timeout=30 --limit='machine1' --inventory-file=#{generated_inventory_dir} -#{verbose_option} playbook.yml")
+            }
+          end
+        end
+
+        describe "with a value of '-#{verbose_option}'" do
+          before do
+            config.verbose = "-#{verbose_option}"
+          end
+
+          it_should_set_arguments_and_environment_variables 7
+          it_should_set_optional_arguments({ "verbose" => "-#{verbose_option}" })
+
+          it "shows the ansible-playbook command and set verbosity to '-#{verbose_option}' level" do
+            expect(machine.env.ui).to receive(:detail).with { |full_command|
+              expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --user=testuser --connection=ssh --timeout=30 --limit='machine1' --inventory-file=#{generated_inventory_dir} -#{verbose_option} playbook.yml")
+            }
+          end
+        end
       end
 
-      it_should_set_arguments_and_environment_variables 7
-      it_should_set_optional_arguments({ "verbose" => "-v" })
+      describe "with an invalid string" do
+        before do
+          config.verbose = "wrong"
+        end
 
-      it "shows the ansible-playbook command" do
-        expect(machine.env.ui).to receive(:detail).with { |full_command|
-          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_FORCE_COLOR=true ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --user=testuser --connection=ssh --timeout=30 --limit='machine1' --inventory-file=#{generated_inventory_dir} -v playbook.yml")
-        }
+        it_should_set_arguments_and_environment_variables 7
+        it_should_set_optional_arguments({ "verbose" => "-v" })
+
+        it "shows the ansible-playbook command and set verbosity to '-v' level" do
+          expect(machine.env.ui).to receive(:detail).with { |full_command|
+            expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --user=testuser --connection=ssh --timeout=30 --limit='machine1' --inventory-file=#{generated_inventory_dir} -v playbook.yml")
+          }
+        end
       end
+
+      describe "with an empty string" do
+        before do
+          config.verbose = ""
+        end
+
+        it_should_set_arguments_and_environment_variables
+
+        it "doesn't show the ansible-playbook command" do
+          expect(machine.env.ui).not_to receive(:detail).with { |full_command|
+            expect(full_command).to include("ansible-playbook")
+          }
+        end
+      end
+
     end
 
     describe "without colorized output" do
@@ -492,9 +539,8 @@ VF
       end
     end
 
-    # Note:
-    # The Vagrant Ansible provisioner does not validate the coherency of argument combinations,
-    # and let ansible-playbook complain.
+    # The Vagrant Ansible provisioner does not validate the coherency of
+    # argument combinations, and let ansible-playbook complain.
     describe "with a maximum of options" do
       before do
         # vagrant general options
@@ -547,7 +593,7 @@ VF
 
       it "shows the ansible-playbook command, with additional quotes when required" do
         expect(machine.env.ui).to receive(:detail).with { |full_command|
-          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_HOST_KEY_CHECKING=true ANSIBLE_FORCE_COLOR=true ANSIBLE_SSH_ARGS='-o IdentitiesOnly=yes -o IdentityFile=/my/key1 -o IdentityFile=/my/key2 -o ForwardAgent=yes -o ControlMaster=no -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --user=testuser --connection=ssh --timeout=30 --limit='machine*:&vagrant:!that_one' --inventory-file=#{generated_inventory_dir} --extra-vars=@#{File.expand_path(__FILE__)} --sudo --sudo-user=deployer -vvv --ask-sudo-pass --ask-vault-pass --vault-password-file=#{File.expand_path(__FILE__)} --tags=db,www --skip-tags=foo,bar --start-at-task='an awesome task' --why-not --su-user=foot --ask-su-pass --limit='all' --private-key=./myself.key playbook.yml")
+          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=true ANSIBLE_SSH_ARGS='-o IdentitiesOnly=yes -o IdentityFile=/my/key1 -o IdentityFile=/my/key2 -o ForwardAgent=yes -o ControlMaster=no -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --user=testuser --connection=ssh --timeout=30 --ask-sudo-pass --ask-vault-pass --limit='machine*:&vagrant:!that_one' --inventory-file=#{generated_inventory_dir} --extra-vars=@#{File.expand_path(__FILE__)} --sudo --sudo-user=deployer -vvv --vault-password-file=#{File.expand_path(__FILE__)} --tags=db,www --skip-tags=foo,bar --start-at-task='an awesome task' --why-not --su-user=foot --ask-su-pass --limit='all' --private-key=./myself.key playbook.yml")
         }
       end
     end
@@ -598,12 +644,9 @@ VF
           cmd_opts = args.last
           expect(cmd_opts[:env]['ANSIBLE_SSH_ARGS']).to_not include("-o IdentitiesOnly=yes")
 
-          # Note:
-          # The expectation below is a workaround to a possible misuse (or bug) in RSpec/Ruby stack.
-          # If 'args' variable is not required by in this block, the "Vagrant::Util::Subprocess).to receive"
-          # surprisingly expects to receive "no args".
-          # This problem can be "solved" by using args the "unnecessary" (but harmless) expectation below:
-          expect(true).to be_true
+          # Ending this block with a negative expectation (to_not / not_to)
+          # would lead to a failure of the above expectation.
+          true
         }
       end
 
@@ -615,12 +658,9 @@ VF
             cmd_opts = args.last
             expect(cmd_opts[:env]).to_not include('ANSIBLE_SSH_ARGS')
 
-            # Note:
-            # The expectation below is a workaround to a possible misuse (or bug) in RSpec/Ruby stack.
-            # If 'args' variable is not required by in this block, the "Vagrant::Util::Subprocess).to receive"
-            # surprisingly expects to receive "no args".
-            # This problem can be "solved" by using args the "unnecessary" (but harmless) expectation below:
-            expect(true).to be_true
+            # Ending this block with a negative expectation (to_not / not_to)
+            # would lead to a failure of the above expectation.
+            true
           }
         end
       end
diff --git a/test/unit/plugins/provisioners/support/shared/config.rb b/test/unit/plugins/provisioners/support/shared/config.rb
index 052a10b4a..db7aaaeaa 100644
--- a/test/unit/plugins/provisioners/support/shared/config.rb
+++ b/test/unit/plugins/provisioners/support/shared/config.rb
@@ -1,3 +1,9 @@
+def get_provisioner_option_names(provisioner_class)
+  config_options = provisioner_class.instance_methods(true).find_all { |i| i.to_s.end_with?('=') }
+  config_options.map! { |i| i.to_s.sub('=', '') }
+  (config_options - ["!", "=", "=="]).sort
+end
+
 shared_examples_for 'any VagrantConfigProvisioner strict boolean attribute' do |attr_name, attr_default_value|
 
   [true, false].each do |bool|
diff --git a/website/docs/source/layouts/layout.erb b/website/docs/source/layouts/layout.erb
index 259577d79..bd7b056f4 100644
--- a/website/docs/source/layouts/layout.erb
+++ b/website/docs/source/layouts/layout.erb
@@ -160,6 +160,7 @@
 									<li<%= sidebar_current("provisioning-file") %>><a href="/v2/provisioning/file.html">File</a></li>
 									<li<%= sidebar_current("provisioning-shell") %>><a href="/v2/provisioning/shell.html">Shell</a></li>
 									<li<%= sidebar_current("provisioning-ansible") %>><a href="/v2/provisioning/ansible.html">Ansible</a></li>
+									<li<%= sidebar_current("provisioning-ansible-local") %>><a href="/v2/provisioning/ansible_local.html">Ansible Local</a></li>
 									<li<%= sidebar_current("provisioning-cfengine") %>><a href="/v2/provisioning/cfengine.html">CFEngine</a></li>
 									<li<%= sidebar_current("provisioning-chefsolo") %>><a href="/v2/provisioning/chef_solo.html">Chef Solo</a></li>
 									<li<%= sidebar_current("provisioning-chefzero") %>><a href="/v2/provisioning/chef_zero.html">Chef Zero</a></li>
diff --git a/website/docs/source/v2/provisioning/ansible.html.md b/website/docs/source/v2/provisioning/ansible.html.md
index 381cf5bd1..ca7bdf87c 100644
--- a/website/docs/source/v2/provisioning/ansible.html.md
+++ b/website/docs/source/v2/provisioning/ansible.html.md
@@ -5,16 +5,9 @@ sidebar_current: "provisioning-ansible"
 
 # Ansible Provisioner
 
-**Provisioner name: `"ansible"`**
+**Provisioner name: `ansible`**
 
-The ansible provisioner allows you to provision the guest using
-[Ansible](http://ansible.com) playbooks by executing `ansible-playbook` from the Vagrant host.
-
-Ansible playbooks are [YAML](http://en.wikipedia.org/wiki/YAML) documents that
-comprise the set of steps to be orchestrated on one or more machines. This documentation
-page will not go into how to use Ansible or how to write Ansible playbooks, since Ansible
-is a complete deployment and configuration management system that is beyond the scope of
-a single page of documentation.
+The Ansible provisioner allows you to provision the guest using [Ansible](http://ansible.com) playbooks by executing **`ansible-playbook` from the Vagrant host**.
 
 <div class="alert alert-warn">
   <p>
@@ -27,199 +20,54 @@ a single page of documentation.
 
 ## Setup Requirements
 
-* [Install Ansible](http://docs.ansible.com/intro_installation.html#installing-the-control-machine) on your Vagrant host.
-* Your Vagrant host should ideally provide a recent version of OpenSSH that [supports ControlPersist](http://docs.ansible.com/faq.html#how-do-i-get-ansible-to-reuse-connections-enable-kerberized-ssh-or-have-ansible-pay-attention-to-my-local-ssh-config-file)
+  - **[Install Ansible](http://docs.ansible.com/intro_installation.html#installing-the-control-machine) on your Vagrant host**.
 
-## Inventory File
+  - Your Vagrant host should ideally provide a recent version of OpenSSH that [supports ControlPersist](http://docs.ansible.com/faq.html#how-do-i-get-ansible-to-reuse-connections-enable-kerberized-ssh-or-have-ansible-pay-attention-to-my-local-ssh-config-file).
 
-When using Ansible, it needs to know on which machines a given playbook should run. It does
-this by way of an [inventory](http://docs.ansible.com/intro_inventory.html) file which lists those machines.
-In the context of Vagrant, there are two ways to approach working with inventory files.
+If installing Ansible directly on the Vagrant host is not an option in your development environment, you might be looking for the <a href="/v2/provisioning/ansible_local.html">Ansible Local provisioner</a> alternative.
 
-### Auto-Generated Inventory
+## Usage
 
-The first and simplest option is to not provide one to Vagrant at all. Vagrant will generate an
-inventory file encompassing all of the virtual machines it manages, and use it for provisioning
-machines. The generated inventory file is stored as part of your local Vagrant environment in `.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory`.
+This page only documents the specific parts of the `ansible` (remote) provisioner. General Ansible concepts like Playbook or Inventory are shortly explained in the [introduction to Ansible and Vagrant](/v2/provisioning/ansible_intro.html).
 
-**Groups of Hosts**
+### Simplest Configuration
 
-The `ansible.groups` option can be used to pass a hash of group names and group members to be included in the generated inventory file.
-
-With this configuration example:
-
-```
-ansible.groups = {
-  "group1" => ["machine1"],
-  "group2" => ["machine2"],
-  "all_groups:children" => ["group1", "group2"]
-}
-```
-
-Vagrant would generate an inventory file that might look like:
-
-```
-# Generated by Vagrant
-
-machine1 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2200 ansible_ssh_private_key_file=/home/.../.vagrant/machines/machine1/virtualbox/private_key
-machine2 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2201 ansible_ssh_private_key_file=/home/.../.vagrant/machines/machine2/virtualbox/private_key
-
-[group1]
-machine1
-
-[group2]
-machine2
-
-[all_groups:children]
-group1
-group2
-```
-
-**Notes**
-
- * The generation of group variables blocks (e.g. `[group1:vars]`) are intentionally not supported, as it is [not recommended to store group variables in the main inventory file](http://docs.ansible.com/intro_inventory.html#splitting-out-host-and-group-specific-data). A good practice is to store these group (or host) variables in `YAML` files stored in `group_vars/` or `host_vars/` directories in the playbook (or inventory) directory.
- * Unmanaged machines and undefined groups are not added to the inventory, to avoid useless Ansible errors (e.g. *unreachable host* or *undefined child group*)
- * Prior to Vagrant 1.7.3, the `ansible_ssh_private_key_file` variable was not set in generated inventory, but passed as command line argument to `ansible-playbook` command.
-
-For example, `machine3`, `group3` and `group1:vars` in the example below would not be added to the generated inventory file:
-
-```
-ansible.groups = {
-  "group1" => ["machine1"],
-  "group2" => ["machine2", "machine3"],
-  "all_groups:children" => ["group1", "group2", "group3"],
-  "group1:vars" => { "variable1" => 9, "variable2" => "example" }
-}
-```
-
-### Static Inventory
-
-The second option is for situations where you'd like to have more control over the inventory management.
-With the `ansible.inventory_path` option, you can reference a specific inventory resource (e.g. a static inventory file, a [dynamic inventory script](http://docs.ansible.com/intro_dynamic_inventory.html) or even [multiple inventories stored in the same directory](http://docs.ansible.com/intro_dynamic_inventory.html#using-multiple-inventory-sources)). Vagrant will then use this inventory information instead of generating it.
-
-A very simple inventory file for use with Vagrant might look like:
-
-```
-default ansible_ssh_host=192.168.111.222
-```
-
-Where the above IP address is one set in your Vagrantfile:
-
-```
-config.vm.network :private_network, ip: "192.168.111.222"
-```
-
-**Notes:**
-
- * The machine names in `Vagrantfile` and `ansible.inventory_path` files should correspond, unless you use `ansible.limit` option to reference the correct machines.
- * The SSH host addresses (and ports) must obviously be specified twice, in `Vagrantfile` and `ansible.inventory_path` files.
-
-## Playbook
-
-The second component of a successful Ansible provisioner setup is the Ansible playbook
-which contains the steps that should be run on the guest. Ansible's
-[playbook documentation](http://docs.ansible.com/playbooks.html) goes into great
-detail on how to author playbooks, and there are a number of
-[best practices](http://docs.ansible.com/playbooks_best_practices.html) that can be applied to use
-Ansible's powerful features effectively. A playbook that installs and starts (or restarts
-if it was updated) the NTP daemon via YUM looks like:
-
-```
----
-- hosts: all
-  tasks:
-    - name: ensure ntpd is at the latest version
-      yum: pkg=ntp state=latest
-      notify:
-      - restart ntpd
-  handlers:
-    - name: restart ntpd
-      service: name=ntpd state=restarted
-```
-
-You can of course target other operating systems that don't have YUM by changing the
-playbook tasks. Ansible ships with a number of [modules](http://docs.ansible.com/modules.html)
-that make running otherwise tedious tasks dead simple.
-
-## Running Ansible
-
-To run Ansible against your Vagrant guest, the basic Vagrantfile configuration looks like:
+To run Ansible against your Vagrant guest, the basic `Vagrantfile` configuration looks like:
 
 ```ruby
-Vagrant.configure("2") do |config|
+Vagrant.configure(2) do |config|
+
+  #
+  # Run Ansible from the Vagrant Host
+  #
   config.vm.provision "ansible" do |ansible|
     ansible.playbook = "playbook.yml"
   end
+
 end
 ```
 
-Since an Ansible playbook can include many files, you may also collect the related files in
-a directory structure like this:
+##  Options
 
-```
-$ tree
-.
-|-- Vagrantfile
-|-- provisioning
-|   |-- group_vars
-|           |-- all
-|   |-- playbook.yml
-```
+This section lists the specific options for the Ansible (remote) provisioner. In addition to the options listed below, this provisioner supports the [common options for both Ansible provisioners](/v2/provisioning/ansible_common.html).
 
-In such an arrangement, the `ansible.playbook` path should be adjusted accordingly:
+- `ask_sudo_pass` (boolean) - require Ansible to [prompt for a sudo password](http://docs.ansible.com/intro_getting_started.html#remote-connection-information).
 
-```ruby
-Vagrant.configure("2") do |config|
-  config.vm.provision "ansible" do |ansible|
-    ansible.playbook = "provisioning/playbook.yml"
-  end
-end
-```
+  The default value is `false`.
 
-Vagrant will try to run the `playbook.yml` playbook against all machines defined in your Vagrantfile.
+- `ask_vault_pass` (boolean) - require Ansible to [prompt for a vault password](http://docs.ansible.com/playbooks_vault.html#vault).
 
-**Backward Compatibility Note**:
+  The default value is `false`.
 
-Up to Vagrant 1.4, the Ansible provisioner could potentially connect (multiple times) to all hosts from the inventory file.
-This behaviour is still possible by setting `ansible.limit = 'all'` (see more details below).
+- `host_key_checking` (boolean) - require Ansible to [enable SSH host key checking](http://docs.ansible.com/intro_getting_started.html#host-key-checking).
 
-## Additional Options
+  The default value is `false`.
 
-The Ansible provisioner also includes a number of additional options that can be set,
-all of which get passed to the `ansible-playbook` command that ships with Ansible.
+- `raw_ssh_args` (array of strings) - require Ansible to apply a list of OpenSSH client options.
 
-* `ansible.extra_vars` can be used to pass additional variables (with highest priority) to the playbook. This parameter can be a path to a JSON or YAML file, or a hash. For example:
+  Example: `['-o ControlMaster=no']`.
 
-    ```
-    ansible.extra_vars = {
-      ntp_server: "pool.ntp.org",
-      nginx: {
-        port: 8008,
-        workers: 4
-      }
-    }
-    ```
-    These variables take the highest precedence over any other variables.
-* `ansible.sudo` can be set to `true` to cause Ansible to perform commands using sudo.
-* `ansible.sudo_user` can be set to a string containing a username on the guest who should be used
-by the sudo command.
-* `ansible.ask_sudo_pass` can be set to `true` to require Ansible to prompt for a sudo password.
-* `ansible.ask_vault_pass` can be set to `true` to require Ansible to prompt for a vault password.
-* `ansible.vault_password_file` can be set to a string containing the path of a file containing the password used by Ansible Vault.
-* `ansible.limit` can be set to a string or an array of machines or groups from the inventory file to further control which hosts are affected. Note that:
-  * As of Vagrant 1.5, the machine name (taken from Vagrantfile) is set as **default limit** to ensure that `vagrant provision` steps only affect the expected machine. Setting `ansible.limit` will override this default.
-  * Setting `ansible.limit = 'all'` can be used to make Ansible connect to all machines from the inventory file.
-* `ansible.verbose` can be set to increase Ansible's verbosity to obtain detailed logging:
-  * `'v'`, verbose mode
-  * `'vv'`
-  * `'vvv'`, more
-  * `'vvvv'`, connection debugging
-* `ansible.tags` can be set to a string or an array of tags. Only plays, roles and tasks tagged with these values will be executed.
-* `ansible.skip_tags` can be set to a string or an array of tags. Only plays, roles and tasks that *do not match* these values will be executed.
-* `ansible.start_at_task` can be set to a string corresponding to the task name where the playbook provision will start.
-* `ansible.raw_arguments` can be set to an array of strings corresponding to a list of `ansible-playbook` arguments (e.g. `['--check', '-M /my/modules']`). It is an *unsafe wildcard* that can be used to apply Ansible options that are not (yet) supported by this Vagrant provisioner. As of Vagrant 1.7, `raw_arguments` has the highest priority and its values can potentially override or break other Vagrant settings.
-* `ansible.raw_ssh_args` can be set to an array of strings corresponding to a list of OpenSSH client parameters (e.g. `['-o ControlMaster=no']`). It is an *unsafe wildcard* that can be used to pass additional SSH settings to Ansible via `ANSIBLE_SSH_ARGS` environment variable.
-* `ansible.host_key_checking` can be set to `true` which will enable host key checking. As of Vagrant 1.5, the default value is `false` and as of Vagrant 1.7 the user known host file (e.g. `~/.ssh/known_hosts`) is no longer read nor modified. In other words: by default, the Ansible provisioner behaves the same as Vagrant native commands (e.g `vagrant ssh`).
+  It is an *unsafe wildcard* that can be used to pass additional SSH settings to Ansible via `ANSIBLE_SSH_ARGS` environment variable, overriding any other SSH arguments (e.g. defined in an [`ansible.cfg` configuration file](http://docs.ansible.com/intro_configuration.html#ssh-args)).
 
 ## Tips and Tricks
 
@@ -265,15 +113,7 @@ end
 
 If you apply this parallel provisioning pattern with a static Ansible inventory, you'll have to organize the things so that [all the relevant private keys are provided to the `ansible-playbook` command](https://github.com/mitchellh/vagrant/pull/5765#issuecomment-120247738). The same kind of considerations applies if you are using multiple private keys for a same machine (see [`config.ssh.private_key_path` SSH setting](/v2/vagrantfile/ssh_settings.html)).
 
-### Provide a local `ansible.cfg` file
-
-Certain settings in Ansible are (only) adjustable via a [configuration file](http://docs.ansible.com/intro_configuration.html), and you might want to ship such a file in your Vagrant project.
-
-As `ansible-playbook` command looks for local `ansible.cfg` configuration file in its *current directory* (but not in the directory that contains the main playbook), you have to store this file adjacent to your Vagrantfile.
-
-Note that it is also possible to reference an Ansible configuration file via `ANSIBLE_CONFIG` environment variable, if you want to be flexible about the location of this file.
-
-### Why does the Ansible provisioner connect as the wrong user?
+### Troubleshooting SSH Connection Errors
 
 It is good to know that the following Ansible settings always override the `config.ssh.username` option defined in [Vagrant SSH Settings](/v2/vagrantfile/ssh_settings.html):
 
@@ -304,7 +144,6 @@ The Ansible provisioner is implemented with native OpenSSH support in mind, and
 
 If you really need to use this connection mode, it is though possible to enable paramiko as illustrated in the following configuration examples:
 
-
 With auto-generated inventory:
 
 ```
diff --git a/website/docs/source/v2/provisioning/ansible_common.html.md b/website/docs/source/v2/provisioning/ansible_common.html.md
new file mode 100644
index 000000000..3b6d7fbc1
--- /dev/null
+++ b/website/docs/source/v2/provisioning/ansible_common.html.md
@@ -0,0 +1,86 @@
+---
+page_title: "Common Ansible Options - Provisioning"
+sidebar_current: "provisioning-ansible-common"
+---
+
+# Shared Ansible Options
+
+The following options are available to both Ansible provisioners:
+
+ - [`ansible`](/v2/provisioning/ansible.html)
+ - [`ansible_local`](/v2/provisioning/ansible_local.html)
+
+These options get passed to the `ansible-playbook` command that ships with Ansible, either via command line arguments or environment variables, depending on Ansible own capabilities.
+
+Some of these options are for advanced usage only and should not be used unless you understand their purpose.
+
+- `extra_vars` (string or hash) - Pass additional variables (with highest priority) to the playbook.
+
+  This parameter can be a path to a JSON or YAML file, or a hash.
+
+  Example:
+
+    ```ruby
+    ansible.extra_vars = {
+      ntp_server: "pool.ntp.org",
+      nginx: {
+        port: 8008,
+        workers: 4
+      }
+    }
+    ```
+  These variables take the highest precedence over any other variables.
+
+- `groups` (hash) - Set of inventory groups to be included in the [auto-generated inventory file](/v2/provisioning/ansible_intro.html).
+
+  Example:
+
+    ```ruby
+    ansible.groups = {
+      "web" => ["vm1", "vm2"],
+      "db"  => ["vm3"]
+    }
+    ```
+
+  Notes:
+
+    - Alphanumeric patterns are not supported (e.g. `db-[a:f]`, `vm[01:10]`).
+    - This option has no effect when the `inventory_path` option is defined.
+
+- `inventory_path` (string) - The path to an Ansible inventory resource (e.g. a [static inventory file](http://docs.ansible.com/intro_inventory.html), a [dynamic inventory script](http://docs.ansible.com/intro_dynamic_inventory.html) or even [multiple inventories stored in the same directory](http://docs.ansible.com/intro_dynamic_inventory.html#using-multiple-inventory-sources)).
+
+  By default, this option is disabled and Vagrant generates an inventory based on the `Vagrantfile` information.
+
+- `limit` (string or array of strings) - Set of machines or groups from the inventory file to further control which hosts [are affected](http://docs.ansible.com/glossary.html#limit-groups).
+
+  The default value is set to the machine name (taken from `Vagrantfile`) to ensure that `vagrant provision` command only affect the expected machine.
+
+  Setting `limit = "all"` can be used to make Ansible connect to all machines from the inventory file.
+
+- `raw_arguments` (array of strings) - a list of additional `ansible-playbook` arguments.
+
+  It is an *unsafe wildcard* that can be used to apply Ansible options that are not (yet) supported by this Vagrant provisioner. As of Vagrant 1.7, `raw_arguments` has the highest priority and its values can potentially override or break other Vagrant settings.
+
+  Example: `['--check', '-M /my/modules']`).
+
+- `skip_tags` (string or array of strings) - Only plays, roles and tasks that [*do not match* these values will be executed](http://docs.ansible.com/playbooks_tags.html).
+
+- `start_at_task` (string) - The task name where the [playbook execution will start](http://docs.ansible.com/playbooks_startnstep.html#start-at-task).
+
+- `sudo` (boolean) - Cause Ansible to perform all the playbook tasks [using sudo](http://docs.ansible.com/glossary.html#sudo).
+
+  The default value is `false`.
+
+- `sudo_user` (string) - set the default username who should be used by the sudo command.
+
+- `tags` (string or array of strings) - Only plays, roles and tasks [tagged with these values will be executed](http://docs.ansible.com/playbooks_tags.html) .
+
+- `verbose` (boolean or string) - Set Ansible's verbosity to obtain detailed logging
+
+  Default value is `false` (minimal verbosity).
+
+  Examples: `true` (equivalent to `v`), `-vvv` (equivalent to `vvv`), `vvvv`.
+
+  Note that when the `verbose` option is enabled, the `ansible-playbook` command used by Vagrant will be displayed.
+
+- `vault_password_file` (string) - The path of a file containing the password used by [Ansible Vault](http://docs.ansible.com/playbooks_vault.html#vault).
diff --git a/website/docs/source/v2/provisioning/ansible_intro.html.md b/website/docs/source/v2/provisioning/ansible_intro.html.md
new file mode 100644
index 000000000..0b4d4d38f
--- /dev/null
+++ b/website/docs/source/v2/provisioning/ansible_intro.html.md
@@ -0,0 +1,208 @@
+---
+page_title: "Ansible - Short Introduction"
+sidebar_current: "provisioning-ansible-intro"
+---
+
+# Ansible and Vagrant
+
+The information below is applicable to both Ansible provisioners:
+
+ - [`ansible`](/v2/provisioning/ansible.html), where Ansible is executed on the **Vagrant host**
+
+ - [`ansible_local`](/v2/provisioning/ansible_local.html), where Ansible is executed on the **Vagrant guest**
+
+The list of common options for these two provisioners is documented in a [separate documentation page](/v2/provisioning/ansible_common.html).
+
+This documentation page will not go into how to use Ansible or how to write Ansible playbooks, since Ansible is a complete deployment and configuration management system that is beyond the scope of Vagrant documentation.
+
+To learn more about Ansible, please consult the [Ansible Documentation Site](http://docs.ansible.com/).
+
+## The Playbook File
+
+The first component of a successful Ansible provisioner setup is the Ansible playbook which contains the steps that should be run on the guest. Ansible's
+[playbook documentation](http://docs.ansible.com/playbooks.html) goes into great detail on how to author playbooks, and there are a number of [best practices](http://docs.ansible.com/playbooks_best_practices.html) that can be applied to use Ansible's powerful features effectively.
+
+A playbook that installs and starts (or restarts) the NTP daemon via YUM looks like:
+
+```
+---
+- hosts: all
+  tasks:
+    - name: ensure ntpd is at the latest version
+      yum: pkg=ntp state=latest
+      notify:
+      - restart ntpd
+  handlers:
+    - name: restart ntpd
+      service: name=ntpd state=restarted
+```
+
+You can of course target other operating systems that don't have YUM by changing the playbook tasks. Ansible ships with a number of [modules](http://docs.ansible.com/modules.html) that make running otherwise tedious tasks dead simple.
+
+### Running Ansible
+
+The `playbook` option is strictly required by both Ansible provisioners ([`ansible`](/v2/provisioning/ansible.html) and [`ansible_local`](/v2/provisioning/ansible_local.html)), as illustrated in this basic Vagrantfile` configuration:
+
+```ruby
+Vagrant.configure(2) do |config|
+
+  # Use :ansible or :ansible_local to
+  # select the provisioner of your choice
+  config.vm.provision :ansible do |ansible|
+    ansible.playbook = "playbook.yml"
+  end
+end
+```
+
+Since an Ansible playbook can include many files, you may also collect the related files in a [directory structure](http://docs.ansible.com/playbooks_best_practices.html#directory-layout) like this:
+
+```
+.
+|-- Vagrantfile
+|-- provisioning
+|   |-- group_vars
+|           |-- all
+|   |-- roles
+|           |-- bar
+|           |-- foo
+|   |-- playbook.yml
+```
+
+In such an arrangement, the `ansible.playbook` path should be adjusted accordingly:
+
+```ruby
+Vagrant.configure(2) do |config|
+  config.vm.provision "ansible" do |ansible|
+    ansible.playbook = "provisioning/playbook.yml"
+  end
+end
+```
+
+## The Inventory File
+
+When using Ansible, it needs to know on which machines a given playbook should run. It does this by way of an [inventory](http://docs.ansible.com/intro_inventory.html) file which lists those machines. In the context of Vagrant, there are two ways to approach working with inventory files.
+
+### Auto-Generated Inventory
+
+The first and simplest option is to not provide one to Vagrant at all. Vagrant will generate an inventory file encompassing all of the virtual machines it manages, and use it for provisioning machines.
+
+**Example with the [`ansible`](/v2/provisioning/ansible.html) provisioner:**
+
+```
+# Generated by Vagrant
+
+default ansible_ssh_host=127.0.0.1 ansible_ssh_port=2200 ansible_ssh_private_key_file='/home/.../.vagrant/machines/default/virtualbox/private_key'
+```
+
+Note that the generated inventory file is stored as part of your local Vagrant environment in
+`.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory`.
+
+**Example with the [`ansible_local`](/v2/provisioning/ansible_local.html) provisioner:**
+
+```
+# Generated by Vagrant
+
+default ansible_connection=local
+```
+
+Note that the generated inventory file is uploaded to the guest VM in a subdirectory of [`tmp_path`](/v2/provisioning/ansible_local.html), e.g. `/tmp/vagrant-ansible/inventory/vagrant_ansible_local_inventory`.
+
+**How to generate Inventory Groups:**
+
+The [`groups`](/v2/provisioning/ansible_common.html) option can be used to pass a hash of group names and group members to be included in the generated inventory file.
+
+With this configuration example:
+
+```
+Vagrant.configure(2) do |config|
+
+  config.vm.box = "ubuntu/trusty64"
+
+  config.vm.define "machine1"
+  config.vm.define "machine2"
+
+  config.vm.provision "ansible" do |ansible|
+    ansible.playbook = "playbook.yml"
+    ansible.groups = {
+      "group1" => ["machine1"],
+      "group2" => ["machine2"],
+      "all_groups:children" => ["group1", "group2"]
+    }
+  end
+end
+```
+
+Vagrant would generate an inventory file that might look like:
+
+```
+# Generated by Vagrant
+
+machine1 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2200 ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine1/virtualbox/private_key'
+machine2 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2222 ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine2/virtualbox/private_key'
+
+[group1]
+machine1
+
+[group2]
+machine2
+
+[all_groups:children]
+group1
+group2
+```
+
+**Notes:**
+
+  - Prior to Vagrant 1.7.3, the `ansible_ssh_private_key_file` variable was not set in generated inventory, but passed as command line argument to `ansible-playbook` command.
+  - The generation of group variables blocks (e.g. `[group1:vars]`) are intentionally not supported, as it is [not recommended to store group variables in the main inventory file](http://docs.ansible.com/intro_inventory.html#splitting-out-host-and-group-specific-data). A good practice is to store these group (or host) variables in `YAML` files stored in `group_vars/` or `host_vars/` directories in the playbook (or inventory) directory.
+  - Unmanaged machines and undefined groups are not added to the inventory, to avoid useless Ansible errors (e.g. *unreachable host* or *undefined child group*)
+
+For example, `machine3`, `group3` and `group1:vars` in the example below would not be added to the generated inventory file:
+
+```
+ansible.groups = {
+  "group1" => ["machine1"],
+  "group2" => ["machine2", "machine3"],
+  "all_groups:children" => ["group1", "group2", "group3"],
+  "group1:vars" => { "variable1" => 9, "variable2" => "example" }
+}
+```
+
+### Static Inventory
+
+The second option is for situations where you'd like to have more control over the inventory management.
+
+With the `inventory_path` option, you can reference a specific inventory resource (e.g. a static inventory file, a [dynamic inventory script](http://docs.ansible.com/intro_dynamic_inventory.html) or even [multiple inventories stored in the same directory](http://docs.ansible.com/intro_dynamic_inventory.html#using-multiple-inventory-sources)). Vagrant will then use this inventory information instead of generating it.
+
+A very simple inventory file for use with Vagrant might look like:
+
+```
+default ansible_ssh_host=192.168.111.222
+```
+
+Where the above IP address is one set in your Vagrantfile:
+
+```
+config.vm.network :private_network, ip: "192.168.111.222"
+```
+
+**Notes:**
+
+ - The machine names in `Vagrantfile` and `ansible.inventory_path` files should correspond, unless you use `ansible.limit` option to reference the correct machines.
+ - The SSH host addresses (and ports) must obviously be specified twice, in `Vagrantfile` and `ansible.inventory_path` files.
+ - Sharing hostnames across Vagrant host and guests might be a good idea (e.g. with some Ansible configuration task, or with a plugin like [`vagrant-hostmanager`](https://github.com/smdahlen/vagrant-hostmanager)).
+
+### The Ansible Configuration File
+
+Certain settings in Ansible are (only) adjustable via a [configuration file](http://docs.ansible.com/intro_configuration.html), and you might want to ship such a file in your Vagrant project.
+
+When shipping an Ansible configuration file it is good to know that:
+
+ - it is possible to reference an Ansible configuration file via `ANSIBLE_CONFIG` environment variable, if you want to be flexible about the location of this file.
+ - `ansible-playbook` **never** looks for `ansible.cfg` in the directory that contains the main playbook file.
+ - As of Ansible 1.5, the lookup order is the following:
+
+   - `ANSIBLE_CONFIG` an environment variable
+   - `ansible.cfg` in the runtime current directory
+   - `.ansible.cfg` in the user home directory
+   - `/etc/ansible/ansible.cfg`
diff --git a/website/docs/source/v2/provisioning/ansible_local.html.md b/website/docs/source/v2/provisioning/ansible_local.html.md
new file mode 100644
index 000000000..1c68ddbef
--- /dev/null
+++ b/website/docs/source/v2/provisioning/ansible_local.html.md
@@ -0,0 +1,147 @@
+---
+page_title: "Ansible Local - Provisioning"
+sidebar_current: "provisioning-ansible-local"
+---
+
+# Ansible Local Provisioner
+
+**Provisioner name: `ansible_local`**
+
+The Ansible Local provisioner allows you to provision the guest using [Ansible](http://ansible.com) playbooks by executing **`ansible-playbook` directly on the guest machine**.
+
+<div class="alert alert-warn">
+  <p>
+    <strong>Warning:</strong> If you're not familiar with Ansible and Vagrant already,
+    I recommend starting with the <a href="/v2/provisioning/shell.html">shell
+    provisioner</a>. However, if you're comfortable with Vagrant already, Vagrant
+    is a great way to learn Ansible.
+  </p>
+</div>
+
+## Setup Requirements
+
+The main advantage of the Ansible Local provisioner in comparison to the [Ansible (remote) provisioner](/v2/provisioning/ansible.html) is that it does not require any additional software on your Vagrant host.
+
+On the other hand, [Ansible must obviously be installed](http://docs.ansible.com/intro_installation.html#installing-the-control-machine) on your guest machine(s).
+
+**Note:** By default, Vagrant will *try* to automatically install Ansible if it is not yet present on the guest machine (see the `install` option below for more details).
+
+## Usage
+
+This page only documents the specific parts of the `ansible_local` provisioner. General Ansible concepts like Playbook or Inventory are shortly explained in the [introduction to Ansible and Vagrant](/v2/provisioning/ansible_intro.html).
+
+The Ansible Local provisioner requires that all the Ansible Playbook files are available on the guest machine, at the location referred by the `provisioning_path` option. Usually these files are initially present on the host machine (as part of your Vagrant projet), and it is quite easy to share them with a Vagrant [Synced Folder](/v2/synced-folders/index.html).
+
+### Simplest Configuration
+
+To run Ansible from your Vagrant guest, the basic `Vagrantfile` configuration looks like:
+
+```ruby
+Vagrant.configure(2) do |config|
+
+  #
+  # Run Ansible from the Vagrant VM
+  #
+  config.vm.provision "ansible_local" do |ansible|
+    ansible.playbook = "playbook.yml"
+  end
+
+end
+```
+
+**Requirements:**
+
+  - The `playbook.yml` file is stored in your Vagrant's project home directory.
+
+  - The [default shared directory](/v2/synced-folders/basic_usage.html) is enabled (`.` &rarr; `/vagrant`).
+
+## Options
+
+This section lists the specific options for the Ansible Local provisioner. In addition to the options listed below, this provisioner supports the [common options for both Ansible provisioners](/v2/provisioning/ansible_common.html).
+
+- `install` (boolean) - Try to automatically install Ansible on the guest system.
+
+  This option is enabled by default.
+
+  Vagrant will to try to install (or upgrade) Ansible when one of these conditions are met:
+
+    - Ansible is not installed (or cannot be found).
+
+    - The `version` option is set to `"latest"`.
+
+    - The current Ansible version does not correspond to the `version` option.
+
+  **Attention:** There is no guarantee that this automated installation will replace a custom Ansible setup, that might be already present on the Vagrant box.
+
+- `provisioning_path` (string) - An absolute path on the guest machine where the Ansible files are stored. The `ansible-playbook` command is executed from this directory.
+
+  The default value is `/vagrant`.
+
+- `tmp_path` (string) - An absolute path on the guest machine where temporary files are stored by the Ansible Local provisioner.
+
+  The default value is `/tmp/vagrant-ansible`
+
+- `version` (string) - The expected Ansible version.
+
+  This option is disabled by default.
+
+  When an Ansible version is defined (e.g. `"1.8.2"`), the Ansible local provisioner will be executed only if Ansible is installed at the requested version.
+
+  When this option is set to `"latest"`, no version check is applied.
+
+  **Attention:** It is currently not possible to use this option to specify which version of Ansible must be automatically installed. With the `install` option enabled, the latest version packaged for the target operating system will always be installed.
+
+## Tips and Tricks
+
+### Ansible Parallel Execution from a Guest
+
+With the following configuration pattern, you can install and execute Ansible only on a single guest machine (the `"controller"`) to provision all your machines.
+
+```ruby
+Vagrant.configure(2) do |config|
+
+  config.vm.box = "ubuntu/trusty64"
+
+  config.vm.define "node1" do |machine|
+    machine.vm.network "private_network", ip: "172.17.177.21"
+  end
+
+  config.vm.define "node2" do |machine|
+    machine.vm.network "private_network", ip: "172.17.177.22"
+  end
+
+  config.vm.define 'controller' do |machine|
+    machine.vm.network "private_network", ip: "172.17.177.11"
+
+    machine.vm.provision :ansible_local do |ansible|
+      ansible.playbook       = "example.yml"
+      ansible.verbose        = true
+      ansible.install        = true
+      ansible.limit          = "all" # or only "nodes" group, etc.
+      ansible.inventory_path = "inventory"
+    end
+  end
+
+end
+```
+
+You need to create a static `inventory` file that corresponds to your `Vagrantfile` machine definitions:
+
+```
+controller ansible_connection=local
+node1      ansible_ssh_host=172.17.177.21 ansible_ssh_private_key_file=/vagrant/.vagrant/machines/node1/virtualbox/private_key
+node2      ansible_ssh_host=172.17.177.22 ansible_ssh_private_key_file=/vagrant/.vagrant/machines/node2/virtualbox/private_key
+
+[nodes]
+node[1:2]
+```
+
+And finally, you also have to create an [`ansible.cfg` file](http://docs.ansible.com/intro_configuration.html#openssh-specific-settings) to fully disable SSH host key checking. More SSH configurations can be added to the `ssh_args` parameter (e.g. agent forwarding, etc.)
+
+```
+[defaults]
+host_key_checking = no
+
+[ssh_connection]
+ssh_args = -o ControlMaster=auto -o ControlPersist=60s -o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes
+```

From 3e1e66a76b5978608502143d4f1a19ab5de274c9 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Sun, 8 Nov 2015 14:11:09 +0100
Subject: [PATCH 088/354] Update CHANGELOG.md

Close #2103
Close #5292
---
 CHANGELOG.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 602956e8a..e4a74d90e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ FEATURES:
     and restore point-in-time snapshots.
   - **IPv6 Private Networks**: Private networking now supports IPv6. This
     only works with VirtualBox and VMware at this point. [GH-6342]
+  - New provisioner: `ansible_local` to execute Ansible from the guest
+    machine. [GH-2103]
 
 BREAKING CHANGES:
 
@@ -15,21 +17,23 @@ BREAKING CHANGES:
     (i.e. `ansible_ssh_user` setting) to always correspond to the vagrant ssh
     username. This change is enabled by default, but we expect this to affect
     only a tiny number of people as it corresponds to the common usage.
-    If you however use different remote usernames in your Ansible plays, tasks,
+    If you however use multiple remote usernames in your Ansible plays, tasks,
     or custom inventories, you can simply set the option `force_remote_user` to
     false to make Vagrant behave the same as before.
 
-
 IMPROVEMENTS:
 
   - provisioners/ansible: add new `force_remote_user` option to control whether
     `ansible_ssh_user` parameter should be applied or not [GH-6348]
+  - provisioners/ansible: show a warning when running from a Windows Host [GH-5292]
 
 BUG FIXES:
 
   - communicator/winrm: respect `boot_timeout` setting [GH-6229]
   - provisioners/ansible: use quotes for the `ansible_ssh_private_key_file`
     value in the generated inventory [GH-6209]
+  - provisioners/ansible: don't show the `ansible-playbook` command when verbose
+    option is an empty string
 
 ## 1.7.4 (July 17, 2015)
 

From a21d5be705cf5e061f332bebdcd38f33fb3bdd97 Mon Sep 17 00:00:00 2001
From: Duncan Mac-Vicar P <dmacvicar@suse.de>
Date: Sun, 8 Nov 2015 16:09:04 +0100
Subject: [PATCH 089/354] SUSE-flavored systems uses STARTMODE and not ONBOOT

As described in /etc/sysconfig/network/ifcfg.template

Static template was already using the right one, but the dhcp configuration seems
to be copied from a Fedora/Redhat template.
This fixes the issue that the interface does not come up after reboot.
---
 templates/guests/suse/network_dhcp.erb               | 6 +++---
 test/unit/templates/guests/suse/network_dhcp_test.rb | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/guests/suse/network_dhcp.erb b/templates/guests/suse/network_dhcp.erb
index 8bbaa62e4..3504b265e 100644
--- a/templates/guests/suse/network_dhcp.erb
+++ b/templates/guests/suse/network_dhcp.erb
@@ -1,6 +1,6 @@
 #VAGRANT-BEGIN
 # The contents below are automatically generated by Vagrant. Do not modify.
-BOOTPROTO=dhcp
-ONBOOT=yes
-DEVICE=eth<%= options[:interface] %>
+BOOTPROTO='dhcp'
+STARTMODE='auto'
+DEVICE='eth<%= options[:interface] %>'
 #VAGRANT-END
diff --git a/test/unit/templates/guests/suse/network_dhcp_test.rb b/test/unit/templates/guests/suse/network_dhcp_test.rb
index 82595db47..1ecb4dc1f 100644
--- a/test/unit/templates/guests/suse/network_dhcp_test.rb
+++ b/test/unit/templates/guests/suse/network_dhcp_test.rb
@@ -12,9 +12,9 @@ describe "templates/guests/suse/network_dhcp" do
     expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
       #VAGRANT-BEGIN
       # The contents below are automatically generated by Vagrant. Do not modify.
-      BOOTPROTO=dhcp
-      ONBOOT=yes
-      DEVICE=ethen0
+      BOOTPROTO='dhcp'
+      STARTMODE='auto'
+      DEVICE='ethen0'
       #VAGRANT-END
     EOH
   end

From 75cc6ef8d3da4d8829dcdc58cf85511039b40f5e Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Thu, 12 Nov 2015 09:09:58 +0100
Subject: [PATCH 090/354] provisioners/ansible_local: fix a str-to-sym bug

Without this change `ansible.version = "latest"` is not considered as
equivalent to `ansible.version = :latest`.
---
 plugins/provisioners/ansible/provisioner/guest.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/provisioners/ansible/provisioner/guest.rb b/plugins/provisioners/ansible/provisioner/guest.rb
index 3ac35bea1..285df8ac1 100644
--- a/plugins/provisioners/ansible/provisioner/guest.rb
+++ b/plugins/provisioners/ansible/provisioner/guest.rb
@@ -45,7 +45,7 @@ module VagrantPlugins
 
           # Try to install Ansible (if needed and requested)
           if config.install &&
-             (config.version == :latest ||
+             (config.version.to_s.to_sym == :latest ||
               !@machine.guest.capability(:ansible_installed, config.version))
             @machine.ui.detail(I18n.t("vagrant.provisioners.ansible.installing"))
             @machine.guest.capability(:ansible_install)
@@ -59,7 +59,7 @@ module VagrantPlugins
 
           # Check if requested ansible version is available
           if (!config.version.empty? &&
-              config.version != :latest &&
+              config.version.to_s.to_sym != :latest &&
               !@machine.guest.capability(:ansible_installed, config.version))
             raise Ansible::Errors::AnsibleVersionNotFoundOnGuest, required_version: config.version.to_s
           end

From 80021ceafb10253c15d581ba2b2a1a98b2fb0da0 Mon Sep 17 00:00:00 2001
From: Olivier Meurice <olivier.meurice@trasysgroup.com>
Date: Thu, 12 Nov 2015 14:33:04 +0100
Subject: [PATCH 091/354] Add network configuration plugin for Slackware Linux

---
 .../guests/slackware/cap/change_host_name.rb  | 19 ++++++++++
 .../slackware/cap/configure_networks.rb       | 36 +++++++++++++++++++
 plugins/guests/slackware/guest.rb             | 11 ++++++
 plugins/guests/slackware/plugin.rb            | 25 +++++++++++++
 4 files changed, 91 insertions(+)
 create mode 100644 plugins/guests/slackware/cap/change_host_name.rb
 create mode 100644 plugins/guests/slackware/cap/configure_networks.rb
 create mode 100644 plugins/guests/slackware/guest.rb
 create mode 100644 plugins/guests/slackware/plugin.rb

diff --git a/plugins/guests/slackware/cap/change_host_name.rb b/plugins/guests/slackware/cap/change_host_name.rb
new file mode 100644
index 000000000..07976725f
--- /dev/null
+++ b/plugins/guests/slackware/cap/change_host_name.rb
@@ -0,0 +1,19 @@
+module VagrantPlugins
+  module GuestSlackware
+    module Cap
+      class ChangeHostName
+        def self.change_host_name(machine, name)
+          machine.communicate.tap do |comm|
+            # Only do this if the hostname is not already set
+            if !comm.test("sudo hostname | grep '#{name}'")
+              comm.sudo("chmod o+w /etc/hostname")
+              comm.sudo("echo #{name} > /etc/hostname")
+              comm.sudo("chmod o-w /etc/hostname")
+              comm.sudo("hostname -F /etc/hostname")
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/guests/slackware/cap/configure_networks.rb b/plugins/guests/slackware/cap/configure_networks.rb
new file mode 100644
index 000000000..dc84080e0
--- /dev/null
+++ b/plugins/guests/slackware/cap/configure_networks.rb
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+require "tempfile"
+
+require "vagrant/util/template_renderer"
+
+module VagrantPlugins
+  module GuestSlackware
+    module Cap
+      class ConfigureNetworks
+        include Vagrant::Util
+
+        def self.configure_networks(machine, networks)
+          interfaces = Array.new
+          machine.communicate.sudo("ip -o -0 addr | grep -v LOOPBACK | awk '{print $2}' | sed 's/://'") do |_, result|
+            interfaces = result.split("\n")
+          end
+
+          networks.each do |network|
+            network[:device] = interfaces[network[:interface]]
+
+            entry = TemplateRenderer.render("guests/slackware/network_#{network[:type]}", options: network)
+
+            temp = Tempfile.new("vagrant")
+            temp.binmode
+            temp.write(entry)
+            temp.close
+
+            machine.communicate.upload(temp.path, "/tmp/vagrant_network")
+            machine.communicate.sudo("mv /tmp/vagrant_network /etc/rc.d/rc.inet1.conf")
+            machine.communicate.sudo("/etc/rc.d/rc.inet1")
+          end 
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/guests/slackware/guest.rb b/plugins/guests/slackware/guest.rb
new file mode 100644
index 000000000..1442f26fc
--- /dev/null
+++ b/plugins/guests/slackware/guest.rb
@@ -0,0 +1,11 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestSlackware
+    class Guest < Vagrant.plugin("2", :guest)
+      def detect?(machine)
+        machine.communicate.test("cat /etc/slackware-version")
+      end
+    end
+  end
+end
diff --git a/plugins/guests/slackware/plugin.rb b/plugins/guests/slackware/plugin.rb
new file mode 100644
index 000000000..c81db6aa4
--- /dev/null
+++ b/plugins/guests/slackware/plugin.rb
@@ -0,0 +1,25 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestSlackware
+    class Plugin < Vagrant.plugin("2")
+      name "Slackware guest"
+      description "Slackware guest support."
+
+      guest("slackware", "linux") do
+        require File.expand_path("../guest", __FILE__)
+        Guest
+      end
+
+      guest_capability("slackware", "change_host_name") do
+        require_relative "cap/change_host_name"
+        Cap::ChangeHostName
+      end
+
+      guest_capability("slackware", "configure_networks") do
+        require_relative "cap/configure_networks"
+        Cap::ConfigureNetworks
+      end
+    end
+  end
+end

From fd4c5f02d3c5216b3c9997d6f8726b821bee931b Mon Sep 17 00:00:00 2001
From: Olivier Meurice <olivier.meurice@trasysgroup.com>
Date: Thu, 12 Nov 2015 14:33:37 +0100
Subject: [PATCH 092/354] Add network configuration plugin template files for
 Slackware Linux

---
 templates/guests/slackware/network_dhcp.erb   | 23 +++++++++++++++++
 templates/guests/slackware/network_static.erb | 25 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 templates/guests/slackware/network_dhcp.erb
 create mode 100644 templates/guests/slackware/network_static.erb

diff --git a/templates/guests/slackware/network_dhcp.erb b/templates/guests/slackware/network_dhcp.erb
new file mode 100644
index 000000000..53f48f8c0
--- /dev/null
+++ b/templates/guests/slackware/network_dhcp.erb
@@ -0,0 +1,23 @@
+IPADDR[0]=""
+NETMASK[0]=""
+USE_DHCP[0]="yes"
+DHCP_HOSTNAME[0]=""
+
+IPADDR[1]=""
+NETMASK[1]=""
+USE_DHCP[1]="yes"
+DHCP_HOSTNAME[1]=""
+
+IPADDR[2]=""
+NETMASK[2]=""
+USE_DHCP[2]=""
+DHCP_HOSTNAME[2]=""
+
+IPADDR[3]=""
+NETMASK[3]=""
+USE_DHCP[3]=""
+DHCP_HOSTNAME[3]=""
+
+GATEWAY=""
+
+DEBUG_ETH_UP="no"
diff --git a/templates/guests/slackware/network_static.erb b/templates/guests/slackware/network_static.erb
new file mode 100644
index 000000000..0745e8b1a
--- /dev/null
+++ b/templates/guests/slackware/network_static.erb
@@ -0,0 +1,25 @@
+IPADDR[0]=""
+NETMASK[0]=""
+USE_DHCP[0]="yes"
+DHCP_HOSTNAME[0]=""
+
+IPADDR[1]="<%= options[:ip] %>"
+NETMASK[1]=""
+USE_DHCP[1]=""
+DHCP_HOSTNAME[1]=""
+
+IPADDR[2]=""
+NETMASK[2]=""
+USE_DHCP[2]=""
+DHCP_HOSTNAME[2]=""
+
+IPADDR[3]=""
+NETMASK[3]=""
+USE_DHCP[3]=""
+DHCP_HOSTNAME[3]=""
+
+<% if options[:gateway] %>
+  GATEWAY="<%= options[:gateway] %>"
+<% end %>
+
+DEBUG_ETH_UP="no"

From 3fe52bd1700ff07ce612bace449f6e864972ff9f Mon Sep 17 00:00:00 2001
From: Thach Mai <thachmai@gmail.com>
Date: Sun, 15 Nov 2015 22:30:24 +0100
Subject: [PATCH 093/354] Fix Vagrantfile for latest middleman

---
 website/www/Vagrantfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/website/www/Vagrantfile b/website/www/Vagrantfile
index 2d8d8c9b4..cb40d506b 100644
--- a/website/www/Vagrantfile
+++ b/website/www/Vagrantfile
@@ -6,8 +6,9 @@ sudo apt-get -y update
 sudo apt-get -y install curl
 sudo su -l -c 'gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3' vagrant
 sudo su -l -c 'curl -L https://get.rvm.io | bash -s stable --auto-dotfiles' vagrant
-sudo su -l -c 'rvm install 2.0.0' vagrant
-sudo su -l -c 'rvm --default use 2.0.0' vagrant
+sudo su -l -c 'rvm install 2.2.2' vagrant
+sudo su -l -c 'rvm --default use 2.2.2' vagrant
+sudo su -l -c 'gem install bundler' vagrant
 sudo su -l -c 'cd /vagrant && bundle install --jobs 2' vagrant
 SCRIPT
 

From 8c070df2b513bb990e44aceb75ee175dd950c3be Mon Sep 17 00:00:00 2001
From: ReadmeCritic <frankensteinbot@gmail.com>
Date: Mon, 16 Nov 2015 09:15:58 -0800
Subject: [PATCH 094/354] Update README URLs based on HTTP redirects

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index a361da9b0..fdb441aeb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Vagrant
 
-* Website: [http://www.vagrantup.com](http://www.vagrantup.com)
+* Website: [https://www.vagrantup.com/](https://www.vagrantup.com/)
 * Source: [https://github.com/mitchellh/vagrant](https://github.com/mitchellh/vagrant)
 * IRC: `#vagrant` on Freenode
 * Mailing list: [Google Groups](http://groups.google.com/group/vagrant-up)
@@ -19,12 +19,12 @@ between Windows, Mac OS X, and Linux.
 ## Quick Start
 
 For the quick-start, we'll bring up a development machine on
-[VirtualBox](http://www.virtualbox.org) because it is free and works
+[VirtualBox](https://www.virtualbox.org/) because it is free and works
 on all major platforms. Vagrant can, however, work with almost any
 system such as OpenStack, VMware, Docker, etc.
 
 First, make sure your development machine has
-[VirtualBox](http://www.virtualbox.org)
+[VirtualBox](https://www.virtualbox.org/)
 installed. After this,
 [download and install the appropriate Vagrant package for your OS](http://www.vagrantup.com/downloads).
 
@@ -55,7 +55,7 @@ Ruby 2.0 is needed.
 
 ### Dependencies and Unit Tests
 
-To hack on Vagrant, you'll need [bundler](http://github.com/carlhuda/bundler) which can
+To hack on Vagrant, you'll need [bundler](https://github.com/bundler/bundler) which can
 be installed with a simple `gem install bundler`. Afterwards, do the following:
 
     bundle install

From cd08ab93a3c620d5a49979779e5892baa58fa537 Mon Sep 17 00:00:00 2001
From: Jack Pearkes <jackpearkes@gmail.com>
Date: Tue, 17 Nov 2015 10:51:04 -0800
Subject: [PATCH 095/354] website: fix debian logo

---
 .../www/source/images/icons/icon_debian.png   | Bin 2906 -> 6859 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/website/www/source/images/icons/icon_debian.png b/website/www/source/images/icons/icon_debian.png
index 0e92d4fcc6a0c03b6bee46485e7b00327a5067ba..3c096cecb6e74d02af87916e1447c87b30c65382 100644
GIT binary patch
literal 6859
zcmY*;1yCHk*7oAXN@;N~QYf~#EbdlhaVfC4F1m|T+^rNVPzuF$ao1AZin~+Xp|AxC
ze7yJG|Nh^XnItDC&v~AlWF|A2L}{og;Nwu>0001dB}G}yr(Wfs`V8}_6;ks#c<NBx
zH5H@*h%u`DrvbK$qJcXAfcxs7iUP>^LiPkOu+!Fu>8rj2SvW&E%`BbGtvJ1)E>CCx
zK-3HLWJ0ZAW^`UqM<;iXml*xO5TGafA2*Pm?q3j?gBZQOss^2mvzrwiKPMk27ri(R
z9UYyho24~KQ&#>z;ZGwmdRrLG1q1|odU|qt@^U)6*#NnPg@u7!JU|{Ejwb|%ySEd}
z%!|Xxo#Edk|Bpx3%H6`v&IM-Y>_qnuubH_s941Cj|Bujr%fHtNv$OvHN>1+oN$V*=
z;6F1!ZcZ-Xf4QGRMgQ@F)ZOf?o|OOL7v~oJ7xMr3{-Yxb{73wME#}{u{>%H6syL1)
z@W0z8j`OaY*#H0_$5oP*()L2x{(|c_)0@)&^Ko@KQxN-t^%*^@;%i&t_vQ5&(>BmD
zl_klF8N?EfF0}E$aIW;ws=i^ig~Z{wzqp{RsXk{~cbru@SG4>YOXxH7fme#}p1rQj
zT;2`nv^lxAc;>wvnq!qk@HjFOU_JKbW>nZ_Y~(MHp4OdZWK^|Aj(w@2;>vy3XEuIR
zy<)6W7=Ee(EP$IcrPq~dbu9hbqBk(cJ?ide6p>gvZfoq_o$Mc^RdS?O+LB#j6{_*7
zR=K#$OSMY8XF2l!TToYVNkiikRPLzH!Q&P=KyH9s3y`r_8~bRhr6rSJ!9j)}cCB!5
zV2>IWRuEUF=X{1bIS?Fdq}3OjzR>1#MSJ?t3p}|)DE6_@#}UNTvBBT`V7lB@39B5S
zOx5<yZF~8rcrK_Q9;6>5w_Gbn|J)bA!>_}bR)T<xm&DQINA^dWVPNPLX1mHGnAzAw
zu6VNv2S<pa<n5HS{6U}|C&%PMF<-+KlS)DN3(HDIhCqJ)i;YqpCXO=Q<Lg+86lz3;
zvB~wXq@Tv@H8OYXNRD?UXQOGNC3`MjWVU|V-!=I&!5S|#cN*fz-J#dOfE%Xa!+ST|
zHF3RJ?_F=vhO7xqW8-X(i@^oEqA#0-xE|84r9RPn2vPBSFX?8*DdCjvd$e+30IBf8
zk02W5`HY^LnxBT9oM!7H*ML`<f`ahmWKpev({|j#n4{?j!d=GV2!63~m+3CU$3I(N
z$uD=_YAB@;h@Q=3uRUDDc|6Jw6y9l)kp<4D4qLsIOoVVbMo6bp%V}AxlNs|&hN-1{
zOcbj&D}RwQIsVkwR+ks9#)w*z>LvLzc;|t`D8nc^nuOi|S7P>Bun&b%gC%wxaqB}w
z9!hFhBHYN^dt;k^>!;sNx{Wxm?=@-fR+Kzi5Er1CJV(y4i9aMk7B-Ia9zC;=?(GZC
z#=@)@XiB+tF#w)pDi=cj4BKWk^lIuTSz{$7!i4@UczxsWS3T1e?SOu2!LP4t<Ojhq
z<S!|H17Vwm0r;(D_^&{=q-gQwq{5zmYpepOJ}g*SfYUU3PUocdOD%cHjPc=+p{n5g
z@U^XLFIf!^se;Ap)3lFkYig^``D)d$R<V;`zeZxq%Nda`Qc)W-Hz7h4c&w_haSg#7
zZgP^}KTf8#U1#Q)p`Cxs>oX<3ytxpmn4L*IXzh?L59zRH(m2tg(*^+!#1hNY^s6@m
z;)jRb6^x8R6p2_MJ}^!A4vG?r`I(X^&d1h*@^>J6hZr;+okQt@g40Hct7$}oWKK9!
zd2<*=>~zZO&6!?0=xq6*ov`q(kDBQDCOG^4NS{r_2-LmttU-;rOI4yz5Ddus(77_P
zN^=oUd#Y4g?pJR4YXDp8@Zdvkj9LH+CDCBC3Xzb(#LL9YzDnaeN?ie|4A=s4GOAjb
z6+E9@RXsqqUpP6bkyBVm5%}P-e!cVvs~l)m*;ENYy<|{v<uCN#qFftj+smbm{mf&P
zk(K)9yCfYEb{JP=0~neW3y}$_M;1xoD>OpgZEUOzure}8=*%Q$#n;8mQbf(G@HAX0
zb=WULv}O_h>`crG-5&y;>1agpNXnrMZM%hWb$spHG&d^=xb5;siZvVOhZ?M&2Ih6Y
zm6LPwzEr&|EiP7ci-|s>*EwH)|F9kXC7|P@#+^Kp{*nHZ8<Kx+WO!t_)x9TQiD41O
zFPD`F5o{QK{%z9tv}HItIaU6>Ot}93=qSQEu~m)qCcR;f`!n{;$OO(Jc8Hb;<7v!@
zz0WcK(rV}0b6q_ww3HM9bv_Lfn&bIqUJ4dA+(qB(d0I}x-y4{TDk7Kp0ODJ}gM}?9
znlh@?AxEE<UcySrL&HFnj_2x)`B^XNaRV{i(T>%y^eC{?@igFi!FDhd8~kR9b8G|;
z%Fu^hD;VXcwNwfM@x|+wOQr`^yi7MhF1y38JNyOK(a~Bx7DOlFsYQ<BkC*cDe+aD4
zh@Z=@tjW3fuO}1#jEDLY9fbl8?C3Bp-xC-4En$!@ubj<WGz2X0wBA$(;2-;LVz)B#
zYJHD(R8gsIgkTXjjnW5rEHd&a$+LdJypJMhVQVd*ez^Q|cN%cnl+LSwo|(}d*@<;k
z8^u9$Whd=uwCro@wGlFOh-f`>OvGmr&nEqzU??ZYZeWcaF&BhYV74*!_K&jF1*P+H
zD>9rC;k4YgaILSaS(nE^1+}Y|nj(&tJ<tyZnys4_W_j}ahI#$8Opw+%*Q-g0#4EYK
zKW$vp(ecQs;~O{8e95owTD{WY?JiUWcbH!7SmEs4PIY5Ez=2xa`6;j~DHj#xux@|G
zoc8xP4k1{)A`r_@qL@$3uy?L5x1I(nEHN0HDhzex*jXR$73cnVw@}gep!}Un61qqP
z-97I_em!1m;-)g!rTiMOifFsP4&#EQwtH0zK2N^z&<-h0wis6Kyq!7pH1)5?=bG5e
z&#zi!o8+IL$4bW5Jq30!f2!D*)dn9jQIS;<!a+hdkERbVaiA;qjnMfQc2Cp?rk&yk
zrj49bevkgGA0~2HYQ1&3L$R83)k$NTRKpS!*yf{9H6xkd<8TslkGm1mG2$PNd+w!;
zUX-YBUZ(pG4MfmB+>A%PN|J^`U*kHH0}ZRdefxN`vqK%s*=@&si8d)4($^6o;tu|?
z_$GOBsaD#<;>UGMMl#<%@%_n3AEkL6c~`nYf|nA9Uxv{GzReXBzr&an<Mw4(a&zzG
z^;@jFTs)6Imh6h#D(PEx1Zo;{ddh$&Iu>(t_3GWNgc26C3;85I=Af;+lKbYrOj<uE
zxvx3C`0{inl)QgULBnU?XgWlmr)FPF9FemDV&@8%dsfcVx%4$$@`uEJv6(iHiNK2I
zkB_TI%awJ=2&Nm_X%VKU&JQz{G+ob*W}mwoAX*QF5<PvCbNWSb_|&x<StuMjUc6Q6
zkuW4VeROZq0@S^s7PX}nXh0VX|0A@G!C?!DCBm0>iMO9~^+K9SNh$Pa@OunL6Ptat
z9d@V;6Y8x)ivM+4YNaOyt>D+WGf26<^{~Cs-{Brh4@}-{J0wDa6jL}WVz{$gU*&+C
zpT(#JF4TGVBi@qSZVEoH(rQohIyZOMP4?a|NVANiN~b#68%G0?8sQireW2Uhnx2=V
zb6=S*TH->40#-#CFxoYa8Wex-U7mIJ>?V22zQMnnZQSt+f8PGte;eCz=y<EFjIyEJ
z*huYx`rOBK6dN-}XA+h};i)j4$T^lt`pxNbQg)1y+A0a5wi>Di)t>U14h`+%iCvdv
zo%o&3Td6oU^eJbJ7K2@oa>m7;ZoSl~{s2r2$7`W%_|ZW_rbi)$fyKgj*tGAy^Veok
ziTQp>L!kfa>S{@*q9OphvCi>VXkGj(aOTt`J4p(!#0&EHo_1Ufj&UXs6&LO2;<~YQ
zD&i8usLyZpbroV0zaZsyy6&=V%Po#l!*!2eu`^_dXZOBa8aU)qH(Z?mxX1#?^%n|@
za~&;I6<K}XbmqiVe5vBRGFJ8WbRz+c$o>oO#qD9*SC@m5S7pP)f@vH^9{tIin`yqb
zg{3Lq+WUrmj|3%5f})*KraO~V3u_iRd)En?NOk5b8gU1A&&5sdKNhQ_Ib(iE_{qhc
z!9ZvY7pi4DV675{xneR^45zKZD+Yp^xKF^b1pCceeJD7<fT74{cfELOL8r}lJrnP<
zPz4&{DHP><kpkzuLJ%Dp59MhIeMORm=1kP)#vs$VUhz5z&%b`Po-o%M!fx`13?fto
zke3%Ne|cKYCXglSkiX-)+M(YF30i5hj9U3~R2#%a<8wvr*@m#9@PpaEy#Iq%TR6%v
z0_)|UYonA8miR1mE)Wq~0l1P*<AJl`bz&{S1`qGX;2OOWdKWkhYt{TDf`sbPbBC@=
zQ^)IcR0NKxA=jVHisHB@KY842o6>ZbFj8tEAi1lBE3E}q8{LnyL!iTs&tv^dZ^$@I
z95H<cpRRJghhIrH+HH3y&V@(w=Q$0WvOeri5yg-rD^H@gT8*0wsU_3=mB+uc7Aw4b
zLIl>ix0n${XrTz?IEOwhJe6|vZ`&?`#pB;4OxSJoZ*ty~XOJYJHw{w;0e`KmoZppH
z@LyZ{NJ%yNtQsMQ%K3d8)Iw9-{+?g5vaw#X8+QC<UM#F4U78?O?bq2eBxvm&e>ZOh
zVj5g2z^u2}uD1O7YKlYuTwdc^uD`v#XV2||SnrFN+Xz_{olX<(*Xvs!I}Y~0?Xz$y
zg(Bl_*AE?LAMWy%b_<)|zY0l7LEdQK7o^RFBpycz9FORq<?&Q0%;~uYmBG_rV9|Yd
zO62d5;tnaz?aGVuBDXAXJb15n2*+;^-VQ;r;mt_S5{qYJaYxDM_LrGL7#C2+#F&DE
z6?Hn}T6nBE49pjqRKFfMT-_}x>mmLoO|r4E?17K#+FI9R$_`|oU$X#LBk+$5odtyK
zI*Vc;2+Mk14a~hG#%t^SKn2&I-+)!mKV){L+??-Nhl@cJD<@^XZD{GY<Lx(v{$3v4
zV0wC&sIHX<S{M%wdM93A6Ps=uVN^u5{H81)6LTR4_k1`F>^Q^(FxdUw9}ne`TK0=l
z%$z;tfZ?Vx#4r827&&fsj{sW61YHWp8od(0Mqzt5B8c6;k@FdfZjxt~(-_~9y4}Bo
zhf)qh{DO97Yta^_-qZE?WNjeoK)WfPrtg_VIunXg)FZAnRQGTtS*F}Be5SUN56fhN
zL6#9=Ou4o3(UuE8eu!kKQ@pMLzejw-dC82|;54>KLFpO5QZvKH$$HSp=xA#P7Vm{0
zlq_%}dUK&rUw%_Qz<PbwtId#OkFK_9j>L@=z8}(UUK(<<z*l(c=fBOsjgal(monpG
z^vf^s@%IDm1zIcdbfrd|^ncbc`K@<d<H~gnhdQOlq+L-oPfhl@sBwOi477NYxNPEp
zG}iA%oeNEjnA&OkL5lr@nO8Ke;LcI35DX(b;w*SiG;Ck9G+sd=-St9jTZGrBNSkCj
z(DuzWYq|q0g<a*(2SC*sxMW~IP^)u^#>Z>nQ@Y)4l`%qTkTcDTW4PRe$6U5Es3<7j
zAid$^CoR{{eV)guJU@zBh^L#map%yxVBuVus2$e1J~JPkzPo`ogQt?W1`7bG%)yqf
ztOq!C4LEZqEx9fyU~@9~A|r)O-^>fjrvBcPj_vavOd&YyRy4ji*l^6!4zH5=oGN=R
zM0<n2IH`=b=WSC8dzQOCUPF?2ajw|a5}SVWxk2G2AL897?HVCM_`bbueM3e{8FROP
zdp1p4`9La1X6B#5=mgO*<OD(gY>TOdC^nV@cSV)}o-KdInaAAhrN~77NtKtkSA-&U
zmfYEQpI+%hq=6KhR5{0pAi82o3m#ZITqb#|&vqeD#t&R<rJHGFSQ>6+{q+)FiHrz0
z2}VQ)%laGLGYj$97-nzxXwhPcMs)gaT3DI>5pz7*K8T$td|txSwM{AIZtqEp#F_OI
z7+GYGxXjh?zaQemh}p8(9#>XMcU0_~?qj^W=^r24s-asRKhu?0j%HNP^q5g$H5Mu(
zy6&Ug`lZRWqcv1J&l0Gj)8$u}SD{w)t@3JGEs?-EpXR*1C8HK_^sSpfsDH9aomd;x
z&dn%Jg0m}>eoCr)!CkJLsv_q77ZIfl0odn_!gQe#9=5}&z5I9AO7cFpb=c(ObM`k_
zT1C045m?k@&R2Ni7=hMe%oltiO%&_%-y@f0(kDF(Ke?1-O^SLPNa-d{v_x&+%X~3~
zGKiz=7a4oHRzlJ-T{|P3`PPJ8)&ot3eQyHab*_n?TRG)#$-)8m1g?YrCYIg`{`W@Y
zel)+xB_7lmH-42cF-gJET3*6Ir8e{iGpuBiQW*oN6?5=)9HOgHoCpRu?_OpZtaBh!
zWefVUTF2OXkDIm;_d>9I8i5OBFKfS0_C+2ocr1jG3UnlOk!vJ`ZefJ6Z)Bi<##Js-
zi<=F2xV)Zq-HQJFthVv+dDV$6t47wE$T7f<#p9r{2W#ki5>s1H&0E8{{Z{wZ)k%M4
z-HuZF*!M$%+TZ&6RFzuj<?{%qxkPxy?$KpL1(7f0eGjV~3}_nAWwtU{FXX*WPg;!}
zkjjQC!#7*9CM;Ck^dU$oY9i6%5>duI*;{ifES)GH&Wg(8I-b~jyz@?!U$utSuE_yu
zH3X5qqT=HDNe|Z3lJ=Ax#7!0UlZ?Lo!n^3mot;G^=66j>Yn9pJE6EN%bSQoJ^Hy%#
z#T=hBt8lT4cW|j0%}3=Er>HZg-PwRRpBh|gXaT}jYAZU5M3cWM^9TH5!eqm|ItsSq
z8-(Ck{G65~$#f&xXlQ1eio$~IMw*&5b4Z27=I0a?tMwMnY83;w51|~Ka|!zl^Ieir
zM&2jC$P4_hh?7a+0Rvj!a`estnjAlw7E|474X@>Fy0*nZ<9(I!6e%W0=Z>5hEMJ7J
z%(Kw)dAL75r&{dY{93Q{%i(a_!S2?GlF^*?_oJ?o1P;Z%7~ss|;Qi3d%y}{`--ClI
zr9k8t=>=qQZA<Jezvz-zabvPq@C9Z9R@Pk5nSGB$P&n&FDcfz<l-7J;0MtsNpQJb?
zW&0?gTb#|-JHna!mJ#3B!kJ9NTJindh1H<=?Y?BCiqOYWrT(*|PVOWjN_)8IA4UGQ
zvRvq^>db8?qVpa?cAV&S6Ph6$@5k0DA@SD^vEHkIKT{2AISD<eS%<<&9~%6rA;bX9
z$RIC6LT@sk<O`I?<&XxfG%v;@HgFVQ4wAtYUw&%WiQSiJ_SS1sk6SLy22#Gir0;j|
ztZfg!j21Lf(5BX|=Qe-w;*#|ZIKTdY5W^zoRwih5ZvDP~(mUKux?KJeyvcPF5^_SI
zx|l(^wSZ@vA)Bg~r@Q6C11@n*_74KDqC*ZGo$?8AT}nUa8~-LmZF@6xh*JC94xLxY
z^LJ9q$xXF~w(y1IV^r9fBt&8rV%<3%P8iM&v_HSMD=wn&p>{DRBB(5o?0S)S<IWY=
zgeO<PiCR_5lF>CKdkY1XVz6h?9eug+0cQEYz4pq+y1KNSHDtOWc9mR~+JrmK-@`@o
zA>a8rcasD@ize`!*sM+qqjC}~D%dvf$PADoyQwqm*Y`d7AO$S?(_3tyg`be?E;Pq`
zw9xJ*+@O_=$Y{O;dl{-?I%}rejvD<*yA%rcRDW*C7Wli?>u&&ud&H?kRNFQes^U-W
zp00y=xmf$$uxh}M`%h2T34QgXE_^QP@bB3}<Z`g=?TIJ#XPy|;b-y6yp*%^sA@eSO
zb?nl#73c1L$&jGPGVXQuQ3t?@oMRfMJC?$Scx&q_<r2_=qr-z1HI77$F{?3QAb5#*
zSt<6orIuF+-~nqS%@PqA+DBO+0dO7v$y<u*Pee42lKJ%T8T7_qC@7uMf1pjvRqW4!
z)^!vn%y7|F!Kz{xo1Q67>c`H5{#Hy-E0UtO+a;HoIc&ZTU|_u?8?>OQ3Yur9ZVb+m
zIKEn+J9=}cC6}epD4Hlh!^qJ?{s|R^#G+426y5m|_<b@_J;C{1QS@IF;0G|tHTJHy
zv*EN_^Y8LZ7>DZ?cLEWb5PcOux-xqtI-=s1un65~0rOkpPOzjpnj=qk-YP$iZrcOl
zRS8VI1n{Up0~q-tl;dQBI&LInu>Zd347ii@+Lh$`Fd(t(v<F4xP27D>V1bKB;D)px
z^@O)nFV+=rM&w>ea+uU<Ij{cfk}{+h&JH&*rYaLz+s(cNqFb};b6MHz9{x#F<NZ_U
zr;km$i5*lJ%2~4(I3?e$Nk0DW0kDsF-zRtgh}Ov>bh75`CwqWG_YVOpB*I&Vyw|<D
z(r9Gj^Y}(6w!V1z&$aoqNmL}%$sME|Y4-uk%;)M&!Q|7B%k`Mbnx5Mj<idCWg#v&2
zD_t>9H&^zoP}&AU{;ZIRHF7MKIB|-*w|F>#sChC0Ko4oKNtiZ@$qOCF%19-B;+rL^
zyMpSe9WAVMR9!MpT7l?Tl+RWvf%&CMi<ReJ^>630zJt4dkCa}vs;jotzSdK6V~nX&
zHi%f{jxWvDl)M_4N7>P0vx*OW`{JMtb=twFyM_0S!A4Wv%y|dqx|7EN+jwB1!jN^r
z%sk5FR=mV)JbCdV7yqvv0Aa~3=glL;;7j>x**PSt{v|V+Q8AM5!%~PP0rohUnELFo
z%Hvsez;C<|9h;fZ&dWH`@cTD`Y~ap!OmTI_<S~>Q!$ygSbVCEuz_hJwdOMQ>1lJq*
z&O4L+zDsM(x-m$2f=&&H_e3UeY<DmQI~g@m>PFDJBks|K({!((^v|A|xB`jKConph
z4>Vi#2G!}iY0;hqem0r@7z@h!i<xPp;_QA~C*BU{W_n-q{Mom2%+gMu)gSo3HFM=6
zS%g$x5YIX*U!{st2NPaw7xh23q7Pv)`E5dk^EAc<ATidk1&GDbRqHj?f$B!OY&&+(
zt4M`c?y+xfUt`lm9x-z6zQq{N3an33y+c_gF#IDijeF0|W|^7#&kvK5oSG~`8WQ|J
DKlw5%

delta 2900
zcmV-a3#;_YHQE-CBYz7aNkl<Zc-rk;4UAOP6+Q^EGXo3R-S@KsZLv~qV=9WVRE0v5
z#@5tOLTd`5BFoOK)lf_SuvjaS6bVIC8f$;B5NT{#6<v3knT5rziu*G&`^WO5X`{%W
zsTOF$-@*c?-@WgJeJnHVyR&a+2FH_pIWxSs!`yGqJ@=e*&wqWC55h#3HIe!C1ew2z
zk-j%Z#=1C}(;8?@F?}XI(m>jjI2msy$T-tMCgU}?K?{Jq-5_m2J<$-#cWEMhE(kf%
z4q{+U+}sN-z&3eJ|2wSAPx&g1q)lxhvnwHp=>we>VNX*&$_}ETAfZWE6m*}60U-5M
z1C@S_@=cmapMQ+OpA|&7gq)5|WIUUPWEsB{gI6J|)gr4!telt9GCznzfh#!ZzlF>F
zvv{8W=g?08tMK{{&`)uBU<t0z=XrtY92|B%|7c`UFS1sul9jOZ`w1Eq$Zdk=jVJ~|
z-vt3rgN$a7auAw11XQGiypDTML+|6Vg4@Uz_@E`KWPi0tZSJguzso&>=2L-XJ-+8a
z%pMNf1VBro<|*KQsTYzhh^4;Yu1J<0Uc5rND6oXvLCjeYWRsIVYzuppY^kSF8VER$
zP$Uac{><DYD?|Ydu+bW5|6r4Skni=6?(tjZ0=HAK!?LQa^)%L(ePY&(^>KJy0re70
z!KtvW?tlK0B~c-C;Bm4gL3DW&azGJq#`_>jq&*2L`EvG&+Mr#{n~b+Pto<grbN8>~
z3U90nIL!AA`zqNIrf~(Zuw{tkk8QK_!4^AA=s5S@tc#O&P4<bZDft#h^}YOt!5q;K
zaoD)(f_vr^T!ld%0{Tx_ND|h<_Y60Bg%aaI(0@`S&GndWoiQ?F@MmlB{(Cu*L~~gG
zA=m0h0OpNAodK<_OKx4hUt8AY8DWh)uV7q?IBp0qh;l_h$}Fxmx;QF`vJnPq^=_`w
zzInm@vuOkdxQm0H61E>dLb+H-s1M->Xn3}Wx&uTVw}|S6O$Kv~-oTYKG>PxJ(<`zh
zf`1liAgmJ+|6_77xz9J2=MLA!s>yQ$6F3+MVo|8Yz3sT~3mGO#zn-JUf32yP0-Hft
zwHBma!i(uLE(=6C<aFAOK?_tkUYENk%@NBT0X_i^181zyJ9qsZVc{8a=ASRZRNDqJ
z1SzQzl~ZyLhfDPfLy5qR7+e=uoFn8o27mQ0;4PpEcp0bxnt;8)Y3p946%$AidX)KA
zXNW9)HE)qb^$B@jjj<wmWba=F!d~K_Z#D-Du1@81I8-!JOeGBb$3Pu$%CeCD`a0j;
z8Sqp38CZ-vvcl5Bj&j7fjyw|hpPPU+AnRnhS%ICG9stG+3{my^aKukLEI*}yI)6jx
z8tLpk6b$-S40fwRD3ZD92&?+3J^j?MN$NvfYhFnn3*Sk84E)KoDj0yYPFSkPerjY9
zZ!|vSs3K9dhM0!?5!Fwk0Tfvv3?cU{Psh6aFL_Ls@qj&@+#@Pre8L+`CT6A-1j0}X
zN+Zwgl6j^V!U?(@gOBqj1+uIt{(lsr_-T|u0bwgteVBd!lU`ZXEtp1Ul%0BwzKk*}
z(uc{QGo-dMg5(dlj0!zSl(k3sO;f>7NxhS+v_i^)@Lc~y5OxAkAq*(^cK`qLsCESg
zzrN3i-I*6w8?&>!F%nqI70Od_C0$I!))H>I3wRd4#4Er$u)L7Vhn*Kh@_(O%-_l;d
z^m1WU+77PFZa;zCHiP3<is;MyF_E`YG7;fEi1~NYttV;5fxmF5P$OFqCk;dR&<xAz
zBfZfdp&Sqlev48riKH6|{-`7$<Xa>^D0q=SzF+E?*a+?MU&gHn2TpQ0#R?eFPvQFb
z93g8ySEz;&zRA7k^K==Hlz+S4r>nv$Gnj1QYP~wC|B6ceu5-g8%YN$yeD||fbngOk
ztiCxtAFzP@u&Pd_rBzyB;105dBigKFWZD0gE1Q?HT7mE11|mL!KF}vZGO>Qfv8?*0
za4@ZuU_IHwRr)xPa-74-{FU}Q$|2#|#Uo_P02VSgaQbMHNoOdna(~7yUTjqjMEnGD
z_Hgt9vY?G$(5FRUA^+j>w042_@_ZUW_C_kmc`rFx`a|?-5fON$ZCPmW$S=#n&PQ54
ztK8wUuz|`oNqrWywmi2QbBjl8qme~#y99c+v|ddbzU|7ZVOe0BV>O(4DXfN@sc2*~
z8Epx4*)+RA8xSM&nSWl^<)7iUvS<gU)o|`Z9F|peDa2U~q~8!jzbVLKH|Ug|IQpDq
z5&WYrBlv_f1>lHrGjQ<;9-9+6(wsZLL!r?vF10?Hl8J~`LDu`uRzzqCxu;hi_^a5}
z?TOq+1>nG&T;zs}a-=!8u8mCBM8OIVw~{uBQVHK%SRxW?yMKl8HQ+_OUL>;i^LKV=
z2&`s}tExkdww>$8`m#*a_yn0<F@+9hSXHc&XmEeG>Ps=TUR0`Qp<yJutDvz)WeVDz
zgDbOCDK&Ovt5PaXPl$6oG35?s!-GmG$};KH;GvgNhDG#>ik?yUDy6=7SmN$?Nh|bf
zcPF8|yMwxy*njTNu&-KfPd^W*pt|3Bkhi3@Z}>4sN^Z)~F}ep^5m%{9zZek5LIBIU
z&eI*~UiqMVXCKk`iS4w3CJKJ1TgFNX5LO7HUM8;vzUyac_d0~NgZ#RA<v{o-5VRab
zu_96SaXRy4j7q(?e7oAPGtDlVFz>i_sK@^4W;o}!I)5CeSJjWwna|TeiP(+@S!b2{
zvm*L2t~SPdH|4Y&VG*l=E_>BeMvG-xAH}Hna|7M^_q;;qAGGmg@<E$RG1&ERurpgo
zA1BT(rz*3wA|j8&FJY?H;{KBkYf1}kman>p23j~erWh8}>AI(MgK1DNNsu-{ScW_e
zVGaB!@PA&6%z6xFLo-Ok`zpL{fc_A=yW`xwE>}4lv815_reCIntF;LT3l4I$k8b4}
zEtKrp3;5Cz=h3$q&|?4M?GCg8331)!)avLtzjFkC^D*>c;B>o9v>k&r3TveditWFQ
z6RG;(p&OGqbu9BgXtjy*0tuUBkkpCyi{n%}wSSRH$F@?bE~*G|S=TayxGxHHG?Q1W
zvU=V)8-$&7dBQ^aANZ<WtsW88W?9~TL57=Syjzu18t<p%T_EhJ^Xv|Y`djj6Fqn^Y
zcw|-W(wfXBSn8L^DbBJIXX5ORdcb;{=pDV-sW1%ei@?FSM;3+8X{{r}B!`G9Eq=76
z_<s)dViAIl0c-JnrVH|Nhp>ot4Sdx*NS+@{QDb_+3#*D-e(HZ%P0#g#a^<x{VbxDy
z(K&{2MfyyT20+(Y??L1iuExR4ToKWim8?n{BW(%>*qw4!Q_ts?IH#NF9g|ia?jw_k
z7`t&c@+*|9B7#j3FSU7NRnX=kEEHoL6@QV3U`;B$t_|`B%|*e|eS3=?<0L$A>d>$C
z95o(Yg2C@ss)p1ll)bZ2y=;-sj4}TVvi7yw#0ec&tP*S|6Iy@R(MdhS$|RJ@dX;ir
z#P+y&QX24k#71%GLvh<;w%O=#K)iRPIcJ~`fUNI0$a-A4Y*Z`tF0m+FQjeT#r+<>s
z3DPHlh`XCfUnt7L;t531e}r#Z1^gC-{sgJa43SUTkE0vp$Rbv#S8%2NK=jB`K8fhs
zNz<}gxsnFw7g^Q%Bv{H>C9)*B+H;g|BF-?%gnhH2a#*xm9=^&);n%e(h}^qeg%5AY
zIBON<vw(m(^05h<Q$+DmV2ix=4^3`BMK<3Bq<jO;`=4_6T&6a5T@8Tc?UpBT>py!=
y>G{u$s5K{osE1)idy(9)<A^zpHx!nTg8Uz$Z^n|~hfmW00000<MNUMnLSTZxE0e_l


From a0576349fee302c048512d334a2446bf3e0ce741 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Tue, 17 Nov 2015 07:55:32 +0100
Subject: [PATCH 096/354] provisioners/ansible(both): reorganize i18n texts

These adaptations will make even more sense with the upcoming
introduction of `ansible-galaxy` support.
---
 plugins/provisioners/ansible/config/base.rb   | 16 +++---
 plugins/provisioners/ansible/errors.rb        | 10 ++--
 .../provisioners/ansible/provisioner/guest.rb |  6 +--
 .../provisioners/ansible/provisioner/host.rb  |  2 +-
 templates/locales/en.yml                      | 54 +++++++++----------
 .../provisioners/ansible/config_test.rb       | 19 +++----
 6 files changed, 52 insertions(+), 55 deletions(-)

diff --git a/plugins/provisioners/ansible/config/base.rb b/plugins/provisioners/ansible/config/base.rb
index e0b610a27..66c765be7 100644
--- a/plugins/provisioners/ansible/config/base.rb
+++ b/plugins/provisioners/ansible/config/base.rb
@@ -57,26 +57,22 @@ module VagrantPlugins
 
           # Validate that a playbook path was provided
           if !playbook
-            @errors << I18n.t("vagrant.provisioners.ansible.no_playbook")
+            @errors << I18n.t("vagrant.provisioners.ansible.errors.no_playbook")
           end
 
-          # Validate the existence of the playbook
           if playbook
-            check_path_is_a_file(machine, playbook, "vagrant.provisioners.ansible.playbook_path_invalid")
+            check_path_is_a_file(machine, playbook, "vagrant.provisioners.ansible.errors.playbook_path_invalid")
           end
 
-          # Validate the existence of the inventory_path, if specified
           if inventory_path
-            check_path_exists(machine, inventory_path, "vagrant.provisioners.ansible.inventory_path_invalid")
+            check_path_exists(machine, inventory_path, "vagrant.provisioners.ansible.errors.inventory_path_invalid")
           end
 
-          # Validate the existence of the vault_password_file, if specified
           if vault_password_file
-            check_path_is_a_file(machine, vault_password_file, "vagrant.provisioners.ansible.vault_password_file_invalid")
+            check_path_is_a_file(machine, vault_password_file, "vagrant.provisioners.ansible.errors.vault_password_file_invalid")
           end
 
-          # Validate that extra_vars is either a hash, or a path to an
-          # existing file
+          # Validate that extra_vars is either a hash, or a path to an existing file
           if extra_vars
             extra_vars_is_valid = extra_vars.kind_of?(Hash) || extra_vars.kind_of?(String)
             if extra_vars.kind_of?(String)
@@ -92,7 +88,7 @@ module VagrantPlugins
 
             if !extra_vars_is_valid
               @errors << I18n.t(
-                "vagrant.provisioners.ansible.extra_vars_invalid",
+                "vagrant.provisioners.ansible.errors.extra_vars_invalid",
                 type:  extra_vars.class.to_s,
                 value: extra_vars.to_s)
             end
diff --git a/plugins/provisioners/ansible/errors.rb b/plugins/provisioners/ansible/errors.rb
index 2a6f8dbbd..aa154376e 100644
--- a/plugins/provisioners/ansible/errors.rb
+++ b/plugins/provisioners/ansible/errors.rb
@@ -8,15 +8,15 @@ module VagrantPlugins
       end
 
       class AnsiblePlaybookAppFailed < AnsibleError
-        error_key(:ansible_playbook_app_failed)
+        error_key(:ansible_command_failed)
       end
 
-      class AnsiblePlaybookAppNotFoundOnHost < AnsibleError
-        error_key(:ansible_playbook_app_not_found_on_host)
+      class AnsibleNotFoundOnHost < AnsibleError
+        error_key(:ansible_not_found_on_host)
       end
 
-      class AnsiblePlaybookAppNotFoundOnGuest < AnsibleError
-        error_key(:ansible_playbook_app_not_found_on_guest)
+      class AnsibleNotFoundOnGuest < AnsibleError
+        error_key(:ansible_not_found_on_guest)
       end
 
       class AnsibleVersionNotFoundOnGuest < AnsibleError
diff --git a/plugins/provisioners/ansible/provisioner/guest.rb b/plugins/provisioners/ansible/provisioner/guest.rb
index 285df8ac1..e2b6cb8dd 100644
--- a/plugins/provisioners/ansible/provisioner/guest.rb
+++ b/plugins/provisioners/ansible/provisioner/guest.rb
@@ -47,15 +47,15 @@ module VagrantPlugins
           if config.install &&
              (config.version.to_s.to_sym == :latest ||
               !@machine.guest.capability(:ansible_installed, config.version))
-            @machine.ui.detail(I18n.t("vagrant.provisioners.ansible.installing"))
+            @machine.ui.info(I18n.t("vagrant.provisioners.ansible.installing"))
             @machine.guest.capability(:ansible_install)
           end
 
           # Check for the existence of ansible-playbook binary on the guest,
           @machine.communicate.execute(
             "ansible-playbook --help",
-            :error_class => Ansible::Errors::AnsibleError,
-            :error_key => :ansible_playbook_app_not_found_on_guest)
+            :error_class => Ansible::Errors::AnsibleNotFoundOnGuest,
+            :error_key => :ansible_not_found_on_guest)
 
           # Check if requested ansible version is available
           if (!config.version.empty? &&
diff --git a/plugins/provisioners/ansible/provisioner/host.rb b/plugins/provisioners/ansible/provisioner/host.rb
index d25c88567..4b3e8881c 100644
--- a/plugins/provisioners/ansible/provisioner/host.rb
+++ b/plugins/provisioners/ansible/provisioner/host.rb
@@ -97,7 +97,7 @@ module VagrantPlugins
             end
             raise Ansible::Errors::AnsiblePlaybookAppFailed if result.exit_code != 0
           rescue Vagrant::Errors::CommandUnavailable
-            raise Ansible::Errors::AnsiblePlaybookAppNotFoundOnHost
+            raise Ansible::Errors::AnsibleNotFoundOnHost
           end
         end
 
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 9df64d907..886aec3c5 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -2039,12 +2039,16 @@ en:
         upload_path_not_set: "`upload_path` must be set for the shell provisioner."
 
       ansible:
+        cannot_detect: |-
+          Vagrant does not support detecting whether Ansible is installed
+          for the guest OS running in the machine. Vagrant will assume it is
+          installed and attempt to continue.
         errors:
-          ansible_playbook_app_failed: |-
+          ansible_command_failed: |-
             Ansible failed to complete successfully. Any error output should be
             visible above. Please fix these errors and try again.
-          ansible_playbook_app_not_found_on_guest: |-
-            The "ansible-playbook" program could not be found! Please verify
+          ansible_not_found_on_guest: |-
+            The Ansible software could not be found! Please verify
             that Ansible is correctly installed on your guest system.
 
             If you haven't installed Ansible yet, please install Ansible
@@ -2052,36 +2056,32 @@ en:
             `install` option of this provisioner. Please check
             http://docs.vagrantup.com/v2/provisioning/ansible_local.html
             for more information.
-          ansible_version_not_found_on_guest: |-
-            The requested Ansible version (%{required_version}) was not found on the guest.
-            Please check the ansible installation on your guest system,
-            or adapt the `version` option of this provisioner in your Vagrantfile.
-            See http://docs.vagrantup.com/v2/provisioning/ansible_local.html
-            for more information.
-          ansible_playbook_app_not_found_on_host: |-
-            The "ansible-playbook" program could not be found! Please verify
+          ansible_not_found_on_host: |-
+            The Ansible software could not be found! Please verify
             that Ansible is correctly installed on your host system.
 
             If you haven't installed Ansible yet, please install Ansible
             on your host system. Vagrant can't do this for you in a safe and
             automated way.
             Please check http://docs.ansible.com for more information.
-        extra_vars_invalid: |-
-          `extra_vars` for the Ansible provisioner must be a hash or a path to an existing file. Received: %{value} (as %{type})
-        inventory_path_invalid: |-
-          `inventory_path` for the Ansible provisioner does not exist on the %{system}: %{path}
-        no_playbook: |-
-          `playbook` must be set for the Ansible provisioner.
-        playbook_path_invalid: |-
-          `playbook` for the Ansible provisioner does not exist on the %{system}: %{path}
-        vault_password_file_invalid: |-
-          `vault_password_file` for the Ansible provisioner does not exist on the %{system}: %{path}
-        cannot_detect: |-
-          Vagrant does not support detecting whether Ansible is installed
-          for the guest OS running in the machine. Vagrant will assume it is
-          installed and attempt to continue.
-        installing: |-
-          Installing Ansible...
+          ansible_version_not_found_on_guest: |-
+            The requested Ansible version (%{required_version}) was not found on the guest.
+            Please check the ansible installation on your guest system,
+            or adapt the `version` option of this provisioner in your Vagrantfile.
+            See http://docs.vagrantup.com/v2/provisioning/ansible_local.html
+            for more information.
+          extra_vars_invalid: |-
+            `extra_vars` must be a hash or a path to an existing file. Received: %{value} (as %{type})
+          inventory_path_invalid: |-
+            `inventory_path` does not exist on the %{system}: %{path}
+          no_playbook: |-
+            `playbook` file path must be set.
+          playbook_path_invalid: |-
+            `playbook` does not exist on the %{system}: %{path}
+          vault_password_file_invalid: |-
+            `vault_password_file` does not exist on the %{system}: %{path}
+        installing: "Installing Ansible..."
+        running_playbook: "Running ansible-playbook..."
         windows_not_supported_for_control_machine: |-
           Windows is not officially supported for the Ansible Control Machine.
           Please check http://docs.ansible.com/intro_installation.html#control-machine-requirements
diff --git a/test/unit/plugins/provisioners/ansible/config_test.rb b/test/unit/plugins/provisioners/ansible/config_test.rb
index 3fdc66ddb..6cbd3f30d 100644
--- a/test/unit/plugins/provisioners/ansible/config_test.rb
+++ b/test/unit/plugins/provisioners/ansible/config_test.rb
@@ -94,7 +94,7 @@ describe VagrantPlugins::Ansible::Config::Host do
 
       result = subject.validate(machine)
       expect(result["ansible remote provisioner"]).to eql([
-        I18n.t("vagrant.provisioners.ansible.no_playbook")
+        I18n.t("vagrant.provisioners.ansible.errors.no_playbook")
       ])
     end
 
@@ -104,7 +104,7 @@ describe VagrantPlugins::Ansible::Config::Host do
 
       result = subject.validate(machine)
       expect(result["ansible remote provisioner"]).to eql([
-        I18n.t("vagrant.provisioners.ansible.playbook_path_invalid",
+        I18n.t("vagrant.provisioners.ansible.errors.playbook_path_invalid",
                path: non_existing_file, system: "host")
       ])
     end
@@ -131,7 +131,7 @@ describe VagrantPlugins::Ansible::Config::Host do
 
       result = subject.validate(machine)
       expect(result["ansible remote provisioner"]).to eql([
-        I18n.t("vagrant.provisioners.ansible.extra_vars_invalid",
+        I18n.t("vagrant.provisioners.ansible.errors.extra_vars_invalid",
                type:  subject.extra_vars.class.to_s,
                value: subject.extra_vars.to_s)
       ])
@@ -143,7 +143,7 @@ describe VagrantPlugins::Ansible::Config::Host do
 
       result = subject.validate(machine)
       expect(result["ansible remote provisioner"]).to eql([
-        I18n.t("vagrant.provisioners.ansible.extra_vars_invalid",
+        I18n.t("vagrant.provisioners.ansible.errors.extra_vars_invalid",
                type:  subject.extra_vars.class.to_s,
                value: subject.extra_vars.to_s)
       ])
@@ -163,7 +163,7 @@ describe VagrantPlugins::Ansible::Config::Host do
 
       result = subject.validate(machine)
       expect(result["ansible remote provisioner"]).to eql([
-        I18n.t("vagrant.provisioners.ansible.inventory_path_invalid",
+        I18n.t("vagrant.provisioners.ansible.errors.inventory_path_invalid",
                path: non_existing_file, system: "host")
       ])
     end
@@ -174,7 +174,8 @@ describe VagrantPlugins::Ansible::Config::Host do
 
       result = subject.validate(machine)
       expect(result["ansible remote provisioner"]).to eql([
-        I18n.t("vagrant.provisioners.ansible.vault_password_file_invalid",
+        I18n.t("vagrant.provisioners.ansible.errors.vault_password_file_invalid",
+               path: non_existing_file, system: "host")
                path: non_existing_file, system: "host")
       ])
     end
@@ -187,14 +188,14 @@ describe VagrantPlugins::Ansible::Config::Host do
 
       result = subject.validate(machine)
       expect(result["ansible remote provisioner"]).to include(
-        I18n.t("vagrant.provisioners.ansible.playbook_path_invalid",
+        I18n.t("vagrant.provisioners.ansible.errors.playbook_path_invalid",
                path: non_existing_file, system: "host"))
       expect(result["ansible remote provisioner"]).to include(
-        I18n.t("vagrant.provisioners.ansible.extra_vars_invalid",
+        I18n.t("vagrant.provisioners.ansible.errors.extra_vars_invalid",
                type:  subject.extra_vars.class.to_s,
                value: subject.extra_vars.to_s))
       expect(result["ansible remote provisioner"]).to include(
-        I18n.t("vagrant.provisioners.ansible.inventory_path_invalid",
+        I18n.t("vagrant.provisioners.ansible.errors.inventory_path_invalid",
                path: non_existing_file, system: "host"))
     end
 

From b9738a8c4c92306120961e89ca69a8d820d2ae37 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Tue, 17 Nov 2015 08:00:24 +0100
Subject: [PATCH 097/354] provisioners/ansible: add missing unit test

Related to #5292
---
 .../provisioners/ansible/provisioner_test.rb      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index dbcfe7d4f..fcc99cccb 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -678,7 +678,20 @@ VF
     # Special cases related to the Vagrant Host operating system in use
     #
 
-    context "with a Solaris-like host" do
+    context "on a Windows host" do
+      before do
+        Vagrant::Util::Platform.stub(windows?: true)
+        machine.ui.stub(:warn)
+      end
+
+      it "warns that Windows is not officially supported for the Ansible control machine" do
+        expect(machine.env.ui).to receive(:warn).with { |warning|
+          expect(warning).to eq(I18n.t("vagrant.provisioners.ansible.windows_not_supported_for_control_machine"))
+        }
+      end
+    end
+
+    context "on a Solaris-like host" do
       before do
         Vagrant::Util::Platform.stub(solaris?: true)
       end

From c1f3d114f52654e9f285499dd548409edc0c99fe Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Tue, 17 Nov 2015 22:06:06 +0100
Subject: [PATCH 098/354] provisioners/ansible(both): add galaxy support

Close #2718
---
 plugins/provisioners/ansible/config/base.rb   | 13 ++++
 plugins/provisioners/ansible/errors.rb        |  2 +-
 .../provisioners/ansible/provisioner/base.rb  | 20 ++++++
 .../provisioners/ansible/provisioner/guest.rb | 29 +++++---
 .../provisioners/ansible/provisioner/host.rb  | 67 +++++++++++++------
 templates/locales/en.yml                      |  3 +
 .../provisioners/ansible/config_test.rb       | 13 ++++
 .../provisioners/ansible/provisioner_test.rb  | 29 +++++++-
 .../v2/provisioning/ansible_common.html.md    | 24 +++++++
 9 files changed, 167 insertions(+), 33 deletions(-)

diff --git a/plugins/provisioners/ansible/config/base.rb b/plugins/provisioners/ansible/config/base.rb
index 66c765be7..04c703439 100644
--- a/plugins/provisioners/ansible/config/base.rb
+++ b/plugins/provisioners/ansible/config/base.rb
@@ -4,6 +4,9 @@ module VagrantPlugins
       class Base < Vagrant.plugin("2", :config)
 
         attr_accessor :extra_vars
+        attr_accessor :galaxy_role_file
+        attr_accessor :galaxy_roles_path
+        attr_accessor :galaxy_command
         attr_accessor :groups
         attr_accessor :inventory_path
         attr_accessor :limit
@@ -19,6 +22,9 @@ module VagrantPlugins
 
         def initialize
           @extra_vars          = UNSET_VALUE
+          @galaxy_role_file    = UNSET_VALUE
+          @galaxy_roles_path   = UNSET_VALUE
+          @galaxy_command      = UNSET_VALUE
           @groups              = UNSET_VALUE
           @inventory_path      = UNSET_VALUE
           @limit               = UNSET_VALUE
@@ -35,6 +41,9 @@ module VagrantPlugins
 
         def finalize!
           @extra_vars          = nil   if @extra_vars           == UNSET_VALUE
+          @galaxy_role_file    = nil   if @galaxy_role_file     == UNSET_VALUE
+          @galaxy_roles_path   = nil   if @galaxy_roles_path    == UNSET_VALUE
+          @galaxy_command      = "ansible-galaxy install --role-file=%{ROLE_FILE} --roles-path=%{ROLES_PATH} --force" if @galaxy_command == UNSET_VALUE
           @groups              = {}    if @groups               == UNSET_VALUE
           @inventory_path      = nil   if @inventory_path       == UNSET_VALUE
           @limit               = nil   if @limit                == UNSET_VALUE
@@ -68,6 +77,10 @@ module VagrantPlugins
             check_path_exists(machine, inventory_path, "vagrant.provisioners.ansible.errors.inventory_path_invalid")
           end
 
+          if galaxy_role_file
+            check_path_is_a_file(machine, galaxy_role_file, "vagrant.provisioners.ansible.errors.galaxy_role_file_invalid")
+          end
+
           if vault_password_file
             check_path_is_a_file(machine, vault_password_file, "vagrant.provisioners.ansible.errors.vault_password_file_invalid")
           end
diff --git a/plugins/provisioners/ansible/errors.rb b/plugins/provisioners/ansible/errors.rb
index aa154376e..06a1063cf 100644
--- a/plugins/provisioners/ansible/errors.rb
+++ b/plugins/provisioners/ansible/errors.rb
@@ -7,7 +7,7 @@ module VagrantPlugins
         error_namespace("vagrant.provisioners.ansible.errors")
       end
 
-      class AnsiblePlaybookAppFailed < AnsibleError
+      class AnsibleCommandFailed < AnsibleError
         error_key(:ansible_command_failed)
       end
 
diff --git a/plugins/provisioners/ansible/provisioner/base.rb b/plugins/provisioners/ansible/provisioner/base.rb
index 051473271..16f6d0d77 100644
--- a/plugins/provisioners/ansible/provisioner/base.rb
+++ b/plugins/provisioners/ansible/provisioner/base.rb
@@ -132,6 +132,26 @@ module VagrantPlugins
           end
         end
 
+        def get_galaxy_role_file(basedir)
+          Pathname.new(config.galaxy_role_file).expand_path(basedir)
+        end
+
+        def get_galaxy_roles_path(basedir)
+          if config.galaxy_roles_path
+            Pathname.new(config.galaxy_roles_path).expand_path(basedir)
+          else
+            File.join(Pathname.new(config.playbook).expand_path(basedir).parent, 'roles')
+          end
+        end
+
+        def ui_running_ansible_command(name, command)
+          @machine.ui.detail I18n.t("vagrant.provisioners.ansible.running_#{name}")
+          if verbosity_is_enabled?
+            # Show the ansible command in use
+            @machine.env.ui.detail(command)
+          end
+        end
+
         def verbosity_is_enabled?
           config.verbose && !config.verbose.to_s.empty?
         end
diff --git a/plugins/provisioners/ansible/provisioner/guest.rb b/plugins/provisioners/ansible/provisioner/guest.rb
index e2b6cb8dd..9e4346190 100644
--- a/plugins/provisioners/ansible/provisioner/guest.rb
+++ b/plugins/provisioners/ansible/provisioner/guest.rb
@@ -14,8 +14,7 @@ module VagrantPlugins
 
         def provision
           check_and_install_ansible
-          prepare_common_command_arguments
-          prepare_common_environment_variables
+          execute_ansible_galaxy_on_guest if config.galaxy_role_file
           execute_ansible_playbook_on_guest
         end
 
@@ -51,9 +50,9 @@ module VagrantPlugins
             @machine.guest.capability(:ansible_install)
           end
 
-          # Check for the existence of ansible-playbook binary on the guest,
+          # Check that ansible binaries are well installed on the guest,
           @machine.communicate.execute(
-            "ansible-playbook --help",
+            "ansible-galaxy --help && ansible-playbook --help",
             :error_class => Ansible::Errors::AnsibleNotFoundOnGuest,
             :error_key => :ansible_not_found_on_guest)
 
@@ -65,15 +64,27 @@ module VagrantPlugins
           end
         end
 
+        def execute_ansible_galaxy_on_guest
+          command_values = {
+            :ROLE_FILE => get_galaxy_role_file(config.provisioning_path),
+            :ROLES_PATH => get_galaxy_roles_path(config.provisioning_path)
+          }
+          remote_command = config.galaxy_command % command_values
+
+          ui_running_ansible_command "galaxy", remote_command
+
+          result = execute_on_guest(remote_command)
+          raise Ansible::Errors::AnsibleGalaxyAppFailed if result != 0
+        end
+
         def execute_ansible_playbook_on_guest
+          prepare_common_command_arguments
+          prepare_common_environment_variables
+
           command = (%w(ansible-playbook) << @command_arguments << config.playbook).flatten
           remote_command = "cd #{config.provisioning_path} && #{Helpers::stringify_ansible_playbook_command(@environment_variables, command)}"
 
-          # TODO: generic HOOK ???    
-          # Show the ansible command in use
-          if verbosity_is_enabled?
-            @machine.env.ui.detail(remote_command)
-          end
+          ui_running_ansible_command "playbook", remote_command
 
           result = execute_on_guest(remote_command)
           raise Ansible::Errors::AnsiblePlaybookAppFailed if result != 0
diff --git a/plugins/provisioners/ansible/provisioner/host.rb b/plugins/provisioners/ansible/provisioner/host.rb
index 4b3e8881c..61e576c97 100644
--- a/plugins/provisioners/ansible/provisioner/host.rb
+++ b/plugins/provisioners/ansible/provisioner/host.rb
@@ -19,8 +19,7 @@ module VagrantPlugins
           @ssh_info = @machine.ssh_info
 
           warn_for_unsupported_platform
-          prepare_command_arguments
-          prepare_environment_variables
+          execute_ansible_galaxy_from_host if config.galaxy_role_file
           execute_ansible_playbook_from_host
         end
 
@@ -72,33 +71,57 @@ module VagrantPlugins
           @environment_variables["ANSIBLE_SSH_ARGS"] = ansible_ssh_args unless ansible_ssh_args.empty?
         end
 
-        def execute_ansible_playbook_from_host
-          # Assemble the full ansible-playbook command
-          command = (%w(ansible-playbook) << @command_arguments << config.playbook).flatten
-
-          # TODO: generic HOOK ???    
-          # Show the ansible command in use
-          if verbosity_is_enabled?
-            @machine.env.ui.detail(Helpers::stringify_ansible_playbook_command(@environment_variables, command))
+        def execute_command_from_host(command)
+          begin
+            result = Vagrant::Util::Subprocess.execute(*command) do |type, data|
+              if type == :stdout || type == :stderr
+                @machine.env.ui.detail(data, new_line: false, prefix: false)
+              end
+            end
+            raise Ansible::Errors::AnsibleCommandFailed if result.exit_code != 0
+          rescue Vagrant::Errors::CommandUnavailable
+            raise Ansible::Errors::AnsibleNotFoundOnHost
           end
+        end
 
-          # Write stdout and stderr data, since it's the regular Ansible output
+        def execute_ansible_galaxy_from_host
+          command_values = {
+              :ROLE_FILE => get_galaxy_role_file(machine.env.root_path),
+              :ROLES_PATH => get_galaxy_roles_path(machine.env.root_path)
+            }
+          arg_separator = '__VAGRANT_ARG_SEPARATOR__'
+          command_template = config.galaxy_command.gsub(' ', arg_separator)
+          str_command = command_template % command_values
+
+          ui_running_ansible_command "galaxy", str_command.gsub(arg_separator, ' ')
+
+          command = str_command.split(arg_separator)
           command << {
-            env: @environment_variables,
+            # Write stdout and stderr data, since it's the regular Ansible output
             notify: [:stdout, :stderr],
             workdir: @machine.env.root_path.to_s
           }
 
-          begin
-            result = Vagrant::Util::Subprocess.execute(*command) do |type, data|
-              if type == :stdout || type == :stderr
-                @machine.env.ui.info(data, new_line: false, prefix: false)
-              end
-            end
-            raise Ansible::Errors::AnsiblePlaybookAppFailed if result.exit_code != 0
-          rescue Vagrant::Errors::CommandUnavailable
-            raise Ansible::Errors::AnsibleNotFoundOnHost
-          end
+          execute_command_from_host command
+        end
+
+        def execute_ansible_playbook_from_host
+          prepare_command_arguments
+          prepare_environment_variables
+
+          # Assemble the full ansible-playbook command
+          command = (%w(ansible-playbook) << @command_arguments << config.playbook).flatten
+
+          ui_running_ansible_command "playbook", Helpers::stringify_ansible_playbook_command(@environment_variables, command)
+
+          command << {
+            env: @environment_variables,
+            # Write stdout and stderr data, since it's the regular Ansible output
+            notify: [:stdout, :stderr],
+            workdir: @machine.env.root_path.to_s
+          }
+
+          execute_command_from_host command
         end
 
         def ship_generated_inventory(inventory_content)
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 886aec3c5..6bcb24689 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -2072,6 +2072,8 @@ en:
             for more information.
           extra_vars_invalid: |-
             `extra_vars` must be a hash or a path to an existing file. Received: %{value} (as %{type})
+          galaxy_role_file_invalid: |-
+            `galaxy_role_file` does not exist on the %{system}: %{path}
           inventory_path_invalid: |-
             `inventory_path` does not exist on the %{system}: %{path}
           no_playbook: |-
@@ -2081,6 +2083,7 @@ en:
           vault_password_file_invalid: |-
             `vault_password_file` does not exist on the %{system}: %{path}
         installing: "Installing Ansible..."
+        running_galaxy: "Running ansible-galaxy..."
         running_playbook: "Running ansible-playbook..."
         windows_not_supported_for_control_machine: |-
           Windows is not officially supported for the Ansible Control Machine.
diff --git a/test/unit/plugins/provisioners/ansible/config_test.rb b/test/unit/plugins/provisioners/ansible/config_test.rb
index 6cbd3f30d..0de4ac69e 100644
--- a/test/unit/plugins/provisioners/ansible/config_test.rb
+++ b/test/unit/plugins/provisioners/ansible/config_test.rb
@@ -20,6 +20,9 @@ describe VagrantPlugins::Ansible::Config::Host do
                             ask_vault_pass
                             extra_vars
                             force_remote_user
+                            galaxy_command
+                            galaxy_role_file
+                            galaxy_roles_path
                             groups
                             host_key_checking
                             inventory_path
@@ -176,6 +179,16 @@ describe VagrantPlugins::Ansible::Config::Host do
       expect(result["ansible remote provisioner"]).to eql([
         I18n.t("vagrant.provisioners.ansible.errors.vault_password_file_invalid",
                path: non_existing_file, system: "host")
+      ])
+    end
+
+    it "returns an error if galaxy_role_file is specified, but does not exist" do
+      subject.galaxy_role_file = non_existing_file
+      subject.finalize!
+
+      result = subject.validate(machine)
+      expect(result["ansible remote provisioner"]).to eql([
+        I18n.t("vagrant.provisioners.ansible.errors.galaxy_role_file_invalid",
                path: non_existing_file, system: "host")
       ])
     end
diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index fcc99cccb..94626389a 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -208,7 +208,7 @@ VF
         config.finalize!
         Vagrant::Util::Subprocess.stub(execute: Vagrant::Util::Subprocess::Result.new(1, "", ""))
 
-        expect {subject.provision}.to raise_error(VagrantPlugins::Ansible::Errors::AnsiblePlaybookAppFailed)
+        expect {subject.provision}.to raise_error(VagrantPlugins::Ansible::Errors::AnsibleCommandFailed)
       end
     end
 
@@ -583,6 +583,33 @@ VF
       end
     end
 
+    describe "with galaxy support" do
+
+      before do
+        config.galaxy_role_file = existing_file
+      end
+
+      it "raises an error when ansible-galaxy command fails", skip_before: true, skip_after: true do
+        config.finalize!
+        Vagrant::Util::Subprocess.stub(execute: Vagrant::Util::Subprocess::Result.new(1, "", ""))
+
+        expect {subject.provision}.to raise_error(VagrantPlugins::Ansible::Errors::AnsibleCommandFailed)
+      end
+
+      it "execute ansible-galaxy and ansible-playbook" do
+        # TODO: to be improved, but I'm currenty facing some issues, maybe only present in RSpec 2.14...
+        expect(Vagrant::Util::Subprocess).to receive(:execute).twice
+      end
+
+      describe "with verbose option enabled" do
+        before do
+          config.verbose = true
+        end
+
+        xit "shows the ansible-galaxy command in use"
+      end
+    end
+
     # The Vagrant Ansible provisioner does not validate the coherency of
     # argument combinations, and let ansible-playbook complain.
     describe "with a maximum of options" do
diff --git a/website/docs/source/v2/provisioning/ansible_common.html.md b/website/docs/source/v2/provisioning/ansible_common.html.md
index 3b6d7fbc1..aca7c2c14 100644
--- a/website/docs/source/v2/provisioning/ansible_common.html.md
+++ b/website/docs/source/v2/provisioning/ansible_common.html.md
@@ -51,6 +51,30 @@ Some of these options are for advanced usage only and should not be used unless
 
   By default, this option is disabled and Vagrant generates an inventory based on the `Vagrantfile` information.
 
+- `galaxy_command` (template string) - The command pattern used to install Galaxy roles when `galaxy_role_file` is set.
+
+  The following placeholders can be used in this command pattern:
+    - `%{ROLE_FILE}` is replaced by the absolute path to the `galaxy_role_file` option
+    - `%{ROLES_PATH}` is
+      * replaced by the absolute path to the `galaxy_roles_path` option when such option is defined
+      * replaced by the absolute path to a `roles` subdirectory sitting in the parent directory of the configured `playbook` file otherwise.
+
+  By default, this option is set to
+
+  ```
+  ansible-galaxy install --role-file=%{ROLE_FILE} --roles-path=%{ROLES_PATH} --force
+  ```
+
+- `galaxy_role_file` (string) - The path to the Ansible Galaxy role file.
+
+  By default, this option is set to `nil` and Galaxy support is then disabled.
+
+  Note: if an absolute path is given, the `ansible_local` provisioner will assume that it corresponds to the exact location on the guest system.
+
+- `galaxy_roles_path` (string) - The path to the directory where Ansible Galaxy roles must be installed
+
+  By default, this option is set to `nil`, which means that the Galaxy roles will be installed in a `roles` subdirectory located in the parent directory of the `playbook` file.
+
 - `limit` (string or array of strings) - Set of machines or groups from the inventory file to further control which hosts [are affected](http://docs.ansible.com/glossary.html#limit-groups).
 
   The default value is set to the machine name (taken from `Vagrantfile`) to ensure that `vagrant provision` command only affect the expected machine.

From 819c9b6425651e14a392dfc2f9cf460e1492d492 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Wed, 18 Nov 2015 09:37:27 +0100
Subject: [PATCH 099/354] provisioners/ansible_local: align console outputs

Use "info" level for main tasks (installing ansible, running galaxy,
running playbook).
Use "detail" level for subsequent details.
---
 plugins/provisioners/ansible/provisioner/base.rb  | 2 +-
 plugins/provisioners/ansible/provisioner/guest.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/provisioners/ansible/provisioner/base.rb b/plugins/provisioners/ansible/provisioner/base.rb
index 16f6d0d77..0fc24ecfb 100644
--- a/plugins/provisioners/ansible/provisioner/base.rb
+++ b/plugins/provisioners/ansible/provisioner/base.rb
@@ -148,7 +148,7 @@ module VagrantPlugins
           @machine.ui.detail I18n.t("vagrant.provisioners.ansible.running_#{name}")
           if verbosity_is_enabled?
             # Show the ansible command in use
-            @machine.env.ui.detail(command)
+            @machine.env.ui.detail command
           end
         end
 
diff --git a/plugins/provisioners/ansible/provisioner/guest.rb b/plugins/provisioners/ansible/provisioner/guest.rb
index 9e4346190..2397f66df 100644
--- a/plugins/provisioners/ansible/provisioner/guest.rb
+++ b/plugins/provisioners/ansible/provisioner/guest.rb
@@ -46,7 +46,7 @@ module VagrantPlugins
           if config.install &&
              (config.version.to_s.to_sym == :latest ||
               !@machine.guest.capability(:ansible_installed, config.version))
-            @machine.ui.info(I18n.t("vagrant.provisioners.ansible.installing"))
+            @machine.ui.detail I18n.t("vagrant.provisioners.ansible.installing")
             @machine.guest.capability(:ansible_install)
           end
 

From ff95fc5c1eeb2465cf0eeefe6ceb6a526d457932 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 10:43:29 -0800
Subject: [PATCH 100/354] Only append access_token the first time

This fixes GH-6395 by only appending the access_token once. It also fixes a
bug that was never reported. If a user supplied an access_token for a box URL,
Vagrant would silently overwrite it.

After this commit, Vagrant only appends an access_token to the URL if no
value exists at the key.
---
 .../login/middleware/add_authentication.rb    | 21 ++++++++++++++-----
 .../middleware/add_authentication_test.rb     | 16 ++++++++++++++
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/plugins/commands/login/middleware/add_authentication.rb b/plugins/commands/login/middleware/add_authentication.rb
index faaa3cfe7..f176e3480 100644
--- a/plugins/commands/login/middleware/add_authentication.rb
+++ b/plugins/commands/login/middleware/add_authentication.rb
@@ -1,3 +1,4 @@
+require "cgi"
 require "uri"
 
 require_relative "../client"
@@ -5,6 +6,9 @@ require_relative "../client"
 module VagrantPlugins
   module LoginCommand
     class AddAuthentication
+      VCLOUD = "vagrantcloud.com".freeze
+      ATLAS  = "atlas.hashicorp.com".freeze
+
       def initialize(app, env)
         @app = app
       end
@@ -19,19 +23,26 @@ module VagrantPlugins
           env[:box_urls].map! do |url|
             u = URI.parse(url)
             replace = u.host == server_uri.host
+
             if !replace
               # We need this in here for the transition we made from
               # Vagrant Cloud to Atlas. This preserves access tokens
               # appending to both without leaking access tokens to
               # unsavory URLs.
-              replace = u.host == "vagrantcloud.com" &&
-                server_uri.host == "atlas.hashicorp.com"
+              if u.host == VCLOUD && server_uri.host == ATLAS
+                replace = true
+              end
             end
 
             if replace
-              u.query ||= ""
-              u.query += "&" if u.query != ""
-              u.query += "access_token=#{token}"
+              q = CGI.parse(u.query || "")
+
+              current = q["access_token"]
+              if current && current.empty?
+                q["access_token"] = token
+              end
+
+              u.query = URI.encode_www_form(q)
             end
 
             u.to_s
diff --git a/test/unit/plugins/commands/login/middleware/add_authentication_test.rb b/test/unit/plugins/commands/login/middleware/add_authentication_test.rb
index 99c99a8af..ee4b2ab7d 100644
--- a/test/unit/plugins/commands/login/middleware/add_authentication_test.rb
+++ b/test/unit/plugins/commands/login/middleware/add_authentication_test.rb
@@ -84,5 +84,21 @@ describe VagrantPlugins::LoginCommand::AddAuthentication do
 
       expect(env[:box_urls]).to eq(expected)
     end
+
+    it "does not append multiple access_tokens" do
+      token = "foobarbaz"
+      VagrantPlugins::LoginCommand::Client.new(iso_env).store_token(token)
+
+      original = [
+        "#{server_url}/foo.box?access_token=existing",
+        "#{server_url}/bar.box?arg=true",
+      ]
+
+      env[:box_urls] = original.dup
+      subject.call(env)
+
+      expect(env[:box_urls][0]).to eq("#{server_url}/foo.box?access_token=existing")
+      expect(env[:box_urls][1]).to eq("#{server_url}/bar.box?arg=true&access_token=foobarbaz")
+    end
   end
 end

From e34af86acf323f0e0d9b4a279c3f7946d6bc50c1 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 10:46:17 -0800
Subject: [PATCH 101/354] commands/powershell

---
 CHANGELOG.md                                                | 2 ++
 plugins/commands/{ps => powershell}/command.rb              | 0
 plugins/commands/{ps => powershell}/errors.rb               | 0
 plugins/commands/{ps => powershell}/plugin.rb               | 6 +++---
 .../{ps => powershell}/scripts/enable_psremoting.ps1        | 0
 .../{ps => powershell}/scripts/reset_trustedhosts.ps1       | 0
 6 files changed, 5 insertions(+), 3 deletions(-)
 rename plugins/commands/{ps => powershell}/command.rb (100%)
 rename plugins/commands/{ps => powershell}/errors.rb (100%)
 rename plugins/commands/{ps => powershell}/plugin.rb (81%)
 rename plugins/commands/{ps => powershell}/scripts/enable_psremoting.ps1 (100%)
 rename plugins/commands/{ps => powershell}/scripts/reset_trustedhosts.ps1 (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5db527b2..80eb65a92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 FEATURES:
 
+  - **New Command: `vagrant powershell`**: For machines that support it,
+    this will open a PowerShell prompt.
   - **Linked Clones**: VirtualBox and VMware providers now support
     linked clones for very fast (millisecond) imports on up. [GH-4484]
   - **Snapshots**: The `vagrant snapshot` command can be used to checkpoint
diff --git a/plugins/commands/ps/command.rb b/plugins/commands/powershell/command.rb
similarity index 100%
rename from plugins/commands/ps/command.rb
rename to plugins/commands/powershell/command.rb
diff --git a/plugins/commands/ps/errors.rb b/plugins/commands/powershell/errors.rb
similarity index 100%
rename from plugins/commands/ps/errors.rb
rename to plugins/commands/powershell/errors.rb
diff --git a/plugins/commands/ps/plugin.rb b/plugins/commands/powershell/plugin.rb
similarity index 81%
rename from plugins/commands/ps/plugin.rb
rename to plugins/commands/powershell/plugin.rb
index b108658bc..325925115 100644
--- a/plugins/commands/ps/plugin.rb
+++ b/plugins/commands/powershell/plugin.rb
@@ -5,13 +5,13 @@ module VagrantPlugins
     autoload :Errors, File.expand_path("../errors", __FILE__)
 
     class Plugin < Vagrant.plugin("2")
-      name "ps command"
+      name "powershell command"
       description <<-DESC
-      The ps command opens a remote PowerShell session to the
+      The powershell command opens a remote PowerShell session to the
       machine if it supports powershell remoting.
       DESC
 
-      command("ps") do
+      command("powershell") do
         require_relative "command"
         init!
         Command
diff --git a/plugins/commands/ps/scripts/enable_psremoting.ps1 b/plugins/commands/powershell/scripts/enable_psremoting.ps1
similarity index 100%
rename from plugins/commands/ps/scripts/enable_psremoting.ps1
rename to plugins/commands/powershell/scripts/enable_psremoting.ps1
diff --git a/plugins/commands/ps/scripts/reset_trustedhosts.ps1 b/plugins/commands/powershell/scripts/reset_trustedhosts.ps1
similarity index 100%
rename from plugins/commands/ps/scripts/reset_trustedhosts.ps1
rename to plugins/commands/powershell/scripts/reset_trustedhosts.ps1

From 6bc286a70b6944aa80191834d5c88381aa879380 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 10:51:18 -0800
Subject: [PATCH 102/354] website: update docs for powershell

---
 plugins/commands/powershell/command.rb        |  2 +-
 website/docs/source/layouts/layout.erb        |  1 +
 website/docs/source/v2/cli/powershell.html.md | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 website/docs/source/v2/cli/powershell.html.md

diff --git a/plugins/commands/powershell/command.rb b/plugins/commands/powershell/command.rb
index 63963491a..9c25bd641 100644
--- a/plugins/commands/powershell/command.rb
+++ b/plugins/commands/powershell/command.rb
@@ -13,7 +13,7 @@ module VagrantPlugins
         options = {}
 
         opts = OptionParser.new do |o|
-          o.banner = "Usage: vagrant ps [-- extra ps args]"
+          o.banner = "Usage: vagrant powershell [-- extra powershell args]"
 
           o.separator ""
           o.separator "Options:"
diff --git a/website/docs/source/layouts/layout.erb b/website/docs/source/layouts/layout.erb
index bd7b056f4..5b4e14a9f 100644
--- a/website/docs/source/layouts/layout.erb
+++ b/website/docs/source/layouts/layout.erb
@@ -103,6 +103,7 @@
 									<li<%= sidebar_current("cli-login") %>><a href="/v2/cli/login.html">login</a></li>
 									<li<%= sidebar_current("cli-package") %>><a href="/v2/cli/package.html">package</a></li>
 									<li<%= sidebar_current("cli-plugin") %>><a href="/v2/cli/plugin.html">plugin</a></li>
+									<li<%= sidebar_current("cli-powershell") %>><a href="/v2/cli/powershell.html">powershell</a></li>
 									<li<%= sidebar_current("cli-provision") %>><a href="/v2/cli/provision.html">provision</a></li>
 									<li<%= sidebar_current("cli-rdp") %>><a href="/v2/cli/rdp.html">rdp</a></li>
 									<li<%= sidebar_current("cli-reload") %>><a href="/v2/cli/reload.html">reload</a></li>
diff --git a/website/docs/source/v2/cli/powershell.html.md b/website/docs/source/v2/cli/powershell.html.md
new file mode 100644
index 000000000..98e37acbc
--- /dev/null
+++ b/website/docs/source/v2/cli/powershell.html.md
@@ -0,0 +1,19 @@
+---
+page_title: "vagrant powershell - Command-Line Interface"
+sidebar_current: "cli-powershell"
+---
+
+# PowerShell
+
+**Command: `vagrant powershell`**
+
+This will open a PowerShell prompt into a running Vagrant machine.
+
+This command will only work if the machine supports PowerShell. Not every
+environment will support PowerShell.
+
+## Options
+
+* `-c COMMAND` or `--command COMMAND` - This executes a single PowerShell command,
+  prints out the stdout and stderr, and exits.
+

From d7f296175e0056586deb0804543788129f610846 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 10:54:21 -0800
Subject: [PATCH 103/354] Update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80eb65a92..2bfe301bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,8 @@ BUG FIXES:
     value in the generated inventory [GH-6209]
   - provisioners/ansible: don't show the `ansible-playbook` command when verbose
     option is an empty string
+  - core: only append `access_token` when it does not exist in the URL
+    [GH-6395, GH-6534]
 
 ## 1.7.4 (July 17, 2015)
 

From b69d635f757cad2eedce5cbb0bd9d4bb58f14899 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 10:59:29 -0800
Subject: [PATCH 104/354] commands/up: use sets

---
 plugins/commands/up/start_mixins.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/commands/up/start_mixins.rb b/plugins/commands/up/start_mixins.rb
index 8be96c68a..069ceb843 100644
--- a/plugins/commands/up/start_mixins.rb
+++ b/plugins/commands/up/start_mixins.rb
@@ -1,3 +1,5 @@
+require "set"
+
 module VagrantPlugins
   module CommandUp
     module StartMixins
@@ -27,14 +29,14 @@ module VagrantPlugins
       # This validates the provisioner flags and raises an exception
       # if there are invalid ones.
       def validate_provisioner_flags!(options, argv)
-        provisioner_instance_names = []
+        provisioner_names = Set.new
         with_target_vms(argv) do |machine|
-          provisioner_instance_names << machine.config.vm.provisioners.map(&:name)
+          machine.config.vm.provisioners.map(&:name).each do |name|
+            provisioner_names.add(name)
+          end
         end
 
-        provisioner_instance_names.flatten!.uniq!
-
-        if (provisioner_instance_names & options[:provision_types]).empty?
+        if (provisioner_names & options[:provision_types]).empty?
           (options[:provision_types] || []).each do |type|
               klass = Vagrant.plugin("2").manager.provisioners[type]
               if !klass

From 495af24026f640c9ecfed1e81a50b228d8eff6ea Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 11:01:20 -0800
Subject: [PATCH 105/354] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bfe301bc..104ac774c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ IMPROVEMENTS:
 
 BUG FIXES:
 
+  - commands/up: the `--provision-with` flag works with provisioner names [GH-5981]
   - communicator/winrm: respect `boot_timeout` setting [GH-6229]
   - provisioners/ansible: use quotes for the `ansible_ssh_private_key_file`
     value in the generated inventory [GH-6209]

From d1baffe064c9b98de70f5ce75652845d6b28a0e6 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 11:03:16 -0800
Subject: [PATCH 106/354] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 104ac774c..a7305d48a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@ BUG FIXES:
 
   - commands/up: the `--provision-with` flag works with provisioner names [GH-5981]
   - communicator/winrm: respect `boot_timeout` setting [GH-6229]
+  - guests/debian: graceful shutdown works properly with newer releases [GH-5986]
   - provisioners/ansible: use quotes for the `ansible_ssh_private_key_file`
     value in the generated inventory [GH-6209]
   - provisioners/ansible: don't show the `ansible-playbook` command when verbose

From b916be4d741464296176eda23bac85d450fb370c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 11:06:09 -0800
Subject: [PATCH 107/354] update CHANGELGO

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7305d48a..b7647d7b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@ BUG FIXES:
   - commands/up: the `--provision-with` flag works with provisioner names [GH-5981]
   - communicator/winrm: respect `boot_timeout` setting [GH-6229]
   - guests/debian: graceful shutdown works properly with newer releases [GH-5986]
+  - guests/suse: DHCP network interfaces properly configured [GH-6502]
   - provisioners/ansible: use quotes for the `ansible_ssh_private_key_file`
     value in the generated inventory [GH-6209]
   - provisioners/ansible: don't show the `ansible-playbook` command when verbose

From edffb130c32981195fb037b4b2473679be072d48 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 11:08:32 -0800
Subject: [PATCH 108/354] Update CHANGELOG

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7647d7b0..7883a01b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,10 @@ BUG FIXES:
   - core: only append `access_token` when it does not exist in the URL
     [GH-6395, GH-6534]
 
+PLUGIN AUTHOR CHANGES:
+
+  - installer: Upgrade to Ruby 2.2.3
+
 ## 1.7.4 (July 17, 2015)
 
 BUG FIXES:

From 566e21d3fc21b435e70c23798ae9ba4b0b7d816e Mon Sep 17 00:00:00 2001
From: Austin Schutz <austin@Austins-MacBook-Pro.local>
Date: Fri, 20 Jun 2014 13:15:24 -0700
Subject: [PATCH 109/354] add machine readable logging, action starts/ends

---
 lib/vagrant/machine.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/vagrant/machine.rb b/lib/vagrant/machine.rb
index 07ec0ac94..e70e99d6e 100644
--- a/lib/vagrant/machine.rb
+++ b/lib/vagrant/machine.rb
@@ -107,7 +107,8 @@ module Vagrant
       @provider_config = provider_config
       @provider_name   = provider_name
       @provider_options = provider_options
-      @ui              = Vagrant::UI::Prefixed.new(@env.ui, @name)
+      @ui              = @env.ui.is_a?(Vagrant::UI::MachineReadable) ? @env.ui.clone : Vagrant::UI::Prefixed.new(@env.ui, @name)
+      @ui.opts[:target] = name
       @ui_mutex        = Mutex.new
 
       # Read the ID, which is usually in local storage
@@ -188,7 +189,10 @@ module Vagrant
         end
 
         # Call the action
-        action_raw(name, callable, extra_env)
+        ui.machine("action", name.to_s, "start")
+        action_result = action_raw(name, callable, extra_env)
+        ui.machine("action", name.to_s, "end")
+        action_result
       end
     rescue Errors::EnvironmentLockedError
       raise Errors::MachineActionLockedError,

From 96e4544949c3ed238e642cb3bb6321cc226e1890 Mon Sep 17 00:00:00 2001
From: Austin Schutz <austin@Austins-MacBook-Pro.local>
Date: Mon, 7 Jul 2014 14:31:45 -0700
Subject: [PATCH 110/354] use env.ui for action logging

---
 lib/vagrant/machine.rb | 3 +--
 lib/vagrant/ui.rb      | 7 +++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/vagrant/machine.rb b/lib/vagrant/machine.rb
index e70e99d6e..4e66b08bf 100644
--- a/lib/vagrant/machine.rb
+++ b/lib/vagrant/machine.rb
@@ -107,8 +107,7 @@ module Vagrant
       @provider_config = provider_config
       @provider_name   = provider_name
       @provider_options = provider_options
-      @ui              = @env.ui.is_a?(Vagrant::UI::MachineReadable) ? @env.ui.clone : Vagrant::UI::Prefixed.new(@env.ui, @name)
-      @ui.opts[:target] = name
+      @ui              = Vagrant::UI::Prefixed.new(@env.ui, @name)
       @ui_mutex        = Mutex.new
 
       # Read the ID, which is usually in local storage
diff --git a/lib/vagrant/ui.rb b/lib/vagrant/ui.rb
index c610643a9..89f412325 100644
--- a/lib/vagrant/ui.rb
+++ b/lib/vagrant/ui.rb
@@ -321,11 +321,18 @@ module Vagrant
         target = opts[:target] if opts.key?(:target)
         target = "#{target}:" if target != ""
 
+
+
         # Get the lines. The first default is because if the message
         # is an empty string, then we want to still use the empty string.
         lines = [message]
         lines = message.split("\n") if message != ""
 
+        if @ui.is_a?(Vagrant::UI::MachineReadable)
+          return machine(type, message, { :target => target })
+        end
+         
+
         # Otherwise, make sure to prefix every line properly
         lines.map do |line|
           "#{prefix}#{target} #{line}"

From 3d6b11375a2ed27ffa775a36995aa5fe8d397197 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 11:21:39 -0800
Subject: [PATCH 111/354] commands/plugin: plugin-clean-sources

---
 plugins/commands/plugin/command/mixin_install_opts.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/commands/plugin/command/mixin_install_opts.rb b/plugins/commands/plugin/command/mixin_install_opts.rb
index ffee55cde..004fd10b0 100644
--- a/plugins/commands/plugin/command/mixin_install_opts.rb
+++ b/plugins/commands/plugin/command/mixin_install_opts.rb
@@ -22,9 +22,9 @@ module VagrantPlugins
             puts
           end
 
-          o.on("--plugin-clean-sources", String,
-            "Remove all plugin sources defined so far (including defaults)") do
-            options[:plugin_sources] = []
+          o.on("--plugin-clean-sources",
+            "Remove all plugin sources defined so far (including defaults)") do |clean|
+            options[:plugin_sources] = [] if clean
           end
 
           o.on("--plugin-source PLUGIN_SOURCE", String,

From 82f968fe44c8d72a9a8c3292d1784542bc4618ed Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 11:22:42 -0800
Subject: [PATCH 112/354] website/docs: update for new plugin flag

---
 website/docs/source/v2/cli/plugin.html.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/website/docs/source/v2/cli/plugin.html.md b/website/docs/source/v2/cli/plugin.html.md
index a92cc42cb..f38a8af9a 100644
--- a/website/docs/source/v2/cli/plugin.html.md
+++ b/website/docs/source/v2/cli/plugin.html.md
@@ -42,6 +42,10 @@ This command accepts optional command-line flags:
   Most of the time, this is correct. If the plugin you're installing has
   another entrypoint, this flag can be used to specify it.
 
+* `--plugin-clean-sources` - Clears all sources that have been defined so
+  far. This is an advanced feature. The use case is primarily for corporate
+  firewalls that prevent access to RubyGems.org.
+
 * `--plugin-source SOURCE` - Adds a source from which to fetch a plugin. Note
   that this doesn't only affect the single plugin being installed, by all future
   plugin as well. This is a limitation of the underlying plugin installer

From 4e7aa4cc3c41f3c0c8a90548b5e8147ec2a10dce Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 11:23:23 -0800
Subject: [PATCH 113/354] update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7883a01b1..04d858278 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,8 @@ BREAKING CHANGES:
 IMPROVEMENTS:
 
   - core: allow removal of all box versions with `--all` flag [GH-3462]
+  - command/plugin: Add `--plugin-clean-sources` flag to reset plugin install
+      sources, primarily for corp firewalls. [GH-4738]
   - provisioners/ansible: add new `force_remote_user` option to control whether
     `ansible_ssh_user` parameter should be applied or not [GH-6348]
   - provisioners/ansible: show a warning when running from a Windows Host [GH-5292]

From 6db0e0ddfb69c4dc2f83cd50b032c275669ddbd1 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 11:32:38 -0800
Subject: [PATCH 114/354] update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04d858278..451603fd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,8 @@ BUG FIXES:
     value in the generated inventory [GH-6209]
   - provisioners/ansible: don't show the `ansible-playbook` command when verbose
     option is an empty string
+  - provisioners/puppet: apply provisioner uses correct default manifests
+      with environments. [GH-5987]
   - core: only append `access_token` when it does not exist in the URL
     [GH-6395, GH-6534]
 

From 9730df3b7885ce14edeb302fdf42933f9e624c00 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 11:39:45 -0800
Subject: [PATCH 115/354] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 451603fd4..c85b65ffe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@ BUG FIXES:
     option is an empty string
   - provisioners/puppet: apply provisioner uses correct default manifests
       with environments. [GH-5987]
+  - provisioners/salt: call correct executables on Windows [GH-5999]
   - core: only append `access_token` when it does not exist in the URL
     [GH-6395, GH-6534]
 

From fedc7e21b3d3b61e3a2bc7b085d0de494ad8ac71 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 11:56:07 -0800
Subject: [PATCH 116/354] provisioners/salt: deprecate config_dir

---
 CHANGELOG.md                                       | 4 +++-
 plugins/provisioners/salt/config.rb                | 4 ++++
 test/unit/plugins/provisioners/salt/config_test.rb | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c85b65ffe..c3cfb09a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,13 +15,15 @@ FEATURES:
 
 BREAKING CHANGES:
 
-  - the `ansible` provisioner now can override the effective ansible remote user
+  - The `ansible` provisioner now can override the effective ansible remote user
     (i.e. `ansible_ssh_user` setting) to always correspond to the vagrant ssh
     username. This change is enabled by default, but we expect this to affect
     only a tiny number of people as it corresponds to the common usage.
     If you however use multiple remote usernames in your Ansible plays, tasks,
     or custom inventories, you can simply set the option `force_remote_user` to
     false to make Vagrant behave the same as before.
+  - provisioners/salt: the "config_dir" option has been removed. It has no
+      effect in Vagrant 1.8. [GH-6073]
 
 IMPROVEMENTS:
 
diff --git a/plugins/provisioners/salt/config.rb b/plugins/provisioners/salt/config.rb
index 38aaec8de..4bf342d45 100644
--- a/plugins/provisioners/salt/config.rb
+++ b/plugins/provisioners/salt/config.rb
@@ -4,6 +4,10 @@ require "vagrant/util/deep_merge"
 module VagrantPlugins
   module Salt
     class Config < Vagrant.plugin("2", :config)
+      ## @deprecated
+      def config_dir=(value)
+        puts "salt config_dir is deprecated and will be removed in Vagrant 1.9"
+      end
 
       ## salty-vagrant options
       attr_accessor :minion_config
diff --git a/test/unit/plugins/provisioners/salt/config_test.rb b/test/unit/plugins/provisioners/salt/config_test.rb
index 24bf24796..92e935db0 100644
--- a/test/unit/plugins/provisioners/salt/config_test.rb
+++ b/test/unit/plugins/provisioners/salt/config_test.rb
@@ -16,6 +16,12 @@ describe VagrantPlugins::Salt::Config do
 
   let(:machine) { iso_env.machine(iso_env.machine_names[0], :dummy) }
 
+  describe "#config_dir" do
+    it "is deprecated until Vagrant 1.9" do
+      raise "Remove the deprecation" if Vagrant::VERSION >= "1.9.0"
+    end
+  end
+
   describe "validate" do
     let(:error_key) { "salt provisioner" }
 

From fbd8c370adb0914f41fb73f9a9499e92b658048e Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 12:05:41 -0800
Subject: [PATCH 117/354] update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3cfb09a4..e5277984b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,8 @@ IMPROVEMENTS:
 
 BUG FIXES:
 
+  - core: DHCP network configurations don't warn on IP addresses ending
+      in ".1" [GH-6150]
   - commands/up: the `--provision-with` flag works with provisioner names [GH-5981]
   - communicator/winrm: respect `boot_timeout` setting [GH-6229]
   - guests/debian: graceful shutdown works properly with newer releases [GH-5986]

From f02eb93d172c44930e0123d3e77928c1becaba4d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 12:11:17 -0800
Subject: [PATCH 118/354] update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5277984b..09733d65a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,8 @@ BUG FIXES:
   - provisioners/puppet: apply provisioner uses correct default manifests
       with environments. [GH-5987]
   - provisioners/salt: call correct executables on Windows [GH-5999]
+  - synced\_folders/rsync: on Windows, replace all paths with Cygwin
+      paths since all rsync implementations require this [GH-6160]
   - core: only append `access_token` when it does not exist in the URL
     [GH-6395, GH-6534]
 

From dde21bc95a30bf01eef3697f94c073bcdd4918bf Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 12:48:41 -0800
Subject: [PATCH 119/354] fix file permissions

---
 plugins/communicators/winrm/communicator.rb                | 0
 plugins/communicators/winrm/scripts/elevated_shell.ps1.erb | 0
 plugins/communicators/winrm/shell.rb                       | 0
 plugins/provisioners/shell/config.rb                       | 0
 plugins/provisioners/shell/provisioner.rb                  | 0
 website/docs/source/v2/provisioning/shell.html.md          | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 plugins/communicators/winrm/communicator.rb
 mode change 100755 => 100644 plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
 mode change 100755 => 100644 plugins/communicators/winrm/shell.rb
 mode change 100755 => 100644 plugins/provisioners/shell/config.rb
 mode change 100755 => 100644 plugins/provisioners/shell/provisioner.rb
 mode change 100755 => 100644 website/docs/source/v2/provisioning/shell.html.md

diff --git a/plugins/communicators/winrm/communicator.rb b/plugins/communicators/winrm/communicator.rb
old mode 100755
new mode 100644
diff --git a/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb b/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
old mode 100755
new mode 100644
diff --git a/plugins/communicators/winrm/shell.rb b/plugins/communicators/winrm/shell.rb
old mode 100755
new mode 100644
diff --git a/plugins/provisioners/shell/config.rb b/plugins/provisioners/shell/config.rb
old mode 100755
new mode 100644
diff --git a/plugins/provisioners/shell/provisioner.rb b/plugins/provisioners/shell/provisioner.rb
old mode 100755
new mode 100644
diff --git a/website/docs/source/v2/provisioning/shell.html.md b/website/docs/source/v2/provisioning/shell.html.md
old mode 100755
new mode 100644

From 034979321343f2accc1ac27415bac9ea0173eef6 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 12:49:27 -0800
Subject: [PATCH 120/354] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09733d65a..697fcaf43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ IMPROVEMENTS:
   - core: allow removal of all box versions with `--all` flag [GH-3462]
   - command/plugin: Add `--plugin-clean-sources` flag to reset plugin install
       sources, primarily for corp firewalls. [GH-4738]
+  - communicators/winrm: Support interactive mode for elevated scripts [GH-6185]
   - provisioners/ansible: add new `force_remote_user` option to control whether
     `ansible_ssh_user` parameter should be applied or not [GH-6348]
   - provisioners/ansible: show a warning when running from a Windows Host [GH-5292]

From e6098f6c4f725c3450ae2bb14940aceb73a8266d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 12:51:18 -0800
Subject: [PATCH 121/354] rename to powershell_elevated_interactive

---
 CHANGELOG.md                                        | 3 ++-
 plugins/provisioners/shell/config.rb                | 8 ++++----
 plugins/provisioners/shell/provisioner.rb           | 2 +-
 test/unit/plugins/provisioners/shell/config_test.rb | 2 +-
 website/docs/source/v2/provisioning/shell.html.md   | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 697fcaf43..652583e2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,7 +30,8 @@ IMPROVEMENTS:
   - core: allow removal of all box versions with `--all` flag [GH-3462]
   - command/plugin: Add `--plugin-clean-sources` flag to reset plugin install
       sources, primarily for corp firewalls. [GH-4738]
-  - communicators/winrm: Support interactive mode for elevated scripts [GH-6185]
+  - provisioners/shell: Support interactive mode for elevated PowerShell
+      scripts [GH-6185]
   - provisioners/ansible: add new `force_remote_user` option to control whether
     `ansible_ssh_user` parameter should be applied or not [GH-6348]
   - provisioners/ansible: show a warning when running from a Windows Host [GH-5292]
diff --git a/plugins/provisioners/shell/config.rb b/plugins/provisioners/shell/config.rb
index aaadb8081..24021e9de 100644
--- a/plugins/provisioners/shell/config.rb
+++ b/plugins/provisioners/shell/config.rb
@@ -12,7 +12,7 @@ module VagrantPlugins
       attr_accessor :keep_color
       attr_accessor :name
       attr_accessor :powershell_args
-      attr_accessor :elevated_interactive
+      attr_accessor :powershell_elevated_interactive
 
       def initialize
         @args                  = UNSET_VALUE
@@ -24,7 +24,7 @@ module VagrantPlugins
         @keep_color            = UNSET_VALUE
         @name                  = UNSET_VALUE
         @powershell_args       = UNSET_VALUE
-        @elevated_interactive  = UNSET_VALUE
+        @powershell_elevated_interactive  = UNSET_VALUE
       end
 
       def finalize!
@@ -37,7 +37,7 @@ module VagrantPlugins
         @keep_color           = false if @keep_color == UNSET_VALUE
         @name                 = nil if @name == UNSET_VALUE
         @powershell_args      = "-ExecutionPolicy Bypass" if @powershell_args == UNSET_VALUE
-        @elevated_interactive = false if @elevated_interactive == UNSET_VALUE
+        @powershell_elevated_interactive = false if @powershell_elevated_interactive == UNSET_VALUE
 
         if @args && args_valid?
           @args = @args.is_a?(Array) ? @args.map { |a| a.to_s } : @args.to_s
@@ -81,7 +81,7 @@ module VagrantPlugins
           errors << I18n.t("vagrant.provisioners.shell.args_bad_type")
         end
 
-        if elevated_interactive && !privileged
+        if powershell_elevated_interactive && !privileged
           errors << I18n.t("vagrant.provisioners.shell.interactive_not_elevated")
         end
 
diff --git a/plugins/provisioners/shell/provisioner.rb b/plugins/provisioners/shell/provisioner.rb
index 1abfc4889..6899f11da 100644
--- a/plugins/provisioners/shell/provisioner.rb
+++ b/plugins/provisioners/shell/provisioner.rb
@@ -137,7 +137,7 @@ module VagrantPlugins
             end
 
             # Execute it with sudo
-            comm.sudo(command, { elevated: config.privileged, interactive: config.elevated_interactive }) do |type, data|
+            comm.sudo(command, { elevated: config.privileged, interactive: config.powershell_elevated_interactive }) do |type, data|
               handle_comm(type, data)
             end
           end
diff --git a/test/unit/plugins/provisioners/shell/config_test.rb b/test/unit/plugins/provisioners/shell/config_test.rb
index 582740162..c0f04dd2f 100644
--- a/test/unit/plugins/provisioners/shell/config_test.rb
+++ b/test/unit/plugins/provisioners/shell/config_test.rb
@@ -88,7 +88,7 @@ describe "VagrantPlugins::Shell::Config" do
 
     it "returns an error if elevated_interactive is true but privileged is false" do
       subject.path = file_that_exists
-      subject.elevated_interactive = true
+      subject.powershell_elevated_interactive = true
       subject.privileged = false
       subject.finalize!
 
diff --git a/website/docs/source/v2/provisioning/shell.html.md b/website/docs/source/v2/provisioning/shell.html.md
index 783ce948e..d5b0d6174 100644
--- a/website/docs/source/v2/provisioning/shell.html.md
+++ b/website/docs/source/v2/provisioning/shell.html.md
@@ -66,7 +66,7 @@ The remainder of the available options are optional:
 * `powershell_args` (string) - Extra arguments to pass to `PowerShell`
   if you're provisioning with PowerShell on Windows.
 
-* `elevated_interactive` (boolean) - Run an elevated script in interactive mode
+* `powershell_elevated_interactive` (boolean) - Run an elevated script in interactive mode
   on Windows. By default this is "false". Must also be `privileged`. Be sure to
   enable auto-login for Windows as the user must be logged in for interactive
   mode to work.

From 10c53dfb4b32f17049a17c091ba9cc1e998c9cd0 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 12:54:42 -0800
Subject: [PATCH 122/354] update CHANGELOG

---
 CHANGELOG.md                                               | 2 ++
 plugins/communicators/winrm/scripts/elevated_shell.ps1.erb | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 652583e2d..3395b55cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,8 @@ BUG FIXES:
       in ".1" [GH-6150]
   - commands/up: the `--provision-with` flag works with provisioner names [GH-5981]
   - communicator/winrm: respect `boot_timeout` setting [GH-6229]
+  - communicator/winrm: execute scheduled tasks immediately on Windows XP
+      since elevation isn't required [GH-6195]
   - guests/debian: graceful shutdown works properly with newer releases [GH-5986]
   - guests/suse: DHCP network interfaces properly configured [GH-6502]
   - provisioners/ansible: use quotes for the `ansible_ssh_private_key_file`
diff --git a/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb b/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
index 5cdd58bda..a33644bd8 100644
--- a/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
+++ b/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
@@ -1,5 +1,8 @@
 param([String]$username, [String]$password, [String]$encoded_command)
 
+# Try to get the Schedule.Service object. If it fails, we are probably
+# on an older version of Windows. On old versions, we can just execute
+# directly since priv. escalation isn't a thing.
 $schedule = $null
 Try {
   $schedule = New-Object -ComObject "Schedule.Service"

From 5b3bc95388629f7275c3807d4048d17651d52892 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 12:55:53 -0800
Subject: [PATCH 123/354] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3395b55cf..a37ad40ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@ BUG FIXES:
   - communicator/winrm: execute scheduled tasks immediately on Windows XP
       since elevation isn't required [GH-6195]
   - guests/debian: graceful shutdown works properly with newer releases [GH-5986]
+  - guests/fedora: Preserve `localhost` entry when changing hostname [GH-6203]
   - guests/suse: DHCP network interfaces properly configured [GH-6502]
   - provisioners/ansible: use quotes for the `ansible_ssh_private_key_file`
     value in the generated inventory [GH-6209]

From e71e60ecac4d6b870e18245bd3c7af10c4e13e0a Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 13:05:08 -0800
Subject: [PATCH 124/354] website/docs: document WinRM execution time limit

---
 CHANGELOG.md                                           |  1 +
 .../docs/source/v2/vagrantfile/winrm_settings.html.md  | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a37ad40ed..bc5809070 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ IMPROVEMENTS:
   - core: allow removal of all box versions with `--all` flag [GH-3462]
   - command/plugin: Add `--plugin-clean-sources` flag to reset plugin install
       sources, primarily for corp firewalls. [GH-4738]
+  - communicators/winrm: Configurable execution time limit [GH-6213]
   - provisioners/shell: Support interactive mode for elevated PowerShell
       scripts [GH-6185]
   - provisioners/ansible: add new `force_remote_user` option to control whether
diff --git a/website/docs/source/v2/vagrantfile/winrm_settings.html.md b/website/docs/source/v2/vagrantfile/winrm_settings.html.md
index add316a40..db1ced243 100644
--- a/website/docs/source/v2/vagrantfile/winrm_settings.html.md
+++ b/website/docs/source/v2/vagrantfile/winrm_settings.html.md
@@ -46,10 +46,16 @@ to use port 4567 to talk to the guest if there is no other option.
 
 <hr>
 
+`config.winrm.execution_time_limit` - The maximum duration that a WinRM
+task can execute for. This defaults to two hours. The format of this value
+must be in this [Microsoft-documented format](https://msdn.microsoft.com/en-us/library/aa382678.aspx).
+
+<hr>
+
 <strong>Warning:</strong> In order for Vagrant to communicate with a Windows
 guest, you must allow unencrypted WinRM connections on the guest machine
 itself. Some public boxes already have this configured, but if you are
-attempting to `vagrant up` a Windows box and the command hangs at 
+attempting to `vagrant up` a Windows box and the command hangs at
 `Waiting for WinRM to become available...`, then you will need to run the
 commands below on the guest machine itself, at the box setup stage,
 after provisioning, or through a start up script.
@@ -57,4 +63,4 @@ after provisioning, or through a start up script.
 <pre class="prettyprint">
 Set-Item WSMan:\localhost\Service\AllowUnencrypted -Value True
 Set-Item WSMan:\localhost\Service\Auth\Basic -Value True
-</pre>
\ No newline at end of file
+</pre>

From cf2566f18610f61fd906faba76609e6b5afcbb48 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 13:16:01 -0800
Subject: [PATCH 125/354] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc5809070..f41b1c97b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@ BUG FIXES:
     option is an empty string
   - provisioners/puppet: apply provisioner uses correct default manifests
       with environments. [GH-5987]
+  - provisioners/puppet: find Puppet binary properly on Windows [GH-6259]
   - provisioners/salt: call correct executables on Windows [GH-5999]
   - synced\_folders/rsync: on Windows, replace all paths with Cygwin
       paths since all rsync implementations require this [GH-6160]

From 5fe58dfb1ab6f1b855aa4761e701e51db7a671c1 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 13:47:46 -0800
Subject: [PATCH 126/354] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f41b1c97b..a5895b443 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@ BUG FIXES:
       since elevation isn't required [GH-6195]
   - guests/debian: graceful shutdown works properly with newer releases [GH-5986]
   - guests/fedora: Preserve `localhost` entry when changing hostname [GH-6203]
+  - guests/fedora: Use dnf if it is available [GH-6301]
   - guests/suse: DHCP network interfaces properly configured [GH-6502]
   - provisioners/ansible: use quotes for the `ansible_ssh_private_key_file`
     value in the generated inventory [GH-6209]

From 774940521ec1ead5449b671927ee34177eae9dcf Mon Sep 17 00:00:00 2001
From: Seng Lin Shee <senglin@ultimatesoftware.com>
Date: Tue, 22 Sep 2015 23:27:13 -0400
Subject: [PATCH 127/354] Ignore Powershell progress updates on stderr

Starting with PowerShell 5, the progress bar can be observed via the
Write-Progress cmdlet. From WinRM, this appears as a stderr output.
Vagrant assumes that there is error if output appears on stderr.

This terminates various scripts which previously executed successfully
in Vagrant (prior to Windows 10).

This fix injects a variable assignment at various points of the script
execution process to disable display of the progress bar.
---
 plugins/communicators/winrm/communicator.rb                | 7 ++++---
 plugins/communicators/winrm/scripts/elevated_shell.ps1.erb | 1 +
 plugins/communicators/winrm/shell.rb                       | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/communicators/winrm/communicator.rb b/plugins/communicators/winrm/communicator.rb
index ee8cd9801..0b27e73fa 100644
--- a/plugins/communicators/winrm/communicator.rb
+++ b/plugins/communicators/winrm/communicator.rb
@@ -212,10 +212,11 @@ module VagrantPlugins
           file.unlink
         end
 
-        # convert to double byte unicode string then base64 encode
-        # just like PowerShell -EncodedCommand expects
+        # Convert to double byte unicode string then base64 encode
+        # just like PowerShell -EncodedCommand expects.
+        # Suppress the progress stream from leaking to stderr.
         wrapped_encoded_command = Base64.strict_encode64(
-          "#{command}; exit $LASTEXITCODE".encode('UTF-16LE', 'UTF-8'))
+          "$ProgressPreference='SilentlyContinue'; #{command}; exit $LASTEXITCODE".encode('UTF-16LE', 'UTF-8'))
 
         "powershell -executionpolicy bypass -file \"#{guest_script_path}\" " +
           "-username \"#{shell.username}\" -password \"#{shell.password}\" " +
diff --git a/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb b/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
index 3d02f9ea9..76b260b78 100644
--- a/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
+++ b/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
@@ -11,6 +11,7 @@ Try {
   exit $LASTEXITCODE
 }
 
+$ProgressPreference = "SilentlyContinue"
 $task_name = "WinRM_Elevated_Shell"
 $out_file = "$env:SystemRoot\Temp\WinRM_Elevated_Shell.log"
 
diff --git a/plugins/communicators/winrm/shell.rb b/plugins/communicators/winrm/shell.rb
index 683358983..f8a50a3a7 100644
--- a/plugins/communicators/winrm/shell.rb
+++ b/plugins/communicators/winrm/shell.rb
@@ -54,8 +54,10 @@ module VagrantPlugins
       end
 
       def powershell(command, &block)
-        # ensure an exit code
+        # Suppress the progress stream from leaking to stderr
+        command = "$ProgressPreference='SilentlyContinue';\r\n" + command
         command << "\r\n"
+        # Ensure an exit code
         command << "if ($?) { exit 0 } else { if($LASTEXITCODE) { exit $LASTEXITCODE } else { exit 1 } }"
         execute_shell(command, :powershell, &block)
       end

From f1647ddea6a856039fe4ced7c21368c38c2f98c9 Mon Sep 17 00:00:00 2001
From: Seng Lin Shee <senglin@ultimatesoftware.com>
Date: Wed, 23 Sep 2015 02:44:05 -0400
Subject: [PATCH 128/354] Fixed unit test.

Command is now wrapped in more PowerShell scripts, changing its final encoded value.
---
 test/unit/plugins/communicators/winrm/communicator_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/plugins/communicators/winrm/communicator_test.rb b/test/unit/plugins/communicators/winrm/communicator_test.rb
index e571ab020..e65ce15ce 100644
--- a/test/unit/plugins/communicators/winrm/communicator_test.rb
+++ b/test/unit/plugins/communicators/winrm/communicator_test.rb
@@ -89,7 +89,7 @@ describe VagrantPlugins::CommunicatorWinRM::Communicator do
       expect(shell).to receive(:upload).with(kind_of(String), "c:/tmp/vagrant-elevated-shell.ps1")
       expect(shell).to receive(:powershell) do |cmd|
         expect(cmd).to eq("powershell -executionpolicy bypass -file \"c:/tmp/vagrant-elevated-shell.ps1\" " +
-          "-username \"vagrant\" -password \"password\" -encoded_command \"ZABpAHIAOwAgAGUAeABpAHQAIAAkAEwAQQBTAFQARQBYAEkAVABDAE8ARABFAA==\" -execution_time_limit \"PT2H\"")
+          "-username \"vagrant\" -password \"password\" -encoded_command \"JABQAHIAbwBnAHIAZQBzAHMAUAByAGUAZgBlAHIAZQBuAGMAZQA9ACcAUwBpAGwAZQBuAHQAbAB5AEMAbwBuAHQAaQBuAHUAZQAnADsAIABkAGkAcgA7ACAAZQB4AGkAdAAgACQATABBAFMAVABFAFgASQBUAEMATwBEAEUA\" -execution_time_limit \"PT2H\"")
       end.and_return({ exitcode: 0 })
       expect(subject.execute("dir", { elevated: true })).to eq(0)
     end

From 9c2a9f198f0957200b4df1a014ac16452c975b60 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 13:59:45 -0800
Subject: [PATCH 129/354] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5895b443..fa53a95c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@ BUG FIXES:
   - communicator/winrm: respect `boot_timeout` setting [GH-6229]
   - communicator/winrm: execute scheduled tasks immediately on Windows XP
       since elevation isn't required [GH-6195]
+  - communicator/winrm: Hide progress bars from PowerShell v5 [GH-6309]
   - guests/debian: graceful shutdown works properly with newer releases [GH-5986]
   - guests/fedora: Preserve `localhost` entry when changing hostname [GH-6203]
   - guests/fedora: Use dnf if it is available [GH-6301]

From fb11ea2a7c24f00ec4a5df881d346507e95dc9a4 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 14:02:32 -0800
Subject: [PATCH 130/354] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa53a95c9..11b9b870f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@ BUG FIXES:
   - guests/fedora: Preserve `localhost` entry when changing hostname [GH-6203]
   - guests/fedora: Use dnf if it is available [GH-6301]
   - guests/suse: DHCP network interfaces properly configured [GH-6502]
+  - hosts/slackware: Better detection of NFS [GH-6367]
   - provisioners/ansible: use quotes for the `ansible_ssh_private_key_file`
     value in the generated inventory [GH-6209]
   - provisioners/ansible: don't show the `ansible-playbook` command when verbose

From 50ce81face3c5873cb4aa80e76704e20c53b34fa Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 14:03:35 -0800
Subject: [PATCH 131/354] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11b9b870f..cd090cf45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@ BUG FIXES:
     option is an empty string
   - provisioners/puppet: apply provisioner uses correct default manifests
       with environments. [GH-5987]
+  - provisioners/puppet: remove broken backticks [GH-6404]
   - provisioners/puppet: find Puppet binary properly on Windows [GH-6259]
   - provisioners/salt: call correct executables on Windows [GH-5999]
   - synced\_folders/rsync: on Windows, replace all paths with Cygwin

From 28f8db6e73118bb7ae7625c0a02aff1fbef124ab Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 14:18:28 -0800
Subject: [PATCH 132/354] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd090cf45..ee4ea3c33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@ BUG FIXES:
   - guests/fedora: Use dnf if it is available [GH-6301]
   - guests/suse: DHCP network interfaces properly configured [GH-6502]
   - hosts/slackware: Better detection of NFS [GH-6367]
+  - providers/hyper-v: support generation 2 VMs [GH-6372]
   - provisioners/ansible: use quotes for the `ansible_ssh_private_key_file`
     value in the generated inventory [GH-6209]
   - provisioners/ansible: don't show the `ansible-playbook` command when verbose

From c7a8edd05a743c18b26a971d124132bee1f4f84e Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 14:37:17 -0800
Subject: [PATCH 133/354] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee4ea3c33..94db3d618 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@ BUG FIXES:
   - communicator/winrm: execute scheduled tasks immediately on Windows XP
       since elevation isn't required [GH-6195]
   - communicator/winrm: Hide progress bars from PowerShell v5 [GH-6309]
+  - guests/darwin: advanced networking works with more NICs [GH-6386]
   - guests/debian: graceful shutdown works properly with newer releases [GH-5986]
   - guests/fedora: Preserve `localhost` entry when changing hostname [GH-6203]
   - guests/fedora: Use dnf if it is available [GH-6301]

From 3da746feac6bb5b1acf3032ed13123372851d85f Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 15:01:09 -0800
Subject: [PATCH 134/354] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94db3d618..1346ae061 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,7 @@ BUG FIXES:
       with environments. [GH-5987]
   - provisioners/puppet: remove broken backticks [GH-6404]
   - provisioners/puppet: find Puppet binary properly on Windows [GH-6259]
+  - provisioners/puppet-server: works with Puppet Collection 1 [GH-6389]
   - provisioners/salt: call correct executables on Windows [GH-5999]
   - synced\_folders/rsync: on Windows, replace all paths with Cygwin
       paths since all rsync implementations require this [GH-6160]

From a6f56b159213f68674173a680859e68b046424fc Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 15:15:22 -0800
Subject: [PATCH 135/354] update CHANGELOG

---
 CHANGELOG.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1346ae061..5d218ce2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,9 @@ BUG FIXES:
 
   - core: DHCP network configurations don't warn on IP addresses ending
       in ".1" [GH-6150]
+  - core: only append `access_token` when it does not exist in the URL
+    [GH-6395, GH-6534]
+  - commands/rdp: prefer `xfreerdp` if it is available on Linux [GH-6475]
   - commands/up: the `--provision-with` flag works with provisioner names [GH-5981]
   - communicator/winrm: respect `boot_timeout` setting [GH-6229]
   - communicator/winrm: execute scheduled tasks immediately on Windows XP
@@ -63,10 +66,9 @@ BUG FIXES:
   - provisioners/puppet: find Puppet binary properly on Windows [GH-6259]
   - provisioners/puppet-server: works with Puppet Collection 1 [GH-6389]
   - provisioners/salt: call correct executables on Windows [GH-5999]
+  - provisioners/salt: log level and colorize works for masterless [GH-6474]
   - synced\_folders/rsync: on Windows, replace all paths with Cygwin
       paths since all rsync implementations require this [GH-6160]
-  - core: only append `access_token` when it does not exist in the URL
-    [GH-6395, GH-6534]
 
 PLUGIN AUTHOR CHANGES:
 

From c743d88ad69ae0d6e39ac65b0d27adfadba74f20 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 15:26:45 -0800
Subject: [PATCH 136/354] Fix bad options

---
 plugins/commands/up/start_mixins.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/commands/up/start_mixins.rb b/plugins/commands/up/start_mixins.rb
index 069ceb843..3e088e575 100644
--- a/plugins/commands/up/start_mixins.rb
+++ b/plugins/commands/up/start_mixins.rb
@@ -29,6 +29,10 @@ module VagrantPlugins
       # This validates the provisioner flags and raises an exception
       # if there are invalid ones.
       def validate_provisioner_flags!(options, argv)
+        if options[:provision_types].nil?
+          return
+        end
+
         provisioner_names = Set.new
         with_target_vms(argv) do |machine|
           machine.config.vm.provisioners.map(&:name).each do |name|

From 85f1e05e2a9bf7a7940bb4498472b809ba43e01f Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 15:48:59 -0800
Subject: [PATCH 137/354] core: prune machine if non-existent CWD from index
 [GH-4742]

---
 lib/vagrant/machine_index.rb                |  2 +-
 lib/vagrant/plugin/v2/command.rb            | 13 +++++++--
 test/unit/vagrant/plugin/v2/command_test.rb | 29 +++++++++++++++++++++
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/lib/vagrant/machine_index.rb b/lib/vagrant/machine_index.rb
index 6e8fe0e3a..1af574b33 100644
--- a/lib/vagrant/machine_index.rb
+++ b/lib/vagrant/machine_index.rb
@@ -78,7 +78,7 @@ module Vagrant
           @machines.delete(entry.id)
           unlocked_save
 
-          # Release acccess on this machine
+          # Release access on this machine
           unlocked_release(entry.id)
         end
       end
diff --git a/lib/vagrant/plugin/v2/command.rb b/lib/vagrant/plugin/v2/command.rb
index eeb580a29..f0b6c4415 100644
--- a/lib/vagrant/plugin/v2/command.rb
+++ b/lib/vagrant/plugin/v2/command.rb
@@ -133,8 +133,17 @@ module Vagrant
               # machine in that environment. We silence warnings here because
               # Vagrantfiles often have constants, so people would otherwise
               # constantly (heh) get "already initialized constant" warnings.
-              env = entry.vagrant_env(
-                @env.home_path, ui_class: @env.ui_class)
+              begin
+                env = entry.vagrant_env(
+                  @env.home_path, ui_class: @env.ui_class)
+              rescue Vagrant::Errors::EnvironmentNonExistentCWD
+                # This means that this environment working directory
+                # no longer exists, so delete this entry.
+                entry = @env.machine_index.get(name.to_s)
+                @env.machine_index.delete(entry) if entry
+                raise
+              end
+
               next env.machine(entry.name.to_sym, entry.provider.to_sym)
             end
 
diff --git a/test/unit/vagrant/plugin/v2/command_test.rb b/test/unit/vagrant/plugin/v2/command_test.rb
index 7b42f2345..fc6cc5271 100644
--- a/test/unit/vagrant/plugin/v2/command_test.rb
+++ b/test/unit/vagrant/plugin/v2/command_test.rb
@@ -263,6 +263,35 @@ describe Vagrant::Plugin::V2::Command do
       expect(results.length).to eq(1)
       expect(results[0].id).to eq(other_machine.id)
     end
+
+    it "should yield machines from another environment" do
+      iso_env       = isolated_environment
+      iso_env.vagrantfile("")
+      other_env     = iso_env.create_vagrant_env(
+        home_path: environment.home_path)
+      other_machine = other_env.machine(
+        other_env.machine_names[0], other_env.default_provider)
+
+      # Set an ID on it so that it is "created" in the index
+      other_machine.id = "foo"
+
+      # Grab the uuid so we know what it is
+      index_uuid = other_machine.index_uuid
+
+      # Remove the working directory
+      FileUtils.rm_rf(iso_env.workdir)
+
+      # Make sure we don't have a root path, to test
+      environment.stub(root_path: nil)
+
+      # Run the command
+      expect {
+          subject.with_target_vms(index_uuid) { |*args| }
+      }.to raise_error(Vagrant::Errors::EnvironmentNonExistentCWD)
+
+      # Verify that it no longer exists in the index
+      expect(other_env.machine_index.get(index_uuid)).to be_nil
+    end
   end
 
   describe "splitting the main and subcommand args" do

From 1f6e5aa08154700d834a2701e4fbb52956fd8ddf Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 15:55:11 -0800
Subject: [PATCH 138/354] Check if the network manager is before reloading

---
 .../guests/fedora/cap/configure_networks.rb   | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/plugins/guests/fedora/cap/configure_networks.rb b/plugins/guests/fedora/cap/configure_networks.rb
index 364b744e4..b95d0bdb7 100644
--- a/plugins/guests/fedora/cap/configure_networks.rb
+++ b/plugins/guests/fedora/cap/configure_networks.rb
@@ -109,13 +109,23 @@ module VagrantPlugins
           # SSH never dies.
           interfaces.each do |interface|
             retryable(on: Vagrant::Errors::VagrantError, tries: 3, sleep: 2) do
-              machine.communicate.sudo("cat /tmp/vagrant-network-entry_#{interface} >> #{network_scripts_dir}/ifcfg-#{interface}")
-              machine.communicate.sudo("! which nmcli >/dev/null 2>&1 || nmcli c reload #{interface}")
-              machine.communicate.sudo("/sbin/ifdown #{interface}", error_check: true)
-              machine.communicate.sudo("/sbin/ifup #{interface}")
-            end
+              machine.communicate.sudo(<<-SCRIPT, error_check: true)
+cat /tmp/vagrant-network-entry_#{interface} >> #{network_scripts_dir}/ifcfg-#{interface}
 
-            machine.communicate.sudo("rm -f /tmp/vagrant-network-entry_#{interface}")
+if command -v nmcli &>/dev/null; then
+  if command -v systemctl &>/dev/null && systemctl -q is-enabled NetworkManager &>/dev/null; then
+    nmcli c reload #{interface}
+  elif command -v service &>/dev/null && service NetworkManager status &>/dev/null; then
+    nmcli c reload #{interface}
+  fi
+fi
+
+/sbin/ifdown #{interface}
+/sbin/ifup #{interface}
+
+rm -f /tmp/vagrant-network-entry_#{interface}
+SCRIPT
+            end
           end
         end
       end

From 538ffcd292872336b06c40b0e5ce7f3c941709f3 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 15:55:29 -0800
Subject: [PATCH 139/354] clarify guest to host in forwarded port output
 [GH-4796]

---
 templates/locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 6ca14b024..4b2eee73e 100755
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1721,7 +1721,7 @@ en:
             Fixed port collision for %{guest_port} => %{host_port}. Now on port %{new_port}.
           forwarding: Forwarding ports...
           forwarding_entry: |-
-            %{guest_port} => %{host_port} (adapter %{adapter})
+            %{guest_port} (guest) => %{host_port} (host) (adapter %{adapter})
           non_nat: |-
             VirtualBox adapter #%{adapter} not configured as "NAT". Skipping port
             forwards on this adapter.

From 0ebd600c897ebf345d5159b11512aa22920efcde Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 15:57:30 -0800
Subject: [PATCH 140/354] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d218ce2a..867541c49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ BREAKING CHANGES:
 IMPROVEMENTS:
 
   - core: allow removal of all box versions with `--all` flag [GH-3462]
+  - core: prune entries from global status on non-existent cwd [GH-6535]
   - command/plugin: Add `--plugin-clean-sources` flag to reset plugin install
       sources, primarily for corp firewalls. [GH-4738]
   - communicators/winrm: Configurable execution time limit [GH-6213]

From da116bffecd7842920dc30382f4443792d56c1b0 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 15:57:58 -0800
Subject: [PATCH 141/354] fix syntax error

---
 test/unit/plugins/communicators/winrm/communicator_test.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/unit/plugins/communicators/winrm/communicator_test.rb b/test/unit/plugins/communicators/winrm/communicator_test.rb
index 6ce69be9e..554290e56 100644
--- a/test/unit/plugins/communicators/winrm/communicator_test.rb
+++ b/test/unit/plugins/communicators/winrm/communicator_test.rb
@@ -90,7 +90,6 @@ describe VagrantPlugins::CommunicatorWinRM::Communicator do
       expect(shell).to receive(:powershell) do |cmd|
         expect(cmd).to eq("powershell -executionpolicy bypass -file \"c:/tmp/vagrant-elevated-shell.ps1\" " +
           "-username 'vagrant' -password 'password' -encoded_command 'JABQAHIAbwBnAHIAZQBzAHMAUAByAGUAZgBlAHIAZQBuAGMAZQA9ACcAUwBpAGwAZQBuAHQAbAB5AEMAbwBuAHQAaQBuAHUAZQAnADsAIABkAGkAcgA7ACAAZQB4AGkAdAAgACQATABBAFMAVABFAFgASQBUAEMATwBEAEUA' -execution_time_limit 'PT2H'")
->>>>>>> cbb03a02d4b42e350ed92f73ced05f3046100ae8
       end.and_return({ exitcode: 0 })
       expect(subject.execute("dir", { elevated: true })).to eq(0)
     end

From cab2926633f52b2fff148c48aeca629d2aae52af Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 16:04:59 -0800
Subject: [PATCH 142/354] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 867541c49..2411825a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@ IMPROVEMENTS:
   - provisioners/ansible: add new `force_remote_user` option to control whether
     `ansible_ssh_user` parameter should be applied or not [GH-6348]
   - provisioners/ansible: show a warning when running from a Windows Host [GH-5292]
+  - guests/slackware: add support for networking [GH-6514]
 
 BUG FIXES:
 

From 0ce636d1a31bbf7cf3f504c17b71b52a89c2f38b Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 16:07:25 -0800
Subject: [PATCH 143/354] core: avoid locking in trap context

---
 lib/vagrant/ui.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/vagrant/ui.rb b/lib/vagrant/ui.rb
index 89f412325..80adf2e88 100644
--- a/lib/vagrant/ui.rb
+++ b/lib/vagrant/ui.rb
@@ -123,9 +123,12 @@ module Vagrant
           data[i].gsub!("\r", "\\r")
         end
 
-        @lock.synchronize do
-          safe_puts("#{Time.now.utc.to_i},#{target},#{type},#{data.join(",")}")
-        end
+        # Avoid locks in a trap context introduced from Ruby 2.0
+        Thread.new do
+          @lock.synchronize do
+            safe_puts("#{Time.now.utc.to_i},#{target},#{type},#{data.join(",")}")
+          end
+        end.join
       end
     end
 
@@ -331,7 +334,6 @@ module Vagrant
         if @ui.is_a?(Vagrant::UI::MachineReadable)
           return machine(type, message, { :target => target })
         end
-         
 
         # Otherwise, make sure to prefix every line properly
         lines.map do |line|

From 82f620ed133cd37df967b5a1212d78bf6d3bb2c2 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 16:18:29 -0800
Subject: [PATCH 144/354] Fix upstart detection and event emit

---
 plugins/guests/linux/cap/mount_nfs.rb                    | 9 +++++----
 plugins/guests/linux/cap/mount_smb_shared_folder.rb      | 9 +++++----
 .../guests/linux/cap/mount_virtualbox_shared_folder.rb   | 9 +++++----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/plugins/guests/linux/cap/mount_nfs.rb b/plugins/guests/linux/cap/mount_nfs.rb
index ecc3ea9ee..26dfb625d 100644
--- a/plugins/guests/linux/cap/mount_nfs.rb
+++ b/plugins/guests/linux/cap/mount_nfs.rb
@@ -33,10 +33,11 @@ module VagrantPlugins
             end
 
             # Emit an upstart event if we can
-            if machine.communicate.test("test -x /sbin/initctl && test 'upstart' = $(basename $(sudo readlink /proc/1/exe))")
-              machine.communicate.sudo(
-                "/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{expanded_guest_path}")
-            end
+            machine.communicate.sudo <<-SCRIPT
+if command -v /sbin/init &>/dev/null && /sbin/init --version | grep upstart &>/dev/null; then
+  /sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT='#{expanded_guest_path}'
+fi
+SCRIPT
           end
         end
       end
diff --git a/plugins/guests/linux/cap/mount_smb_shared_folder.rb b/plugins/guests/linux/cap/mount_smb_shared_folder.rb
index 136ccfb8a..af96104e5 100644
--- a/plugins/guests/linux/cap/mount_smb_shared_folder.rb
+++ b/plugins/guests/linux/cap/mount_smb_shared_folder.rb
@@ -86,10 +86,11 @@ module VagrantPlugins
           end
 
           # Emit an upstart event if we can
-          if machine.communicate.test("test -x /sbin/initctl && test 'upstart' = $(basename $(sudo readlink /proc/1/exe))")
-            machine.communicate.sudo(
-              "/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{expanded_guest_path}")
-          end
+          machine.communicate.sudo <<-SCRIPT
+if command -v /sbin/init &>/dev/null && /sbin/init --version | grep upstart &>/dev/null; then
+  /sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT='#{expanded_guest_path}'
+fi
+SCRIPT
         end
       end
     end
diff --git a/plugins/guests/linux/cap/mount_virtualbox_shared_folder.rb b/plugins/guests/linux/cap/mount_virtualbox_shared_folder.rb
index 56c864b6b..57fdc207f 100644
--- a/plugins/guests/linux/cap/mount_virtualbox_shared_folder.rb
+++ b/plugins/guests/linux/cap/mount_virtualbox_shared_folder.rb
@@ -80,10 +80,11 @@ module VagrantPlugins
           end
 
           # Emit an upstart event if we can
-          if machine.communicate.test("test -x /sbin/initctl && test 'upstart' = $(basename $(sudo readlink /proc/1/exe))")
-            machine.communicate.sudo(
-              "/sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT=#{expanded_guest_path}")
-          end
+          machine.communicate.sudo <<-SCRIPT
+if command -v /sbin/init &>/dev/null && /sbin/init --version | grep upstart &>/dev/null; then
+  /sbin/initctl emit --no-wait vagrant-mounted MOUNTPOINT='#{expanded_guest_path}'
+fi
+SCRIPT
         end
 
         def self.unmount_virtualbox_shared_folder(machine, guestpath, options)

From 1a7937ed50d767f328463978584f07ad546e456f Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 16:24:53 -0800
Subject: [PATCH 145/354] core: don't replace insecure key on base package
 [GH-5310]

---
 lib/vagrant/machine.rb            | 3 +++
 test/unit/vagrant/machine_test.rb | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/lib/vagrant/machine.rb b/lib/vagrant/machine.rb
index 4e66b08bf..c1d0e8d7a 100644
--- a/lib/vagrant/machine.rb
+++ b/lib/vagrant/machine.rb
@@ -116,6 +116,9 @@ module Vagrant
       # XXX: This is temporary. This will be removed very soon.
       if base
         @id = name
+
+        # For base setups, we don't want to insert the key
+        @config.ssh.insert_key = false
       else
         reload
       end
diff --git a/test/unit/vagrant/machine_test.rb b/test/unit/vagrant/machine_test.rb
index 4064fa1d5..cb47a3ef8 100644
--- a/test/unit/vagrant/machine_test.rb
+++ b/test/unit/vagrant/machine_test.rb
@@ -70,6 +70,15 @@ describe Vagrant::Machine do
       expect(subject.id).to be_nil
     end
 
+    describe "as a base" do
+      let(:base) { true}
+
+      it "should not insert key" do
+        subject = new_instance
+        expect(subject.config.ssh.insert_key).to be_false
+      end
+    end
+
     describe "communicator loading" do
       it "doesn't eager load SSH" do
         config.vm.communicator = :ssh

From 6af1f1e2587e6c47b34a5bfca896f9e31f702d20 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 16:26:01 -0800
Subject: [PATCH 146/354] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2411825a4..7a37b31f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@ BUG FIXES:
       in ".1" [GH-6150]
   - core: only append `access_token` when it does not exist in the URL
     [GH-6395, GH-6534]
+  - core: use the correct private key when packaging a box [GH-6406]
   - commands/rdp: prefer `xfreerdp` if it is available on Linux [GH-6475]
   - commands/up: the `--provision-with` flag works with provisioner names [GH-5981]
   - communicator/winrm: respect `boot_timeout` setting [GH-6229]

From 004fe0e7bb0c17c4f0e0bc801440a6456d7b979d Mon Sep 17 00:00:00 2001
From: Tristan Rivoallan <tristan.rivoallan@aramisauto.com>
Date: Fri, 25 Sep 2015 18:11:22 +0200
Subject: [PATCH 147/354] Make DHCP IP configurable

This makes it possible to have DHCP attribute IPs to guests under
various subnets
---
 plugins/providers/virtualbox/action/network.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/providers/virtualbox/action/network.rb b/plugins/providers/virtualbox/action/network.rb
index cf5ca3b47..f29111dd9 100644
--- a/plugins/providers/virtualbox/action/network.rb
+++ b/plugins/providers/virtualbox/action/network.rb
@@ -249,14 +249,16 @@ module VagrantPlugins
             auto_config: true,
             mac:         nil,
             nic_type:    nil,
-            type:        :static
+            type:        :static,
+            dhcp_ip:     "172.28.128.1"
           }.merge(options)
 
           # Make sure the type is a symbol
           options[:type] = options[:type].to_sym
 
           # Default IP is in the 20-bit private network block for DHCP based networks
-          options[:ip] = "172.28.128.1" if options[:type] == :dhcp && !options[:ip]
+          options[:ip] = options[:dhcp_ip] if options[:type] == :dhcp && !options[:ip]
+
 
           ip = IPAddr.new(options[:ip])
           if ip.ipv4?

From 2c6ef938c728a1dd37a568c7c49389392a5dfd10 Mon Sep 17 00:00:00 2001
From: Tristan Rivoallan <tristan.rivoallan@aramisauto.com>
Date: Mon, 28 Sep 2015 15:48:09 +0200
Subject: [PATCH 148/354] Fix failing network test

---
 plugins/providers/virtualbox/action/network.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/providers/virtualbox/action/network.rb b/plugins/providers/virtualbox/action/network.rb
index f29111dd9..ec6768842 100644
--- a/plugins/providers/virtualbox/action/network.rb
+++ b/plugins/providers/virtualbox/action/network.rb
@@ -257,7 +257,7 @@ module VagrantPlugins
           options[:type] = options[:type].to_sym
 
           # Default IP is in the 20-bit private network block for DHCP based networks
-          options[:ip] = options[:dhcp_ip] if options[:type] == :dhcp && !options[:ip]
+          options[:ip] = options[:dhcp_ip] if options[:type] == :dhcp
 
 
           ip = IPAddr.new(options[:ip])

From 48df85008ccbf16c419fb808b1a8054542b96e6f Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 16:31:44 -0800
Subject: [PATCH 149/354] Rebase and cleanup conditional

---
 plugins/providers/virtualbox/action/network.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/providers/virtualbox/action/network.rb b/plugins/providers/virtualbox/action/network.rb
index ec6768842..452cc10ad 100644
--- a/plugins/providers/virtualbox/action/network.rb
+++ b/plugins/providers/virtualbox/action/network.rb
@@ -250,15 +250,14 @@ module VagrantPlugins
             mac:         nil,
             nic_type:    nil,
             type:        :static,
-            dhcp_ip:     "172.28.128.1"
+            dhcp_ip:     "172.28.128.1",
           }.merge(options)
 
           # Make sure the type is a symbol
           options[:type] = options[:type].to_sym
 
           # Default IP is in the 20-bit private network block for DHCP based networks
-          options[:ip] = options[:dhcp_ip] if options[:type] == :dhcp
-
+          options[:ip] ||= options[:dhcp_ip] if options[:type] == :dhcp
 
           ip = IPAddr.new(options[:ip])
           if ip.ipv4?

From e9f4bca38065d3563ac4dad0f1baf4336261aaf2 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 16:35:35 -0800
Subject: [PATCH 150/354] Revert "#5186: Warning: Authentication failure.
 Retrying... after packaging box"

---
 plugins/providers/virtualbox/provider.rb | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/plugins/providers/virtualbox/provider.rb b/plugins/providers/virtualbox/provider.rb
index a2cb91d16..6bde344d2 100644
--- a/plugins/providers/virtualbox/provider.rb
+++ b/plugins/providers/virtualbox/provider.rb
@@ -68,20 +68,12 @@ module VagrantPlugins
         # If the VM is not running that we can't possibly SSH into it
         return nil if state.id != :running
 
-        # If the insecure key was automatically replaced with a newly generated key pair,
-        # use this key to connect to the machine
-        private_key_path = nil
-        if @machine.data_dir.join("private_key").file?
-          private_key_path = @machine.data_dir.join("private_key")
-        end
-
         # Return what we know. The host is always "127.0.0.1" because
         # VirtualBox VMs are always local. The port we try to discover
         # by reading the forwarded ports.
         return {
           host: "127.0.0.1",
-          port: @driver.ssh_port(@machine.config.ssh.guest_port),
-          private_key_path: private_key_path
+          port: @driver.ssh_port(@machine.config.ssh.guest_port)
         }
       end
 

From 28ddd6927b7804548f45233b86de65430863c500 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 16:41:20 -0800
Subject: [PATCH 151/354] Update docs

---
 website/docs/source/v2/networking/private_network.html.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/website/docs/source/v2/networking/private_network.html.md b/website/docs/source/v2/networking/private_network.html.md
index e11c7b3c7..f142c94ca 100644
--- a/website/docs/source/v2/networking/private_network.html.md
+++ b/website/docs/source/v2/networking/private_network.html.md
@@ -43,6 +43,14 @@ The IP address can be determined by using `vagrant ssh` to SSH into the
 machine and using the appropriate command line tool to find the IP,
 such as `ifconfig`.
 
+You can also specify the DHCP IP:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.network "private_network", type: "dhcp", dhcp_ip: "192.168.0.100"
+end
+```
+
 ## Static IP
 
 You can also specify a static IP address for the machine. This lets you

From 3328fa3fb8ee8680e1d22b2854fae88ae14354fb Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 16:42:18 -0800
Subject: [PATCH 152/354] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a37b31f9..fa608cb13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ IMPROVEMENTS:
 
   - core: allow removal of all box versions with `--all` flag [GH-3462]
   - core: prune entries from global status on non-existent cwd [GH-6535]
+  - core: networking: allow specifying a DHCP IP [GH-6325]
   - command/plugin: Add `--plugin-clean-sources` flag to reset plugin install
       sources, primarily for corp firewalls. [GH-4738]
   - communicators/winrm: Configurable execution time limit [GH-6213]

From 733a583b6971ed4437fe91aebc427743213e18c3 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 16:47:03 -0800
Subject: [PATCH 153/354] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa608cb13..a4ec6b749 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,7 @@ BUG FIXES:
     value in the generated inventory [GH-6209]
   - provisioners/ansible: don't show the `ansible-playbook` command when verbose
     option is an empty string
+  - provisioners/chef: fix `nodes_path` for Chef Zero [GH-6025, GH-6049]
   - provisioners/puppet: apply provisioner uses correct default manifests
       with environments. [GH-5987]
   - provisioners/puppet: remove broken backticks [GH-6404]

From 891c47c7423c8ddc2aef2f400dd7d124188a5dd4 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 16:52:40 -0800
Subject: [PATCH 154/354] core: don't do HEAD request for box on non-HTTP
 [GH-5477]

---
 lib/vagrant/action/builtin/box_add.rb         |  3 ++
 .../vagrant/action/builtin/box_add_test.rb    | 37 +++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/lib/vagrant/action/builtin/box_add.rb b/lib/vagrant/action/builtin/box_add.rb
index 6aec780ee..192f0f52c 100644
--- a/lib/vagrant/action/builtin/box_add.rb
+++ b/lib/vagrant/action/builtin/box_add.rb
@@ -491,6 +491,9 @@ module Vagrant
             end
           end
 
+          # If this isn't HTTP, then don't do the HEAD request
+          return false if !uri.scheme.downcase.start_with?("http")
+
           output = d.head
           match  = output.scan(/^Content-Type: (.+?)$/i).last
           return false if !match
diff --git a/test/unit/vagrant/action/builtin/box_add_test.rb b/test/unit/vagrant/action/builtin/box_add_test.rb
index ad3a56dfc..44bcbca24 100644
--- a/test/unit/vagrant/action/builtin/box_add_test.rb
+++ b/test/unit/vagrant/action/builtin/box_add_test.rb
@@ -4,6 +4,8 @@ require "tempfile"
 require "tmpdir"
 require "webrick"
 
+require "fake_ftp"
+
 require File.expand_path("../../../../base", __FILE__)
 
 require "vagrant/util/file_checksum"
@@ -34,6 +36,21 @@ describe Vagrant::Action::Builtin::BoxAdd do
     FileChecksum.new(path, Digest::SHA1).checksum
   end
 
+  def with_ftp_server(path, **opts)
+    path = Pathname.new(path)
+
+    tf = Tempfile.new("vagrant")
+    tf.close
+
+    port   = 21212
+    server = FakeFtp::Server.new(port, port+1)
+    server.add_file(path.basename, path.read)
+    server.start
+    yield port
+  ensure
+    server.stop rescue nil
+  end
+
   def with_web_server(path, **opts)
     tf = Tempfile.new("vagrant")
     tf.close
@@ -123,6 +140,26 @@ describe Vagrant::Action::Builtin::BoxAdd do
       end
     end
 
+    it "adds from FTP URL" do
+      box_path = iso_env.box2_file(:virtualbox)
+      with_ftp_server(box_path) do |port|
+        env[:box_name] = "foo"
+        env[:box_url] = "ftp://127.0.0.1:#{port}/#{box_path.basename}"
+
+        expect(box_collection).to receive(:add).with { |path, name, version, **opts|
+          expect(checksum(path)).to eq(checksum(box_path))
+          expect(name).to eq("foo")
+          expect(version).to eq("0")
+          expect(opts[:metadata_url]).to be_nil
+          true
+        }.and_return(box)
+
+        expect(app).to receive(:call).with(env)
+
+        subject.call(env)
+      end
+    end
+
     it "raises an error if no name is given" do
       box_path = iso_env.box2_file(:virtualbox)
 

From a1a3824e357594f92f61702d861cd621db57e82b Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 16:55:37 -0800
Subject: [PATCH 155/354] Do not throw an error when the Chef node_name is nil

---
 plugins/provisioners/chef/provisioner/chef_client.rb | 8 ++++++++
 templates/locales/en.yml                             | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/plugins/provisioners/chef/provisioner/chef_client.rb b/plugins/provisioners/chef/provisioner/chef_client.rb
index da44fce78..056ab802c 100644
--- a/plugins/provisioners/chef/provisioner/chef_client.rb
+++ b/plugins/provisioners/chef/provisioner/chef_client.rb
@@ -122,6 +122,14 @@ module VagrantPlugins
 
         def delete_from_chef_server(deletable)
           node_name = @config.node_name || @machine.config.vm.hostname
+
+          if node_name.to_s.empty?
+            @machine.ui.warn(I18n.t("vagrant.provisioners.chef.missing_node_name",
+              deletable: deletable,
+            ))
+            return
+          end
+
           @machine.ui.info(I18n.t(
             "vagrant.provisioners.chef.deleting_from_server",
             deletable: deletable, name: node_name))
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 4b2eee73e..8f087c6dc 100755
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1984,6 +1984,12 @@ en:
         upload_path_empty: |-
           The Chef Apply provisioner requires that the `config.chef.upload_path`
           be set to a non-nil, non-empty value.
+        missing_node_name: |-
+          The Chef Client provisioner cannot delete the %{deletable} from
+          the Chef server because Vagrant does not know the `node_name'! You
+          need to manually delete the %{deletable} from the Chef server. You
+          can specify the `node_name' in the Chef configuration to prevent this
+          in the future.
         deleting_from_server: "Deleting %{deletable} \"%{name}\" from Chef server..."
 
       file:

From 2dfc96c53659e77207fa21313878edbd1fba61d1 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 17:01:21 -0800
Subject: [PATCH 156/354] Update CHANGELOG

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4ec6b749..50cf047d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,8 +65,10 @@ BUG FIXES:
   - provisioners/ansible: don't show the `ansible-playbook` command when verbose
     option is an empty string
   - provisioners/chef: fix `nodes_path` for Chef Zero [GH-6025, GH-6049]
+  - provisioners/chef: do not error when the `node_name` is unset
+    [GH-6005, GH-6064, GH-6541]
   - provisioners/puppet: apply provisioner uses correct default manifests
-      with environments. [GH-5987]
+    with environments. [GH-5987]
   - provisioners/puppet: remove broken backticks [GH-6404]
   - provisioners/puppet: find Puppet binary properly on Windows [GH-6259]
   - provisioners/puppet-server: works with Puppet Collection 1 [GH-6389]

From c76e45a75a3bc9218a7213744bce11b2ce022ce8 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 17:11:05 -0800
Subject: [PATCH 157/354] fix some tests

---
 test/unit/plugins/communicators/winrm/communicator_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/unit/plugins/communicators/winrm/communicator_test.rb b/test/unit/plugins/communicators/winrm/communicator_test.rb
index 554290e56..79a873d72 100644
--- a/test/unit/plugins/communicators/winrm/communicator_test.rb
+++ b/test/unit/plugins/communicators/winrm/communicator_test.rb
@@ -88,7 +88,7 @@ describe VagrantPlugins::CommunicatorWinRM::Communicator do
     it "wraps command in elevated shell script when elevated is true" do
       expect(shell).to receive(:upload).with(kind_of(String), "c:/tmp/vagrant-elevated-shell.ps1")
       expect(shell).to receive(:powershell) do |cmd|
-        expect(cmd).to eq("powershell -executionpolicy bypass -file \"c:/tmp/vagrant-elevated-shell.ps1\" " +
+        expect(cmd).to eq("powershell -executionpolicy bypass -file 'c:/tmp/vagrant-elevated-shell.ps1' " +
           "-username 'vagrant' -password 'password' -encoded_command 'JABQAHIAbwBnAHIAZQBzAHMAUAByAGUAZgBlAHIAZQBuAGMAZQA9ACcAUwBpAGwAZQBuAHQAbAB5AEMAbwBuAHQAaQBuAHUAZQAnADsAIABkAGkAcgA7ACAAZQB4AGkAdAAgACQATABBAFMAVABFAFgASQBUAEMATwBEAEUA' -execution_time_limit 'PT2H'")
       end.and_return({ exitcode: 0 })
       expect(subject.execute("dir", { elevated: true })).to eq(0)
@@ -97,8 +97,8 @@ describe VagrantPlugins::CommunicatorWinRM::Communicator do
     it "wraps command in elevated and interactive shell script when elevated and interactive are true" do
       expect(shell).to receive(:upload).with(kind_of(String), "c:/tmp/vagrant-elevated-shell.ps1")
       expect(shell).to receive(:powershell) do |cmd|
-        expect(cmd).to eq("powershell -executionpolicy bypass -file \"c:/tmp/vagrant-elevated-shell.ps1\" " +
-          "-username \"vagrant\" -password \"password\" -encoded_command \"ZABpAHIAOwAgAGUAeABpAHQAIAAkAEwAQQBTAFQARQBYAEkAVABDAE8ARABFAA==\"")
+        expect(cmd).to eq("powershell -executionpolicy bypass -file 'c:/tmp/vagrant-elevated-shell.ps1' " +
+          "-username 'vagrant' -password 'password' -encoded_command 'ZABpAHIAOwAgAGUAeABpAHQAIAAkAEwAQQBTAFQARQBYAEkAVABDAE8ARABFAA=='")
       end.and_return({ exitcode: 0 })
       expect(subject.execute("dir", { elevated: true, interactive: true })).to eq(0)
     end

From 925d7c5bf6e106be3f97b0d2b015a4cf9b1e9879 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 17:11:58 -0800
Subject: [PATCH 158/354] Revert "Make DHCP IP configurable"

This reverts commit 004fe0e7bb0c17c4f0e0bc801440a6456d7b979d.
---
 plugins/providers/virtualbox/action/network.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/providers/virtualbox/action/network.rb b/plugins/providers/virtualbox/action/network.rb
index 452cc10ad..a09494219 100644
--- a/plugins/providers/virtualbox/action/network.rb
+++ b/plugins/providers/virtualbox/action/network.rb
@@ -250,14 +250,13 @@ module VagrantPlugins
             mac:         nil,
             nic_type:    nil,
             type:        :static,
-            dhcp_ip:     "172.28.128.1",
           }.merge(options)
 
           # Make sure the type is a symbol
           options[:type] = options[:type].to_sym
 
           # Default IP is in the 20-bit private network block for DHCP based networks
-          options[:ip] ||= options[:dhcp_ip] if options[:type] == :dhcp
+          options[:ip] = "172.28.128.1" if options[:type] == :dhcp && !options[:ip]
 
           ip = IPAddr.new(options[:ip])
           if ip.ipv4?

From 0e326123247570a0bf54a6324bc806500aad43dc Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 17:13:47 -0800
Subject: [PATCH 159/354] fix more tests

---
 test/unit/plugins/communicators/winrm/communicator_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/plugins/communicators/winrm/communicator_test.rb b/test/unit/plugins/communicators/winrm/communicator_test.rb
index 79a873d72..3e21242d9 100644
--- a/test/unit/plugins/communicators/winrm/communicator_test.rb
+++ b/test/unit/plugins/communicators/winrm/communicator_test.rb
@@ -98,7 +98,7 @@ describe VagrantPlugins::CommunicatorWinRM::Communicator do
       expect(shell).to receive(:upload).with(kind_of(String), "c:/tmp/vagrant-elevated-shell.ps1")
       expect(shell).to receive(:powershell) do |cmd|
         expect(cmd).to eq("powershell -executionpolicy bypass -file 'c:/tmp/vagrant-elevated-shell.ps1' " +
-          "-username 'vagrant' -password 'password' -encoded_command 'ZABpAHIAOwAgAGUAeABpAHQAIAAkAEwAQQBTAFQARQBYAEkAVABDAE8ARABFAA=='")
+          "-username 'vagrant' -password 'password' -encoded_command 'JABQAHIAbwBnAHIAZQBzAHMAUAByAGUAZgBlAHIAZQBuAGMAZQA9ACcAUwBpAGwAZQBuAHQAbAB5AEMAbwBuAHQAaQBuAHUAZQAnADsAIABkAGkAcgA7ACAAZQB4AGkAdAAgACQATABBAFMAVABFAFgASQBUAEMATwBEAEUA' -execution_time_limit 'PT2H'")
       end.and_return({ exitcode: 0 })
       expect(subject.execute("dir", { elevated: true, interactive: true })).to eq(0)
     end

From 6f3ed13f75a1be66ed22f9bdcaa262e8077e458e Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 17:16:23 -0800
Subject: [PATCH 160/354] providers/virtualbox: run provisioners on suspend
 resume

---
 CHANGELOG.md                           | 1 +
 plugins/providers/virtualbox/action.rb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50cf047d6..b910da20b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ IMPROVEMENTS:
   - core: networking: allow specifying a DHCP IP [GH-6325]
   - command/plugin: Add `--plugin-clean-sources` flag to reset plugin install
       sources, primarily for corp firewalls. [GH-4738]
+  - command/up: provisioners are run on suspend resume [GH-5815]
   - communicators/winrm: Configurable execution time limit [GH-6213]
   - provisioners/shell: Support interactive mode for elevated PowerShell
       scripts [GH-6185]
diff --git a/plugins/providers/virtualbox/action.rb b/plugins/providers/virtualbox/action.rb
index 85f52f887..137e0ac92 100644
--- a/plugins/providers/virtualbox/action.rb
+++ b/plugins/providers/virtualbox/action.rb
@@ -217,6 +217,7 @@ module VagrantPlugins
               b2.use PrepareForwardedPortCollisionParams
               b2.use HandleForwardedPortCollisions
               b2.use Resume
+              b2.use Provision
               b2.use WaitForCommunicator, [:restoring, :running]
             else
               b2.use MessageNotCreated

From eb5a6fc7c3120df69b2b370bd1a22d8086fa5272 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 17:32:40 -0800
Subject: [PATCH 161/354] communicators/ssh: more nil guards [GH-6225]

---
 CHANGELOG.md                              | 1 +
 plugins/communicators/ssh/communicator.rb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b910da20b..67eb80968 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@ BUG FIXES:
   - core: use the correct private key when packaging a box [GH-6406]
   - commands/rdp: prefer `xfreerdp` if it is available on Linux [GH-6475]
   - commands/up: the `--provision-with` flag works with provisioner names [GH-5981]
+  - communicator/ssh: fix potential crash case with PTY [GH-6225]
   - communicator/winrm: respect `boot_timeout` setting [GH-6229]
   - communicator/winrm: execute scheduled tasks immediately on Windows XP
       since elevation isn't required [GH-6195]
diff --git a/plugins/communicators/ssh/communicator.rb b/plugins/communicators/ssh/communicator.rb
index 035ef5f61..40f49e82c 100644
--- a/plugins/communicators/ssh/communicator.rb
+++ b/plugins/communicators/ssh/communicator.rb
@@ -611,6 +611,7 @@ module VagrantPlugins
           end
 
           data = pty_stdout[/.*#{PTY_DELIM_START}(.*?)#{PTY_DELIM_END}/m, 1]
+          data ||= ""
           @logger.debug("PTY stdout parsed: #{data}")
           yield :stdout, data if block_given?
         end

From 7c49fd1418e829e3d87080544ead9a496566d541 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 17:36:52 -0800
Subject: [PATCH 162/354] core: fix crash on invalid checksum type [GH-6327]

---
 CHANGELOG.md                          | 1 +
 lib/vagrant/action/builtin/box_add.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67eb80968..4b251fe24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@ BUG FIXES:
   - core: only append `access_token` when it does not exist in the URL
     [GH-6395, GH-6534]
   - core: use the correct private key when packaging a box [GH-6406]
+  - core: fix crash when using invalid box checksum type [GH-6327]
   - commands/rdp: prefer `xfreerdp` if it is available on Linux [GH-6475]
   - commands/up: the `--provision-with` flag works with provisioner names [GH-5981]
   - communicator/ssh: fix potential crash case with PTY [GH-6225]
diff --git a/lib/vagrant/action/builtin/box_add.rb b/lib/vagrant/action/builtin/box_add.rb
index 6aec780ee..5585c6fff 100644
--- a/lib/vagrant/action/builtin/box_add.rb
+++ b/lib/vagrant/action/builtin/box_add.rb
@@ -507,7 +507,7 @@ module Vagrant
             Digest::SHA2
           else
             raise Errors::BoxChecksumInvalidType,
-              type: env[:box_checksum_type].to_s
+              type: checksum_type.to_s
           end
 
           @logger.info("Validating checksum with #{checksum_klass}")

From 646414b347d4694de24693d226c35e42a88dea0e Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 17:48:24 -0800
Subject: [PATCH 163/354] core: don't make dotfile path if no Vagrantfile

---
 lib/vagrant/environment.rb            |  7 +++++--
 test/unit/vagrant/environment_test.rb | 11 ++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/vagrant/environment.rb b/lib/vagrant/environment.rb
index 88779a2e9..e98c8f397 100644
--- a/lib/vagrant/environment.rb
+++ b/lib/vagrant/environment.rb
@@ -832,7 +832,7 @@ module Vagrant
 
     # This creates the local data directory and show an error if it
     # couldn't properly be created.
-    def setup_local_data_path
+    def setup_local_data_path(force=false)
       if @local_data_path.nil?
         @logger.warn("No local data path is set. Local data cannot be stored.")
         return
@@ -847,6 +847,9 @@ module Vagrant
         upgrade_v1_dotfile(@local_data_path)
       end
 
+      # If we don't have a root path, we don't setup anything
+      return if !force && root_path.nil?
+
       begin
         @logger.debug("Creating: #{@local_data_path}")
         FileUtils.mkdir_p(@local_data_path)
@@ -965,7 +968,7 @@ module Vagrant
 
       # Now, we create the actual local data directory. This should succeed
       # this time since we renamed the old conflicting V1.
-      setup_local_data_path
+      setup_local_data_path(true)
 
       if json_data["active"]
         @logger.debug("Upgrading to V2 style for each active VM")
diff --git a/test/unit/vagrant/environment_test.rb b/test/unit/vagrant/environment_test.rb
index 6a595fb57..7c79799e1 100644
--- a/test/unit/vagrant/environment_test.rb
+++ b/test/unit/vagrant/environment_test.rb
@@ -905,8 +905,13 @@ VF
     end
 
     it "is expanded relative to the cwd" do
-      instance = described_class.new(local_data_path: "foo")
-      expect(instance.local_data_path).to eq(instance.cwd.join("foo"))
+      Dir.mktmpdir do |temp_dir|
+        Dir.chdir(temp_dir) do
+          instance = described_class.new(local_data_path: "foo")
+          expect(instance.local_data_path).to eq(instance.cwd.join("foo"))
+          expect(File.exist?(instance.local_data_path)).to be_false
+        end
+      end
     end
 
     it "is set to the given value" do
@@ -933,7 +938,7 @@ VF
         end
 
         expect { instance }.to_not raise_error
-        expect(Pathname.new(local_data_path)).to be_directory
+        expect(Pathname.new(local_data_path)).to_not be_exist
       end
 
       it "should upgrade all active VMs" do

From 7c9fd5878634ac81da6d8fd7dedf1390ac6911eb Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 18:09:18 -0800
Subject: [PATCH 164/354] core: log if not checking box metadata

---
 lib/vagrant/action/builtin/box_add.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/vagrant/action/builtin/box_add.rb b/lib/vagrant/action/builtin/box_add.rb
index 192f0f52c..e58d9de48 100644
--- a/lib/vagrant/action/builtin/box_add.rb
+++ b/lib/vagrant/action/builtin/box_add.rb
@@ -492,7 +492,10 @@ module Vagrant
           end
 
           # If this isn't HTTP, then don't do the HEAD request
-          return false if !uri.scheme.downcase.start_with?("http")
+          if !uri.scheme.downcase.start_with?("http")
+            @logger.info("not checking metadata since box URI isn't HTTP")
+            return false
+          end
 
           output = d.head
           match  = output.scan(/^Content-Type: (.+?)$/i).last

From c5add4749f55d5af548eb71cc4626e447f2bd824 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 18:10:06 -0800
Subject: [PATCH 165/354] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b251fe24..a2e67fb22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@ BUG FIXES:
     [GH-6395, GH-6534]
   - core: use the correct private key when packaging a box [GH-6406]
   - core: fix crash when using invalid box checksum type [GH-6327]
+  - core: don't check for metadata if the download URL is not HTTP [GH-6540]
   - commands/rdp: prefer `xfreerdp` if it is available on Linux [GH-6475]
   - commands/up: the `--provision-with` flag works with provisioner names [GH-5981]
   - communicator/ssh: fix potential crash case with PTY [GH-6225]

From 13ede32aa19fc6da024bef9a48e18ce26c29987c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 18:10:45 -0800
Subject: [PATCH 166/354] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2e67fb22..66ffd140a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@ BUG FIXES:
   - core: use the correct private key when packaging a box [GH-6406]
   - core: fix crash when using invalid box checksum type [GH-6327]
   - core: don't check for metadata if the download URL is not HTTP [GH-6540]
+  - core: don't make custom dotfile path if there is no Vagrantfile [GH-6542]
   - commands/rdp: prefer `xfreerdp` if it is available on Linux [GH-6475]
   - commands/up: the `--provision-with` flag works with provisioner names [GH-5981]
   - communicator/ssh: fix potential crash case with PTY [GH-6225]

From d2fbb0adf1f85356451e9c2932ca9c96620d767e Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 18:13:37 -0800
Subject: [PATCH 167/354] website/docs: document unprivileged file upload
 [GH-6533]

---
 website/docs/source/v2/provisioning/file.html.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/website/docs/source/v2/provisioning/file.html.md b/website/docs/source/v2/provisioning/file.html.md
index 0fab619ce..92de420d0 100644
--- a/website/docs/source/v2/provisioning/file.html.md
+++ b/website/docs/source/v2/provisioning/file.html.md
@@ -26,6 +26,14 @@ will not be kept in sync. Continuing with the example above, if you make
 further changes to your local ~/.gitconfig, they will not be immediately
 reflected in the copy you uploaded to the guest machine.
 
+The file uploads by the file provisioner are done as the
+_SSH or PowerShell user_. This is important since these users generally
+don't have elevated privileges on their own. If you want to upload files to
+locations that require elevated privileges, we recommend uploading them
+to temporary locations and then using the
+[shell provisioner](/v2/provisioning/shell.html)
+to move them into place.
+
 ## Options
 
 The file provisioner takes only two options, both of which are required:
@@ -37,4 +45,3 @@ The file provisioner takes only two options, both of which are required:
   the source will be uploaded to. The file/folder is uploaded as the SSH user
   over SCP, so this location must be writable to that user. The SSH user can be
   determined by running `vagrant ssh-config`, and defaults to "vagrant".
-

From a59dc7a81548789aa1e8e89b87ad472e2cd4c13c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 18:16:59 -0800
Subject: [PATCH 168/354] website/docs: document where files are created for
 network config [GH-6299]

---
 website/docs/source/v2/networking/private_network.html.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/website/docs/source/v2/networking/private_network.html.md b/website/docs/source/v2/networking/private_network.html.md
index f142c94ca..e1b00df40 100644
--- a/website/docs/source/v2/networking/private_network.html.md
+++ b/website/docs/source/v2/networking/private_network.html.md
@@ -126,3 +126,8 @@ end
 If you already started the Vagrant environment before setting `auto_config`,
 the files it initially placed there will stay there. You'll have to remove
 those files manually or destroy and recreate the machine.
+
+The files created by Vagrant depend on the OS. For example, for many
+Linux distros, this is `/etc/network/interfaces`. In general you should
+look in the normal location that network interfaces are configured for your
+distro.

From a341c0b03c514a7a17f7ae7f8f041a3bf3cc3dcb Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 18:18:38 -0800
Subject: [PATCH 169/354] website/docs: document VAGRANT_DFEAULT_PROVIDER
 [GH-6178]

---
 .../source/v2/other/environmental-variables.html.md    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/website/docs/source/v2/other/environmental-variables.html.md b/website/docs/source/v2/other/environmental-variables.html.md
index 866b4369a..5ff4e670c 100644
--- a/website/docs/source/v2/other/environmental-variables.html.md
+++ b/website/docs/source/v2/other/environmental-variables.html.md
@@ -17,6 +17,16 @@ when launching Vagrant from the official installer, you can specify the
 `VAGRANT_DEBUG_LAUNCHER` environment variable to output debugging information
 about the launch process.
 
+## VAGRANT\_DEFAULT\_PROVIDER
+
+This configures the default provider Vagrant will use.
+
+This normally doesn't need to be set since Vagrant is fairly intelligent
+about how to detect the default provider. By setting this, you will force
+Vagrant to use this provider for any _new_ Vagrant environments. Existing
+Vagrant environments will continue to use the provider they came `up` with.
+Once you `vagrant destroy` existing environments, this will take effect.
+
 ## VAGRANT\_CHECKPOINT\_DISABLE
 
 Vagrant does occasional network calls to check whether the version of Vagrant

From cfc5914ca288ef6c4acb2d54cc47da8fc621391d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 18:20:34 -0800
Subject: [PATCH 170/354] website/docs: fix typo [GH-6227]

---
 website/docs/source/v2/provisioning/salt.html.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/docs/source/v2/provisioning/salt.html.md b/website/docs/source/v2/provisioning/salt.html.md
index 63121c741..323afa0b0 100644
--- a/website/docs/source/v2/provisioning/salt.html.md
+++ b/website/docs/source/v2/provisioning/salt.html.md
@@ -30,7 +30,7 @@ on a single minion, without a master:
 
     ## Use all the defaults:
     config.vm.provision :salt do |salt|
-    
+
       salt.masterless = true
       salt.minion_config = "salt/minion"
       salt.run_highstate = true
@@ -116,7 +116,7 @@ during provisioning.
 * `run_overstate` - (boolean) Executes `state.over` on
 vagrant up. Can be applied to the master only. This is superseded by orchestrate. Not supported on Windows guest machines.
 * `orchestrations` - (boolean) Executes `state.orchestrate` on
-vagrant up. Can be applied to the master only. This is supersedes by run_overstate. Not supported on Windows guest machines.
+vagrant up. Can be applied to the master only. This is superseded by run_overstate. Not supported on Windows guest machines.
 
 ## Output Control
 

From 09890644c670aad13d77efb2a207604026aa5b18 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 18:23:57 -0800
Subject: [PATCH 171/354] website/docs: document port binding defaults
 [GH-6133]

---
 website/docs/source/v2/networking/forwarded_ports.html.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/website/docs/source/v2/networking/forwarded_ports.html.md b/website/docs/source/v2/networking/forwarded_ports.html.md
index 0e08e63dc..e3fef4ea9 100644
--- a/website/docs/source/v2/networking/forwarded_ports.html.md
+++ b/website/docs/source/v2/networking/forwarded_ports.html.md
@@ -28,6 +28,11 @@ end
 
 This will allow accessing port 80 on the guest via port 8080 on the host.
 
+For most providers, forwarded ports by default bind to all interfaces. This
+means that other devices on your network can access the forwarded ports.
+If you want to restrict access, see the `guest_ip` and `host_ip` settings
+below.
+
 ## Options Reference
 
 This is a complete list of the options that are available for forwarded

From f999218c5360be0a5ed4da1cd853376a660e3cf4 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 18:28:33 -0800
Subject: [PATCH 172/354] Perform Chef delete operations on the guest instead
 of the host

---
 .../provisioners/chef/config/chef_client.rb   |  6 -----
 .../chef/provisioner/chef_client.rb           | 26 +++++++------------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/plugins/provisioners/chef/config/chef_client.rb b/plugins/provisioners/chef/config/chef_client.rb
index 331cc9b21..b525a3307 100644
--- a/plugins/provisioners/chef/config/chef_client.rb
+++ b/plugins/provisioners/chef/config/chef_client.rb
@@ -63,12 +63,6 @@ module VagrantPlugins
             errors << I18n.t("vagrant.config.chef.validation_key_path")
           end
 
-          if delete_client || delete_node
-            if !Vagrant::Util::Which.which("knife")
-              errors << I18n.t("vagrant.chef_config_knife_not_found")
-            end
-          end
-
           { "chef client provisioner" => errors }
         end
       end
diff --git a/plugins/provisioners/chef/provisioner/chef_client.rb b/plugins/provisioners/chef/provisioner/chef_client.rb
index 056ab802c..9cda068f3 100644
--- a/plugins/provisioners/chef/provisioner/chef_client.rb
+++ b/plugins/provisioners/chef/provisioner/chef_client.rb
@@ -31,8 +31,8 @@ module VagrantPlugins
         end
 
         def cleanup
-          delete_from_chef_server('client') if @config.delete_client
           delete_from_chef_server('node') if @config.delete_node
+          delete_from_chef_server('client') if @config.delete_client
         end
 
         def create_client_key_folder
@@ -116,6 +116,10 @@ module VagrantPlugins
           end
         end
 
+        def guest_client_rb_path
+          File.join(guest_provisioning_path, "client.rb")
+        end
+
         def guest_validation_key_path
           File.join(guest_provisioning_path, "validation.pem")
         end
@@ -130,23 +134,13 @@ module VagrantPlugins
             return
           end
 
-          @machine.ui.info(I18n.t(
-            "vagrant.provisioners.chef.deleting_from_server",
+          @machine.ui.info(I18n.t("vagrant.provisioners.chef.deleting_from_server",
             deletable: deletable, name: node_name))
 
-          # Knife is not part of the current Vagrant bundle, so it needs to run
-          # in the context of the system.
-          Vagrant.global_lock do
-            command = ["knife", deletable, "delete", "--yes", node_name]
-            r = Vagrant::Util::Subprocess.execute(*command)
-            if r.exit_code != 0
-              @machine.ui.error(I18n.t(
-                "vagrant.chef_client_cleanup_failed",
-                deletable: deletable,
-                stdout: r.stdout,
-                stderr: r.stderr))
-            end
-          end
+          command =  "knife #{deletable} delete #{node_name}"
+          command << " --config '#{guest_client_rb_path}'"
+          command << " --yes"
+          @machine.communicate.sudo(command, error_check: true)
         end
       end
     end

From f88f9b3c2a10f664bd0a79c1da47c78cfe6d1929 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 18:29:52 -0800
Subject: [PATCH 173/354] website/docs: VirtualBox requires "box.ovf" [GH-5904]

---
 website/docs/source/v2/virtualbox/boxes.html.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/source/v2/virtualbox/boxes.html.md b/website/docs/source/v2/virtualbox/boxes.html.md
index 6026369c0..3c8a8330a 100644
--- a/website/docs/source/v2/virtualbox/boxes.html.md
+++ b/website/docs/source/v2/virtualbox/boxes.html.md
@@ -159,4 +159,4 @@ of the NAT device without colons.
 
 When bringing up a VirtualBox backed machine, Vagrant
 [imports](http://www.virtualbox.org/manual/ch08.html#vboxmanage-import)
-the first "ovf" file found in the box contents.
+the "box.ovf" file found in the box contents.

From a0c049da000e0c904be87715419eb4958b33f79f Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 18:32:46 -0800
Subject: [PATCH 174/354] Fix tests

---
 .../chef/config/chef_client_test.rb           | 36 -------------------
 1 file changed, 36 deletions(-)

diff --git a/test/unit/plugins/provisioners/chef/config/chef_client_test.rb b/test/unit/plugins/provisioners/chef/config/chef_client_test.rb
index 25034d019..402663bf3 100644
--- a/test/unit/plugins/provisioners/chef/config/chef_client_test.rb
+++ b/test/unit/plugins/provisioners/chef/config/chef_client_test.rb
@@ -96,41 +96,5 @@ describe VagrantPlugins::Chef::Config::ChefClient do
         expect(errors).to eq([I18n.t("vagrant.config.chef.validation_key_path")])
       end
     end
-
-    context "when #delete_client is given" do
-      before { subject.delete_client = true }
-
-      context "when knife does not exist" do
-        before do
-          allow(Vagrant::Util::Which)
-            .to receive(:which)
-            .with("knife")
-            .and_return(nil)
-        end
-
-        it "returns an error" do
-          subject.finalize!
-          expect(errors).to eq([I18n.t("vagrant.chef_config_knife_not_found")])
-        end
-      end
-    end
-
-    context "when #delete_node is given" do
-      before { subject.delete_node = true }
-
-      context "when knife does not exist" do
-        before do
-          allow(Vagrant::Util::Which)
-            .to receive(:which)
-            .with("knife")
-            .and_return(nil)
-        end
-
-        it "returns an error" do
-          subject.finalize!
-          expect(errors).to eq([I18n.t("vagrant.chef_config_knife_not_found")])
-        end
-      end
-    end
   end
 end

From 398017ba6ea52bd02dee1cbf42d2d7f568f3ddc6 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 18:36:59 -0800
Subject: [PATCH 175/354] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66ffd140a..f179b91ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@ IMPROVEMENTS:
       sources, primarily for corp firewalls. [GH-4738]
   - command/up: provisioners are run on suspend resume [GH-5815]
   - communicators/winrm: Configurable execution time limit [GH-6213]
+  - provisioners/chef: perform cleanup tasks on the guest instead of the host
   - provisioners/shell: Support interactive mode for elevated PowerShell
       scripts [GH-6185]
   - provisioners/ansible: add new `force_remote_user` option to control whether

From c1623ee740c4534ed510dc35f8a6c88563d0c574 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 18:38:03 -0800
Subject: [PATCH 176/354] Fix port collision in tests

---
 test/unit/plugins/pushes/ftp/adapter_test.rb     |  5 ++++-
 test/unit/plugins/pushes/ftp/push_test.rb        |  8 ++++++--
 test/unit/support/shared/base_context.rb         | 14 ++++++++++++++
 test/unit/vagrant/action/builtin/box_add_test.rb |  8 ++++++--
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/test/unit/plugins/pushes/ftp/adapter_test.rb b/test/unit/plugins/pushes/ftp/adapter_test.rb
index e929078cd..6ef07196a 100644
--- a/test/unit/plugins/pushes/ftp/adapter_test.rb
+++ b/test/unit/plugins/pushes/ftp/adapter_test.rb
@@ -39,7 +39,10 @@ describe VagrantPlugins::FTPPush::FTPAdapter do
   include_context "unit"
 
   before(:all) do
-    @server = FakeFtp::Server.new(21212, 21213)
+    @server = nil
+    with_random_port do |port1, port2|
+      @server = FakeFtp::Server.new(port1, port2)
+    end
     @server.start
   end
 
diff --git a/test/unit/plugins/pushes/ftp/push_test.rb b/test/unit/plugins/pushes/ftp/push_test.rb
index 1f6773e24..2430138bc 100644
--- a/test/unit/plugins/pushes/ftp/push_test.rb
+++ b/test/unit/plugins/pushes/ftp/push_test.rb
@@ -9,7 +9,7 @@ describe VagrantPlugins::FTPPush::Push do
   let(:env) { isolated_environment }
   let(:config) do
     double("config",
-      host:        "127.0.0.1:51234",
+      host:        "127.0.0.1:#{@port}",
       username:    "sethvargo",
       password:    "bacon",
       passive:     false,
@@ -34,7 +34,11 @@ describe VagrantPlugins::FTPPush::Push do
 
   describe "#push" do
     before(:all) do
-      @server = FakeFtp::Server.new(51234, 21213)
+      @server = nil
+      with_random_port do |port1, port2|
+        @port = port1
+        @server = FakeFtp::Server.new(port1, port2)
+      end
       @server.start
 
       @dir = Dir.mktmpdir
diff --git a/test/unit/support/shared/base_context.rb b/test/unit/support/shared/base_context.rb
index bd7f3f517..295e83b66 100644
--- a/test/unit/support/shared/base_context.rb
+++ b/test/unit/support/shared/base_context.rb
@@ -116,4 +116,18 @@ shared_context "unit" do
       ENV[key] = value
     end
   end
+
+  # This helper provides a randomly available port(s) for each argument to the
+  # block.
+  def with_random_port(&block)
+    ports = []
+
+    block.arity.times do
+      server = TCPServer.new('127.0.0.1', 0)
+      ports << server.addr[1]
+      server.close
+    end
+
+    block.call(*ports)
+  end
 end
diff --git a/test/unit/vagrant/action/builtin/box_add_test.rb b/test/unit/vagrant/action/builtin/box_add_test.rb
index 44bcbca24..cc034df02 100644
--- a/test/unit/vagrant/action/builtin/box_add_test.rb
+++ b/test/unit/vagrant/action/builtin/box_add_test.rb
@@ -42,8 +42,12 @@ describe Vagrant::Action::Builtin::BoxAdd do
     tf = Tempfile.new("vagrant")
     tf.close
 
-    port   = 21212
-    server = FakeFtp::Server.new(port, port+1)
+    port = nil
+    server = nil
+    with_random_port do |port1, port2|
+      port = port1
+      server = FakeFtp::Server.new(port1, port2)
+    end
     server.add_file(path.basename, path.read)
     server.start
     yield port

From c8a18fda269d972f389edd88b84b95777f00e52b Mon Sep 17 00:00:00 2001
From: Seth Miller <seth@sethmiller.me>
Date: Wed, 18 Nov 2015 21:55:32 -0600
Subject: [PATCH 177/354] Fixing the Salt bootstrap script for Windows

The URL for the download has changed as per issue #6274
---
 plugins/provisioners/salt/bootstrap-salt.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/provisioners/salt/bootstrap-salt.ps1 b/plugins/provisioners/salt/bootstrap-salt.ps1
index 78f268ea3..0ed06f7eb 100644
--- a/plugins/provisioners/salt/bootstrap-salt.ps1
+++ b/plugins/provisioners/salt/bootstrap-salt.ps1
@@ -51,7 +51,7 @@ If ([IntPtr]::Size -eq 4) {
 # Download minion setup file
 Write-Host "Downloading Salt minion installer Salt-Minion-$version-$arch-Setup.exe"
 $webclient = New-Object System.Net.WebClient
-$url = "https://docs.saltstack.com/downloads/Salt-Minion-$version-$arch-Setup.exe"
+$url = "https://repo.saltstack.com/windows/Salt-Minion-$version-$arch-Setup.exe"
 $file = "C:\tmp\salt.exe"
 $webclient.DownloadFile($url, $file)
 

From 2ffbe4e6e11f875cd0befd639fdac40ab9013a2c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Nov 2015 20:26:54 -0800
Subject: [PATCH 178/354] core: more robust WIndows admin check [GH-5616]

---
 CHANGELOG.md                 | 1 +
 lib/vagrant/util/platform.rb | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f179b91ef..2a748bae9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@ BUG FIXES:
   - core: fix crash when using invalid box checksum type [GH-6327]
   - core: don't check for metadata if the download URL is not HTTP [GH-6540]
   - core: don't make custom dotfile path if there is no Vagrantfile [GH-6542]
+  - core: more robust check for admin privs on Windows [GH-5616]
   - commands/rdp: prefer `xfreerdp` if it is available on Linux [GH-6475]
   - commands/up: the `--provision-with` flag works with provisioner names [GH-5981]
   - communicator/ssh: fix potential crash case with PTY [GH-6225]
diff --git a/lib/vagrant/util/platform.rb b/lib/vagrant/util/platform.rb
index 706445c3b..85bca065c 100644
--- a/lib/vagrant/util/platform.rb
+++ b/lib/vagrant/util/platform.rb
@@ -45,10 +45,13 @@ module Vagrant
           #   detect-if-running-with-administrator-privileges-under-windows-xp
           begin
             Win32::Registry::HKEY_USERS.open("S-1-5-19") {}
-            return true
           rescue Win32::Registry::Error
             return false
           end
+
+          # If we made it this far then we try a fallback approach
+          # since the above doesn't seem to be bullet proof. See GH-5616
+          (`reg query HKU\\S-1-5-19 2>&1` =~ /ERROR/).nil?
         end
 
         # This takes any path and converts it from a Windows path to a

From 80547984276477ebf3449d30f27d0c96fe505707 Mon Sep 17 00:00:00 2001
From: Mikhail Korepanov <panyakor@gmail.com>
Date: Thu, 19 Nov 2015 13:56:20 +0300
Subject: [PATCH 179/354] Avoid full-screen repaints on scroll. Fixes #6520

---
 website/docs/source/layouts/layout.erb        |  1 +
 website/docs/source/stylesheets/_mixins.less  | 11 +++++++++--
 website/docs/source/stylesheets/_pages.less   | 16 ++++++++--------
 website/docs/source/stylesheets/_sidebar.less |  4 ++++
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/website/docs/source/layouts/layout.erb b/website/docs/source/layouts/layout.erb
index 1cfb19c2d..777b42ce1 100644
--- a/website/docs/source/layouts/layout.erb
+++ b/website/docs/source/layouts/layout.erb
@@ -47,6 +47,7 @@
 			</nav>
 
 			<div class="page docs docs-home">
+				<div class="sidebar-background"></div>
 				<div class="container">
 					<div class="row">
 
diff --git a/website/docs/source/stylesheets/_mixins.less b/website/docs/source/stylesheets/_mixins.less
index eb0afdeeb..45dd9e745 100644
--- a/website/docs/source/stylesheets/_mixins.less
+++ b/website/docs/source/stylesheets/_mixins.less
@@ -63,6 +63,15 @@
   padding: @baseline 0;
 }
 
+.fixed-bg {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  z-index: -5; //keep it in the back
+  will-change: transform;
+}
+
 .inner-bg-large {
   background-image: #c1b4d5; /* Old browsers */
   background-image: url(/images/sidebar_background_inner.png), -moz-linear-gradient(45deg,  #c1b4d5 0%, #98d3f8 100%); /* FF3.6+ */
@@ -74,7 +83,6 @@
   filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#c1b4d5', endColorstr='#98d3f8',GradientType=1 ); /* IE6-8 fallback on horizontal gradient */
   background-repeat: no-repeat;
   background-position: 0 0;
-  background-attachment:fixed;
 }
 
 .inner-bg-small {
@@ -99,7 +107,6 @@
   background-image: url(/images/sidebar_background_docs.png), linear-gradient(45deg,  #362d6c 0%,#0c5593 100%); /* W3C */
   filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#362d6c', endColorstr='#0c5593',GradientType=1 ); /* IE6-8 fallback on horizontal gradient */
   background-repeat: no-repeat;
-  background-attachment:fixed;
 }
 
 
diff --git a/website/docs/source/stylesheets/_pages.less b/website/docs/source/stylesheets/_pages.less
index 5daab0892..ef67c02b3 100644
--- a/website/docs/source/stylesheets/_pages.less
+++ b/website/docs/source/stylesheets/_pages.less
@@ -2,11 +2,7 @@
 .page { //style all pages
 
     .page-background { //page background color
-        width: 100%;
-        height: 100%;
-        top: 0;
-        position: fixed;
-        z-index: -5; //keep it in the back
+        .fixed-bg;
     } //.background
 
     .page-contents {
@@ -181,7 +177,9 @@
 
     /* inner	 */
     &.inner { //style inner pages
-        .inner-bg-large; //sidebar background
+        .sidebar-background { //sidebar background
+            .inner-bg-large;
+        }
 
         .page-background { //change inner background color!
             background-color: @gray-background; //page background
@@ -205,12 +203,14 @@
 
     /* docs */
     &.docs { //style all docs
-        .docs-bg-large; //sidebar background
-
         .page-background { //change the sidebar background color!
             background: @white; //page background
         }
 
+        .sidebar-background { //sidebar background
+            .docs-bg-large;
+        }
+
         .page-contents {
             padding-top: 30px;
             background-color: @white;
diff --git a/website/docs/source/stylesheets/_sidebar.less b/website/docs/source/stylesheets/_sidebar.less
index 356deac79..70fc39a7a 100644
--- a/website/docs/source/stylesheets/_sidebar.less
+++ b/website/docs/source/stylesheets/_sidebar.less
@@ -7,6 +7,10 @@
         margin-bottom: 20px;
     }
 
+    &-background { //background image
+        .fixed-bg;
+    }
+
     .button {
         font-size: 15px;
         color: @dark-blue-text;

From d1233c1d078ce2062c4a42206b873ce885c5f2a5 Mon Sep 17 00:00:00 2001
From: Sam Handler <sam@hashicorp.com>
Date: Thu, 19 Nov 2015 11:03:02 -0500
Subject: [PATCH 180/354] safer way to display edit this page link

---
 website/docs/source/layouts/layout.erb | 5 ++++-
 website/www/source/layouts/layout.erb  | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/website/docs/source/layouts/layout.erb b/website/docs/source/layouts/layout.erb
index 38a735de3..f43eb3dfa 100644
--- a/website/docs/source/layouts/layout.erb
+++ b/website/docs/source/layouts/layout.erb
@@ -324,7 +324,10 @@
 							<li><a href="https://docs.vagrantup.com/">Documentation</a></li>
 							<li><a href="https://www.vagrantup.com/about">About</a></li>
 							<li><a href="https://www.vagrantup.com/support">Support</a></li>
-							<% github_link = 'https://github.com/mitchellh/vagrant/blob/master/' + current_page.source_file.match(/website.*/)[0] %>
+							<% relative_path = current_page.path.match(/.*\//).to_s
+							file = current_page.source_file.split("/").last
+							github_link = "https://github.com/mitchellh/vagrant/blob/master/website/docs/source/#{relative_path}#{file}"
+							%>
 							<li class="li-under"><a href="<%= github_link %>">Edit this page</a></li>
 							<a href="https://www.vagrantup.com/downloads">
 								<li class="button inline-button">Download</li>
diff --git a/website/www/source/layouts/layout.erb b/website/www/source/layouts/layout.erb
index 2daba176d..6c556b6b7 100644
--- a/website/www/source/layouts/layout.erb
+++ b/website/www/source/layouts/layout.erb
@@ -60,8 +60,11 @@
 							 <li><a href="/about.html">About</a></li>
 							 <li><a href="/support.html">Support</a></li>
 							 <% if current_page.url != "/" %>
-							 	<% github_link = 'https://github.com/mitchellh/vagrant/blob/master/' + current_page.source_file.match(/website.*/)[0] %>
-							 	<li class="li-under"><a href="<%= github_link %>">Edit this page</a></li>
+								<% relative_path = current_page.path.match(/.*\//).to_s
+								file = current_page.source_file.split("/").last
+								github_link = "https://github.com/mitchellh/vagrant/blob/master/website/www/source/#{relative_path}#{file}"
+								%>
+								<li class="li-under"><a href="<%= github_link %>">Edit this page</a></li>
 							 <% end %>
 							 <a href="/downloads.html">
 								 <li class="button inline-button">Download</li>

From 764e151672bbdf2e9ef5058d3ba3fa70b9151eaa Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Thu, 19 Nov 2015 09:29:44 -0800
Subject: [PATCH 181/354] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a748bae9..f20ff161d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,8 @@ IMPROVEMENTS:
 
 BUG FIXES:
 
+  - core: Ctrl-C weirdness fixed where it would exit parent process
+      before Vagrant finished cleaning up [GH-6085]
   - core: DHCP network configurations don't warn on IP addresses ending
       in ".1" [GH-6150]
   - core: only append `access_token` when it does not exist in the URL

From eac1960d453848aa1a14b259e09fa01103246e6f Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 10:25:32 -0800
Subject: [PATCH 182/354] Fix some Ruby

---
 lib/vagrant/action/builtin/provisioner_cleanup.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/vagrant/action/builtin/provisioner_cleanup.rb b/lib/vagrant/action/builtin/provisioner_cleanup.rb
index 3aab56c6e..c76b88f39 100644
--- a/lib/vagrant/action/builtin/provisioner_cleanup.rb
+++ b/lib/vagrant/action/builtin/provisioner_cleanup.rb
@@ -13,8 +13,9 @@ module Vagrant
         def initialize(app, env, place=nil)
           @app    = app
           @logger = Log4r::Logger.new("vagrant::action::builtin::provision_cleanup")
-          @place ||= :after
-          @place = @place.to_sym
+
+          place ||= :after
+          @place = place.to_sym
         end
 
         def call(env)

From d56c8fda18aecd5a8669b6a7cc18c7778429032d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Nov 2015 11:00:02 -0800
Subject: [PATCH 183/354] providers/virtualbox: cache VirtualBox version
 [GH-6468]

---
 plugins/providers/virtualbox/driver/meta.rb | 30 ++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/plugins/providers/virtualbox/driver/meta.rb b/plugins/providers/virtualbox/driver/meta.rb
index 136ab196a..133784c33 100644
--- a/plugins/providers/virtualbox/driver/meta.rb
+++ b/plugins/providers/virtualbox/driver/meta.rb
@@ -17,6 +17,10 @@ module VagrantPlugins
         # We use forwardable to do all our driver forwarding
         extend Forwardable
 
+        # We cache the read VirtualBox version here once we have one,
+        # since during the execution of Vagrant, it likely doesn't change.
+        @@version = nil
+
         # The UUID of the virtual machine we represent
         attr_reader :uuid
 
@@ -32,19 +36,21 @@ module VagrantPlugins
           @logger = Log4r::Logger.new("vagrant::provider::virtualbox::meta")
           @uuid = uuid
 
-          # Read and assign the version of VirtualBox we know which
-          # specific driver to instantiate.
-          begin
-            @version = read_version || ""
-          rescue Vagrant::Errors::CommandUnavailable,
-            Vagrant::Errors::CommandUnavailableWindows
-            # This means that VirtualBox was not found, so we raise this
-            # error here.
-            raise Vagrant::Errors::VirtualBoxNotDetected
+          if !@@version
+            # Read and assign the version of VirtualBox we know which
+            # specific driver to instantiate.
+            begin
+              @@version = read_version
+            rescue Vagrant::Errors::CommandUnavailable,
+              Vagrant::Errors::CommandUnavailableWindows
+              # This means that VirtualBox was not found, so we raise this
+              # error here.
+              raise Vagrant::Errors::VirtualBoxNotDetected
+            end
           end
 
           # Instantiate the proper version driver for VirtualBox
-          @logger.debug("Finding driver for VirtualBox version: #{@version}")
+          @logger.debug("Finding driver for VirtualBox version: #{@@version}")
           driver_map   = {
             "4.0" => Version_4_0,
             "4.1" => Version_4_1,
@@ -53,14 +59,14 @@ module VagrantPlugins
             "5.0" => Version_5_0,
           }
 
-          if @version.start_with?("4.2.14")
+          if @@version.start_with?("4.2.14")
             # VirtualBox 4.2.14 just doesn't work with Vagrant, so show error
             raise Vagrant::Errors::VirtualBoxBrokenVersion040214
           end
 
           driver_klass = nil
           driver_map.each do |key, klass|
-            if @version.start_with?(key)
+            if @@version.start_with?(key)
               driver_klass = klass
               break
             end

From fb511a43d94a43b6b145dc4aa525bc939f412d41 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Nov 2015 11:02:00 -0800
Subject: [PATCH 184/354] providers/virtualbox: store version on instance as
 well

---
 plugins/providers/virtualbox/driver/meta.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/providers/virtualbox/driver/meta.rb b/plugins/providers/virtualbox/driver/meta.rb
index 133784c33..668659fe8 100644
--- a/plugins/providers/virtualbox/driver/meta.rb
+++ b/plugins/providers/virtualbox/driver/meta.rb
@@ -80,6 +80,7 @@ module VagrantPlugins
 
           @logger.info("Using VirtualBox driver: #{driver_klass}")
           @driver = driver_klass.new(@uuid)
+          @version = @@version
 
           if @uuid
             # Verify the VM exists, and if it doesn't, then don't worry

From aaed7c178fc2acacdea7d25acaa4dd796d2d79e1 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 11:07:19 -0800
Subject: [PATCH 185/354] Add tests

---
 .../builtin/provisioner_cleanup_test.rb       | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 test/unit/vagrant/action/builtin/provisioner_cleanup_test.rb

diff --git a/test/unit/vagrant/action/builtin/provisioner_cleanup_test.rb b/test/unit/vagrant/action/builtin/provisioner_cleanup_test.rb
new file mode 100644
index 000000000..00132f616
--- /dev/null
+++ b/test/unit/vagrant/action/builtin/provisioner_cleanup_test.rb
@@ -0,0 +1,58 @@
+require "pathname"
+require "tmpdir"
+
+require File.expand_path("../../../../base", __FILE__)
+
+describe Vagrant::Action::Builtin::ProvisionerCleanup do
+  let(:app) { lambda { |env| } }
+  let(:env) { { machine: machine, ui: ui } }
+
+  let(:machine) do
+    double("machine").tap do |machine|
+      allow(machine).to receive(:config).and_return(machine_config)
+    end
+  end
+
+  let(:machine_config) do
+    double("machine_config").tap do |config|
+      config.stub(vm: vm_config)
+    end
+  end
+
+  let(:vm_config) { double("machine_vm_config") }
+
+  let(:ui) do
+    double("ui").tap do |result|
+      allow(result).to receive(:info)
+    end
+  end
+
+  let(:provisioner) do
+    Class.new(Vagrant.plugin("2", :provisioner))
+  end
+
+  before do
+    allow_any_instance_of(described_class).to receive(:provisioner_type_map)
+      .and_return(provisioner => :test_provisioner)
+    allow_any_instance_of(described_class).to receive(:provisioner_instances)
+      .and_return([provisioner])
+  end
+
+  describe "initialize with :before" do
+    it "runs cleanup before" do
+      instance = described_class.new(app, env, :before)
+      expect(provisioner).to receive(:cleanup).ordered
+      expect(app).to receive(:call).ordered
+      instance.call(env)
+    end
+  end
+
+  describe "initialize with :after" do
+    it "runs cleanup after" do
+      instance = described_class.new(app, env, :after)
+      expect(app).to receive(:call).ordered
+      expect(provisioner).to receive(:cleanup).ordered
+      instance.call(env)
+    end
+  end
+end

From 825bd6d5ef025531917dd30e1c3fd754d3b3c925 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 18 Nov 2015 20:23:21 -0800
Subject: [PATCH 186/354] Run provisioner cleanup tasks before destroying the
 VM

---
 plugins/providers/docker/action.rb     | 2 +-
 plugins/providers/hyperv/action.rb     | 1 +
 plugins/providers/virtualbox/action.rb | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/providers/docker/action.rb b/plugins/providers/docker/action.rb
index bb376fb3d..c3f8dfe01 100644
--- a/plugins/providers/docker/action.rb
+++ b/plugins/providers/docker/action.rb
@@ -156,12 +156,12 @@ module VagrantPlugins
               b3.use Call, DestroyConfirm do |env3, b4|
                 if env3[:result]
                   b4.use ConfigValidate
+                  b4.use ProvisionerCleanup, :before
                   b4.use EnvSet, force_halt: true
                   b4.use action_halt
                   b4.use HostMachineSyncFoldersDisable
                   b4.use Destroy
                   b4.use DestroyBuildImage
-                  b4.use ProvisionerCleanup
                 else
                   b4.use Message,
                     I18n.t("docker_provider.messages.will_not_destroy")
diff --git a/plugins/providers/hyperv/action.rb b/plugins/providers/hyperv/action.rb
index 64d4bc396..2d6433a22 100644
--- a/plugins/providers/hyperv/action.rb
+++ b/plugins/providers/hyperv/action.rb
@@ -38,6 +38,7 @@ module VagrantPlugins
               end
 
               b2.use ConfigValidate
+              b4.use ProvisionerCleanup, :before
               b2.use StopInstance
               b2.use DeleteVM
             end
diff --git a/plugins/providers/virtualbox/action.rb b/plugins/providers/virtualbox/action.rb
index 137e0ac92..7da0c06ae 100644
--- a/plugins/providers/virtualbox/action.rb
+++ b/plugins/providers/virtualbox/action.rb
@@ -95,13 +95,14 @@ module VagrantPlugins
 
             b2.use Call, DestroyConfirm do |env2, b3|
               if env2[:result]
+                b3.use ConfigValidate
+                b3.use ProvisionerCleanup, :before
                 b3.use CheckAccessible
                 b3.use EnvSet, force_halt: true
                 b3.use action_halt
                 b3.use Destroy
                 b3.use CleanMachineFolder
                 b3.use DestroyUnusedNetworkInterfaces
-                b3.use ProvisionerCleanup
                 b3.use PrepareNFSValidIds
                 b3.use SyncedFolderCleanup
               else

From f5273c5409912dfbfe10ce9b454f509c2573be8d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Nov 2015 11:17:48 -0800
Subject: [PATCH 187/354] push/heroku: use correct current branch [GH-6123]

---
 plugins/pushes/heroku/push.rb                |  3 ++-
 test/unit/plugins/pushes/heroku/push_test.rb | 16 ----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/plugins/pushes/heroku/push.rb b/plugins/pushes/heroku/push.rb
index b894eba81..a0e26df8a 100644
--- a/plugins/pushes/heroku/push.rb
+++ b/plugins/pushes/heroku/push.rb
@@ -69,7 +69,8 @@ module VagrantPlugins
         result = execute!("git",
           "--git-dir", git_dir(path),
           "--work-tree", path,
-          "branch",
+          "symbolic-ref",
+          "HEAD",
         )
 
         # Returns something like "* master"
diff --git a/test/unit/plugins/pushes/heroku/push_test.rb b/test/unit/plugins/pushes/heroku/push_test.rb
index c0337e41f..8a8ddd97d 100644
--- a/test/unit/plugins/pushes/heroku/push_test.rb
+++ b/test/unit/plugins/pushes/heroku/push_test.rb
@@ -252,22 +252,6 @@ describe VagrantPlugins::HerokuPush::Push do
 
     let(:branch) { subject.git_branch("/path") }
 
-    context "when the branch is prefixed with a star" do
-      let(:stdout) { "*bacon" }
-
-      it "returns the correct name" do
-        expect(branch).to eq("bacon")
-      end
-    end
-
-    context "when the branch is prefixed with a star space" do
-      let(:stdout) { "* bacon" }
-
-      it "returns the correct name" do
-        expect(branch).to eq("bacon")
-      end
-    end
-
     context "when the branch is not prefixed" do
       let(:stdout) { "bacon" }
 

From 8b90cff984da7f67151a41658a07288e174e87af Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 11:19:08 -0800
Subject: [PATCH 188/354] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f20ff161d..8cd207c1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ IMPROVEMENTS:
   - core: allow removal of all box versions with `--all` flag [GH-3462]
   - core: prune entries from global status on non-existent cwd [GH-6535]
   - core: networking: allow specifying a DHCP IP [GH-6325]
+  - core: run provisioner cleanup tasks before powering off the VM [GH-6553]
   - command/plugin: Add `--plugin-clean-sources` flag to reset plugin install
       sources, primarily for corp firewalls. [GH-4738]
   - command/up: provisioners are run on suspend resume [GH-5815]

From a75b14b7694e50aed37c7aa134cf9a027c181bd4 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Nov 2015 11:19:56 -0800
Subject: [PATCH 189/354] providers/virtualbox: wrap version set in mutex

---
 plugins/providers/virtualbox/driver/meta.rb | 24 ++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/plugins/providers/virtualbox/driver/meta.rb b/plugins/providers/virtualbox/driver/meta.rb
index 668659fe8..7aceb9fca 100644
--- a/plugins/providers/virtualbox/driver/meta.rb
+++ b/plugins/providers/virtualbox/driver/meta.rb
@@ -1,4 +1,5 @@
 require "forwardable"
+require "thread"
 
 require "log4r"
 
@@ -20,6 +21,7 @@ module VagrantPlugins
         # We cache the read VirtualBox version here once we have one,
         # since during the execution of Vagrant, it likely doesn't change.
         @@version = nil
+        @@version_lock = Mutex.new
 
         # The UUID of the virtual machine we represent
         attr_reader :uuid
@@ -36,16 +38,18 @@ module VagrantPlugins
           @logger = Log4r::Logger.new("vagrant::provider::virtualbox::meta")
           @uuid = uuid
 
-          if !@@version
-            # Read and assign the version of VirtualBox we know which
-            # specific driver to instantiate.
-            begin
-              @@version = read_version
-            rescue Vagrant::Errors::CommandUnavailable,
-              Vagrant::Errors::CommandUnavailableWindows
-              # This means that VirtualBox was not found, so we raise this
-              # error here.
-              raise Vagrant::Errors::VirtualBoxNotDetected
+          @@version_lock.synchronize do
+            if !@@version
+              # Read and assign the version of VirtualBox we know which
+              # specific driver to instantiate.
+              begin
+                @@version = read_version
+              rescue Vagrant::Errors::CommandUnavailable,
+                Vagrant::Errors::CommandUnavailableWindows
+                # This means that VirtualBox was not found, so we raise this
+                # error here.
+                raise Vagrant::Errors::VirtualBoxNotDetected
+              end
             end
           end
 

From 3987ce84cc28d556c7da06f12f9aa9b25ed6ad23 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Nov 2015 11:21:14 -0800
Subject: [PATCH 190/354] update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8cd207c1a..9b80ffbef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,8 @@ IMPROVEMENTS:
       sources, primarily for corp firewalls. [GH-4738]
   - command/up: provisioners are run on suspend resume [GH-5815]
   - communicators/winrm: Configurable execution time limit [GH-6213]
+  - providers/virtualbox: cache version lookup, which caused significant
+      slowdown on some Windows hosts [GH-6552]
   - provisioners/chef: perform cleanup tasks on the guest instead of the host
   - provisioners/shell: Support interactive mode for elevated PowerShell
       scripts [GH-6185]

From fd3e1ff592a8d148f988526a07385c442b39b120 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Nov 2015 11:22:52 -0800
Subject: [PATCH 191/354] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b80ffbef..aefd5c0ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -86,6 +86,7 @@ BUG FIXES:
   - provisioners/puppet-server: works with Puppet Collection 1 [GH-6389]
   - provisioners/salt: call correct executables on Windows [GH-5999]
   - provisioners/salt: log level and colorize works for masterless [GH-6474]
+  - push/heroku: use current branch [GH-6554]
   - synced\_folders/rsync: on Windows, replace all paths with Cygwin
       paths since all rsync implementations require this [GH-6160]
 

From 9559fc549cab78a766e464de681d96ec4a6a847d Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 11:25:34 -0800
Subject: [PATCH 192/354] Automatically generate a node_name for Chef

This is required because the Chef Server almost always needs a node name to
interact. This will default to the hostname, but that's always going to be
`vagrant.vm`, which will collide easily.

This generates a random hostname with `vagrant-` as the prefix and stores the
result in the machine's data directory.
---
 plugins/provisioners/chef/provisioner/base.rb | 20 +++++++++++++++++--
 .../chef/provisioner/chef_client.rb           |  9 +++++++--
 templates/locales/en.yml                      |  2 ++
 .../chef/provisioner/base_test.rb             | 14 ++++++++++++-
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/plugins/provisioners/chef/provisioner/base.rb b/plugins/provisioners/chef/provisioner/base.rb
index e0b2b3fc4..525e98a9e 100644
--- a/plugins/provisioners/chef/provisioner/base.rb
+++ b/plugins/provisioners/chef/provisioner/base.rb
@@ -19,6 +19,22 @@ module VagrantPlugins
           super
 
           @logger = Log4r::Logger.new("vagrant::provisioners::chef")
+
+          if @config.node_name.to_s.empty?
+            cache = @machine.data_dir.join("chef_node_name")
+
+            if !cache.exist?
+              @machine.ui.info I18n.t("vagrant.provisioners.chef.generating_node_name")
+              cache.open("w+") do |f|
+                f.write("vagrant-#{SecureRandom.hex(4)}")
+              end
+            end
+
+            if cache.file?
+              @logger.info("Loading cached node_name...")
+              @config.node_name = cache.read.strip
+            end
+          end
         end
 
         def install_chef
@@ -123,7 +139,7 @@ module VagrantPlugins
         end
 
         def setup_json
-          @machine.env.ui.info I18n.t("vagrant.provisioners.chef.json")
+          @machine.ui.info I18n.t("vagrant.provisioners.chef.json")
 
           # Get the JSON that we're going to expose to Chef
           json = @config.json
@@ -154,7 +170,7 @@ module VagrantPlugins
           remote_file = guest_encrypted_data_bag_secret_key_path
           return if !remote_file
 
-          @machine.env.ui.info I18n.t(
+          @machine.ui.info I18n.t(
             "vagrant.provisioners.chef.upload_encrypted_data_bag_secret_key")
 
           @machine.communicate.tap do |comm|
diff --git a/plugins/provisioners/chef/provisioner/chef_client.rb b/plugins/provisioners/chef/provisioner/chef_client.rb
index 9cda068f3..d5168efa8 100644
--- a/plugins/provisioners/chef/provisioner/chef_client.rb
+++ b/plugins/provisioners/chef/provisioner/chef_client.rb
@@ -31,8 +31,13 @@ module VagrantPlugins
         end
 
         def cleanup
-          delete_from_chef_server('node') if @config.delete_node
-          delete_from_chef_server('client') if @config.delete_client
+          if @config.delete_node
+            delete_from_chef_server("node")
+          end
+
+          if @config.delete_client
+            delete_from_chef_server("client")
+          end
         end
 
         def create_client_key_folder
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 8f087c6dc..05f9f4b0d 100755
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1931,6 +1931,8 @@ en:
           "The cookbook path '%{path}' doesn't exist. Ignoring..."
         json: "Generating chef JSON and uploading..."
         client_key_folder: "Creating folder to hold client key..."
+        generating_node_name: |-
+          Auto-generating node name for Chef...
         install_failed: |-
           Vagrant could not detect Chef on the guest! Even after Vagrant
           attempted to install Chef, it could still not find Chef on the system.
diff --git a/test/unit/plugins/provisioners/chef/provisioner/base_test.rb b/test/unit/plugins/provisioners/chef/provisioner/base_test.rb
index 6274ed317..033051b1b 100644
--- a/test/unit/plugins/provisioners/chef/provisioner/base_test.rb
+++ b/test/unit/plugins/provisioners/chef/provisioner/base_test.rb
@@ -5,11 +5,23 @@ require Vagrant.source_root.join("plugins/provisioners/chef/provisioner/base")
 describe VagrantPlugins::Chef::Provisioner::Base do
   include_context "unit"
 
-  let(:machine) { double("machine") }
+  let(:iso_env) do
+    # We have to create a Vagrantfile so there is a root path
+    env = isolated_environment
+    env.vagrantfile("")
+    env.create_vagrant_env
+  end
+
+  let(:machine) { iso_env.machine(iso_env.machine_names[0], :dummy) }
   let(:config)  { double("config") }
 
   subject { described_class.new(machine, config) }
 
+  before do
+    allow(config).to receive(:node_name)
+    allow(config).to receive(:node_name=)
+  end
+
   describe "#encrypted_data_bag_secret_key_path" do
     let(:env) { double("env") }
     let(:root_path) { "/my/root" }

From 4988298b0b1f2cb423330d29e8267fa5a9a85829 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Nov 2015 11:39:04 -0800
Subject: [PATCH 193/354] guests/arch: configure networks should enable device
 [GH-5737]

---
 CHANGELOG.md                                  | 1 +
 plugins/guests/arch/cap/configure_networks.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aefd5c0ef..d1048aee3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@ BUG FIXES:
   - communicator/winrm: execute scheduled tasks immediately on Windows XP
       since elevation isn't required [GH-6195]
   - communicator/winrm: Hide progress bars from PowerShell v5 [GH-6309]
+  - guests/arch: enable network device after setting it up [GH-5737]
   - guests/darwin: advanced networking works with more NICs [GH-6386]
   - guests/debian: graceful shutdown works properly with newer releases [GH-5986]
   - guests/fedora: Preserve `localhost` entry when changing hostname [GH-6203]
diff --git a/plugins/guests/arch/cap/configure_networks.rb b/plugins/guests/arch/cap/configure_networks.rb
index fd06c24ea..1b95469fc 100644
--- a/plugins/guests/arch/cap/configure_networks.rb
+++ b/plugins/guests/arch/cap/configure_networks.rb
@@ -27,7 +27,7 @@ module VagrantPlugins
 
             machine.communicate.upload(temp.path, "/tmp/vagrant_network")
             machine.communicate.sudo("mv /tmp/vagrant_network /etc/netctl/#{network[:device]}")
-            machine.communicate.sudo("ip link set #{network[:device]} down && netctl start #{network[:device]}")
+            machine.communicate.sudo("ip link set #{network[:device]} down && netctl start #{network[:device]} && netctl enable #{network[:device]}")
           end
         end
       end

From 38dab45aa7d04bf99a09671eca1e2f3ea3ab9d44 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 11:40:48 -0800
Subject: [PATCH 194/354] Update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1048aee3..33aa12f92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,8 @@ IMPROVEMENTS:
   - providers/virtualbox: cache version lookup, which caused significant
       slowdown on some Windows hosts [GH-6552]
   - provisioners/chef: perform cleanup tasks on the guest instead of the host
+  - provisioners/chef: automatically generate a node_name if one was not given
+    [GH-6555]
   - provisioners/shell: Support interactive mode for elevated PowerShell
       scripts [GH-6185]
   - provisioners/ansible: add new `force_remote_user` option to control whether

From b8f200a4c1c09d9a25c49eab334241c6cb9eb4c6 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 11:45:09 -0800
Subject: [PATCH 195/354] Only force the formatter if we are on Chef 11 or
 higher

Fixes GH-6278
---
 plugins/provisioners/chef/command_builder.rb  |  6 +++-
 .../provisioners/chef/command_builder_test.rb | 31 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/plugins/provisioners/chef/command_builder.rb b/plugins/provisioners/chef/command_builder.rb
index ad5093831..8a97facc7 100644
--- a/plugins/provisioners/chef/command_builder.rb
+++ b/plugins/provisioners/chef/command_builder.rb
@@ -48,8 +48,12 @@ module VagrantPlugins
         args << " --json-attributes #{provisioning_path("dna.json")}"
         args << " --local-mode" if options[:local_mode]
         args << " --log_level #{config.log_level}" if config.log_level
-        args << " --force-formatter"
         args << " --no-color" if !options[:colored]
+
+        if config.install && config.version >= "11.0"
+          args << " --force-formatter"
+        end
+
         args << " #{config.arguments.strip}" if config.arguments
 
         args.strip
diff --git a/test/unit/plugins/provisioners/chef/command_builder_test.rb b/test/unit/plugins/provisioners/chef/command_builder_test.rb
index 655c9041f..e2359d917 100644
--- a/test/unit/plugins/provisioners/chef/command_builder_test.rb
+++ b/test/unit/plugins/provisioners/chef/command_builder_test.rb
@@ -8,6 +8,8 @@ describe VagrantPlugins::Chef::CommandBuilder do
   let(:chef_config) { double("chef_config") }
 
   before(:each) do
+    allow(chef_config).to receive(:install).and_return(true)
+    allow(chef_config).to receive(:version).and_return("12.0.0")
     allow(chef_config).to receive(:provisioning_path).and_return("/tmp/vagrant-chef-1")
     allow(chef_config).to receive(:arguments).and_return(nil)
     allow(chef_config).to receive(:binary_env).and_return(nil)
@@ -71,6 +73,23 @@ describe VagrantPlugins::Chef::CommandBuilder do
         expect(subject.command).to include(
           " --no-color")
       end
+
+      it "includes --force-formatter if Chef > 10" do
+        expect(subject.command).to include(
+          " --force-formatter")
+      end
+
+      it "does not include --force-formatter if Chef < 11" do
+        allow(chef_config).to receive(:version).and_return("10.0")
+        expect(subject.command).to_not include(
+          " --force-formatter")
+      end
+
+      it "does not include --force-formatter if we did not install Chef" do
+        allow(chef_config).to receive(:install).and_return(false)
+        expect(subject.command).to_not include(
+          " --force-formatter")
+      end
     end
 
     describe "linux" do
@@ -113,6 +132,18 @@ describe VagrantPlugins::Chef::CommandBuilder do
         allow(chef_config).to receive(:binary_env).and_return("ENVVAR=VAL")
         expect(subject.command).to match(/^ENVVAR=VAL /)
       end
+
+      it "does not include --force-formatter if Chef < 11" do
+        allow(chef_config).to receive(:version).and_return("10.0")
+        expect(subject.command).to_not include(
+          " --force-formatter")
+      end
+
+      it "does not include --force-formatter if we did not install Chef" do
+        allow(chef_config).to receive(:install).and_return(false)
+        expect(subject.command).to_not include(
+          " --force-formatter")
+      end
     end
   end
 end

From 9bab741cf30fef5918b841e4e9549c8ece5ec141 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 11:56:45 -0800
Subject: [PATCH 196/354] Update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33aa12f92..f2cf82916 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -82,6 +82,8 @@ BUG FIXES:
   - provisioners/chef: fix `nodes_path` for Chef Zero [GH-6025, GH-6049]
   - provisioners/chef: do not error when the `node_name` is unset
     [GH-6005, GH-6064, GH-6541]
+  - provisioners/chef: only force the formatter on Chef 11 or higher
+    [GH-6278, GH-6556]
   - provisioners/puppet: apply provisioner uses correct default manifests
     with environments. [GH-5987]
   - provisioners/puppet: remove broken backticks [GH-6404]

From 5659c3f2a0637fa8ad5c4fa20c4204efdafe570f Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Thu, 19 Nov 2015 23:42:01 +0100
Subject: [PATCH 197/354] provisioners/ansible: apply @sethvargo comments

Follow-up of code review of PR #6529
---
 plugins/provisioners/ansible/config/base.rb   | 34 ++++++++++---------
 .../provisioners/ansible/provisioner/base.rb  |  4 +--
 .../provisioners/ansible/provisioner/guest.rb |  4 +--
 .../provisioners/ansible/provisioner/host.rb  | 13 +++----
 templates/locales/en.yml                      | 14 +++++---
 .../v2/provisioning/ansible_common.html.md    | 14 ++++----
 6 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/plugins/provisioners/ansible/config/base.rb b/plugins/provisioners/ansible/config/base.rb
index 04c703439..f14b15597 100644
--- a/plugins/provisioners/ansible/config/base.rb
+++ b/plugins/provisioners/ansible/config/base.rb
@@ -3,6 +3,8 @@ module VagrantPlugins
     module Config
       class Base < Vagrant.plugin("2", :config)
 
+        GALAXY_COMMAND_DEFAULT = "ansible-galaxy install --role-file=%{role_file} --roles-path=%{roles_path} --force"
+
         attr_accessor :extra_vars
         attr_accessor :galaxy_role_file
         attr_accessor :galaxy_roles_path
@@ -40,22 +42,22 @@ module VagrantPlugins
         end
 
         def finalize!
-          @extra_vars          = nil   if @extra_vars           == UNSET_VALUE
-          @galaxy_role_file    = nil   if @galaxy_role_file     == UNSET_VALUE
-          @galaxy_roles_path   = nil   if @galaxy_roles_path    == UNSET_VALUE
-          @galaxy_command      = "ansible-galaxy install --role-file=%{ROLE_FILE} --roles-path=%{ROLES_PATH} --force" if @galaxy_command == UNSET_VALUE
-          @groups              = {}    if @groups               == UNSET_VALUE
-          @inventory_path      = nil   if @inventory_path       == UNSET_VALUE
-          @limit               = nil   if @limit                == UNSET_VALUE
-          @playbook            = nil   if @playbook             == UNSET_VALUE
-          @raw_arguments       = nil   if @raw_arguments        == UNSET_VALUE
-          @skip_tags           = nil   if @skip_tags            == UNSET_VALUE
-          @start_at_task       = nil   if @start_at_task        == UNSET_VALUE
-          @sudo                = false if @sudo                 != true
-          @sudo_user           = nil   if @sudo_user            == UNSET_VALUE
-          @tags                = nil   if @tags                 == UNSET_VALUE
-          @vault_password_file = nil   if @vault_password_file  == UNSET_VALUE
-          @verbose             = false if @verbose              == UNSET_VALUE
+          @extra_vars          = nil                    if @extra_vars          == UNSET_VALUE
+          @galaxy_role_file    = nil                    if @galaxy_role_file    == UNSET_VALUE
+          @galaxy_roles_path   = nil                    if @galaxy_roles_path   == UNSET_VALUE
+          @galaxy_command      = GALAXY_COMMAND_DEFAULT if @galaxy_command      == UNSET_VALUE
+          @groups              = {}                     if @groups              == UNSET_VALUE
+          @inventory_path      = nil                    if @inventory_path      == UNSET_VALUE
+          @limit               = nil                    if @limit               == UNSET_VALUE
+          @playbook            = nil                    if @playbook            == UNSET_VALUE
+          @raw_arguments       = nil                    if @raw_arguments       == UNSET_VALUE
+          @skip_tags           = nil                    if @skip_tags           == UNSET_VALUE
+          @start_at_task       = nil                    if @start_at_task       == UNSET_VALUE
+          @sudo                = false                  if @sudo                != true
+          @sudo_user           = nil                    if @sudo_user           == UNSET_VALUE
+          @tags                = nil                    if @tags                == UNSET_VALUE
+          @vault_password_file = nil                    if @vault_password_file == UNSET_VALUE
+          @verbose             = false                  if @verbose             == UNSET_VALUE
         end
 
         # Just like the normal configuration "validate" method except that
diff --git a/plugins/provisioners/ansible/provisioner/base.rb b/plugins/provisioners/ansible/provisioner/base.rb
index 0fc24ecfb..7a455b2bf 100644
--- a/plugins/provisioners/ansible/provisioner/base.rb
+++ b/plugins/provisioners/ansible/provisioner/base.rb
@@ -133,12 +133,12 @@ module VagrantPlugins
         end
 
         def get_galaxy_role_file(basedir)
-          Pathname.new(config.galaxy_role_file).expand_path(basedir)
+          File.expand_path(config.galaxy_role_file, basedir)
         end
 
         def get_galaxy_roles_path(basedir)
           if config.galaxy_roles_path
-            Pathname.new(config.galaxy_roles_path).expand_path(basedir)
+            File.expand_path(config.galaxy_roles_path, basedir)
           else
             File.join(Pathname.new(config.playbook).expand_path(basedir).parent, 'roles')
           end
diff --git a/plugins/provisioners/ansible/provisioner/guest.rb b/plugins/provisioners/ansible/provisioner/guest.rb
index 2397f66df..3d76e1fed 100644
--- a/plugins/provisioners/ansible/provisioner/guest.rb
+++ b/plugins/provisioners/ansible/provisioner/guest.rb
@@ -66,8 +66,8 @@ module VagrantPlugins
 
         def execute_ansible_galaxy_on_guest
           command_values = {
-            :ROLE_FILE => get_galaxy_role_file(config.provisioning_path),
-            :ROLES_PATH => get_galaxy_roles_path(config.provisioning_path)
+            :role_file => get_galaxy_role_file(config.provisioning_path),
+            :roles_path => get_galaxy_roles_path(config.provisioning_path)
           }
           remote_command = config.galaxy_command % command_values
 
diff --git a/plugins/provisioners/ansible/provisioner/host.rb b/plugins/provisioners/ansible/provisioner/host.rb
index 61e576c97..ccf72ca8e 100644
--- a/plugins/provisioners/ansible/provisioner/host.rb
+++ b/plugins/provisioners/ansible/provisioner/host.rb
@@ -25,6 +25,8 @@ module VagrantPlugins
 
         protected
 
+        VAGRANT_ARG_SEPARATOR = 'VAGRANT_ARG_SEP'
+
         def warn_for_unsupported_platform
           if Vagrant::Util::Platform.windows?
             @machine.env.ui.warn(I18n.t("vagrant.provisioners.ansible.windows_not_supported_for_control_machine"))
@@ -86,16 +88,15 @@ module VagrantPlugins
 
         def execute_ansible_galaxy_from_host
           command_values = {
-              :ROLE_FILE => get_galaxy_role_file(machine.env.root_path),
-              :ROLES_PATH => get_galaxy_roles_path(machine.env.root_path)
+              :role_file => get_galaxy_role_file(machine.env.root_path),
+              :roles_path => get_galaxy_roles_path(machine.env.root_path)
             }
-          arg_separator = '__VAGRANT_ARG_SEPARATOR__'
-          command_template = config.galaxy_command.gsub(' ', arg_separator)
+          command_template = config.galaxy_command.gsub(' ', VAGRANT_ARG_SEPARATOR)
           str_command = command_template % command_values
 
-          ui_running_ansible_command "galaxy", str_command.gsub(arg_separator, ' ')
+          ui_running_ansible_command "galaxy", str_command.gsub(VAGRANT_ARG_SEPARATOR, ' ')
 
-          command = str_command.split(arg_separator)
+          command = str_command.split(VAGRANT_ARG_SEPARATOR)
           command << {
             # Write stdout and stderr data, since it's the regular Ansible output
             notify: [:stdout, :stderr],
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 6bcb24689..aa452bff3 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -2043,6 +2043,12 @@ en:
           Vagrant does not support detecting whether Ansible is installed
           for the guest OS running in the machine. Vagrant will assume it is
           installed and attempt to continue.
+
+          If you'd like this provisioner to be improved, please
+          take a look at the Vagrant source code linked below and try
+          to contribute back support. Thank you!
+
+          https://github.com/mitchellh/vagrant
         errors:
           ansible_command_failed: |-
             Ansible failed to complete successfully. Any error output should be
@@ -2054,7 +2060,7 @@ en:
             If you haven't installed Ansible yet, please install Ansible
             on your Vagrant basebox, or enable the automated setup with the
             `install` option of this provisioner. Please check
-            http://docs.vagrantup.com/v2/provisioning/ansible_local.html
+            https://docs.vagrantup.com/v2/provisioning/ansible_local.html
             for more information.
           ansible_not_found_on_host: |-
             The Ansible software could not be found! Please verify
@@ -2063,12 +2069,12 @@ en:
             If you haven't installed Ansible yet, please install Ansible
             on your host system. Vagrant can't do this for you in a safe and
             automated way.
-            Please check http://docs.ansible.com for more information.
+            Please check https://docs.ansible.com for more information.
           ansible_version_not_found_on_guest: |-
             The requested Ansible version (%{required_version}) was not found on the guest.
             Please check the ansible installation on your guest system,
             or adapt the `version` option of this provisioner in your Vagrantfile.
-            See http://docs.vagrantup.com/v2/provisioning/ansible_local.html
+            See https://docs.vagrantup.com/v2/provisioning/ansible_local.html
             for more information.
           extra_vars_invalid: |-
             `extra_vars` must be a hash or a path to an existing file. Received: %{value} (as %{type})
@@ -2087,7 +2093,7 @@ en:
         running_playbook: "Running ansible-playbook..."
         windows_not_supported_for_control_machine: |-
           Windows is not officially supported for the Ansible Control Machine.
-          Please check http://docs.ansible.com/intro_installation.html#control-machine-requirements
+          Please check https://docs.ansible.com/intro_installation.html#control-machine-requirements
 
       docker:
         not_running: "Docker is not running on the guest VM."
diff --git a/website/docs/source/v2/provisioning/ansible_common.html.md b/website/docs/source/v2/provisioning/ansible_common.html.md
index aca7c2c14..cb8daf55e 100644
--- a/website/docs/source/v2/provisioning/ansible_common.html.md
+++ b/website/docs/source/v2/provisioning/ansible_common.html.md
@@ -53,17 +53,15 @@ Some of these options are for advanced usage only and should not be used unless
 
 - `galaxy_command` (template string) - The command pattern used to install Galaxy roles when `galaxy_role_file` is set.
 
-  The following placeholders can be used in this command pattern:
-    - `%{ROLE_FILE}` is replaced by the absolute path to the `galaxy_role_file` option
-    - `%{ROLES_PATH}` is
-      * replaced by the absolute path to the `galaxy_roles_path` option when such option is defined
-      * replaced by the absolute path to a `roles` subdirectory sitting in the parent directory of the configured `playbook` file otherwise.
+  The following (optional) placeholders can be used in this command pattern:
+    - `%{role_file}` is replaced by the absolute path to the `galaxy_role_file` option
+    - `%{roles_path}` is
+      - replaced by the absolute path to the `galaxy_roles_path` option when such option is defined, or
+      - replaced by the absolute path to a `roles` subdirectory sitting in the `playbook` parent directory.
 
   By default, this option is set to
 
-  ```
-  ansible-galaxy install --role-file=%{ROLE_FILE} --roles-path=%{ROLES_PATH} --force
-  ```
+  `ansible-galaxy install --role-file=%{role_file} --roles-path=%{roles_path} --force`
 
 - `galaxy_role_file` (string) - The path to the Ansible Galaxy role file.
 

From 609ff9f7b299050eb0378642975760752979a98a Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 14:55:46 -0800
Subject: [PATCH 198/354] Allow provisioner cleanup task to exit on failure

---
 .../provisioners/chef/provisioner/chef_client.rb  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/plugins/provisioners/chef/provisioner/chef_client.rb b/plugins/provisioners/chef/provisioner/chef_client.rb
index d5168efa8..e876703d5 100644
--- a/plugins/provisioners/chef/provisioner/chef_client.rb
+++ b/plugins/provisioners/chef/provisioner/chef_client.rb
@@ -145,7 +145,20 @@ module VagrantPlugins
           command =  "knife #{deletable} delete #{node_name}"
           command << " --config '#{guest_client_rb_path}'"
           command << " --yes"
-          @machine.communicate.sudo(command, error_check: true)
+
+          output = []
+          result = @machine.communicate.sudo(command, error_check: false) do |_, data|
+            output << data
+          end
+
+          if result != 0
+            @machine.ui.error("There were errors removing the #{deletable} from the Chef Server:")
+            @machine.ui.error("")
+            @machine.ui.error(output.join("\n"))
+            @machine.ui.error("")
+            @machine.ui.error("Vagrant will continue destroying the virtual machine, but you may need")
+            @machine.ui.error("to manually delete the #{deletable} from the Chef Server!")
+          end
         end
       end
     end

From 2dbd24129fad65a899e590d696f49ca8fa8b96df Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 14:56:03 -0800
Subject: [PATCH 199/354] Remove deprecated method

---
 plugins/provisioners/chef/config/base_runner.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/plugins/provisioners/chef/config/base_runner.rb b/plugins/provisioners/chef/config/base_runner.rb
index cfee8e76e..e7bc6cb07 100644
--- a/plugins/provisioners/chef/config/base_runner.rb
+++ b/plugins/provisioners/chef/config/base_runner.rb
@@ -61,12 +61,6 @@ module VagrantPlugins
           @run_list = []
         end
 
-        def encrypted_data_bag_secret=(value)
-          puts "DEPRECATION: Chef encrypted_data_bag_secret has no effect anymore."
-          puts "Remove this from your Vagrantfile since it'll be removed in the next"
-          puts "Vagrant version."
-        end
-
         def finalize!
           super
 

From 43ef92762814b8574376991f480f3d8d16b024f6 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 14:56:18 -0800
Subject: [PATCH 200/354] Latest will have the formatter option

---
 plugins/provisioners/chef/command_builder.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/provisioners/chef/command_builder.rb b/plugins/provisioners/chef/command_builder.rb
index 8a97facc7..4138ae84f 100644
--- a/plugins/provisioners/chef/command_builder.rb
+++ b/plugins/provisioners/chef/command_builder.rb
@@ -50,7 +50,7 @@ module VagrantPlugins
         args << " --log_level #{config.log_level}" if config.log_level
         args << " --no-color" if !options[:colored]
 
-        if config.install && config.version >= "11.0"
+        if config.install && (config.version == :latest || config.version >= "11.0")
           args << " --force-formatter"
         end
 

From a90e6cfe4c64eab13b3d9350c935e603254113a4 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 14:57:01 -0800
Subject: [PATCH 201/354] Use the new Chef installation channel and options

This deprecates "prerelease", which will be removed in the next release.
---
 .../chef/cap/debian/chef_install.rb           |  4 +-
 .../chef/cap/omnios/chef_install.rb           | 10 ++---
 .../chef/cap/redhat/chef_install.rb           |  4 +-
 plugins/provisioners/chef/config/base.rb      | 41 ++++++++++++++-----
 plugins/provisioners/chef/installer.rb        | 11 ++---
 plugins/provisioners/chef/provisioner/base.rb |  7 ++--
 .../provisioners/chef/config/base_test.rb     | 21 ++++++++--
 .../v2/provisioning/chef_common.html.md       | 11 +++--
 8 files changed, 76 insertions(+), 33 deletions(-)

diff --git a/plugins/provisioners/chef/cap/debian/chef_install.rb b/plugins/provisioners/chef/cap/debian/chef_install.rb
index 3d9302d80..e1cf9470d 100644
--- a/plugins/provisioners/chef/cap/debian/chef_install.rb
+++ b/plugins/provisioners/chef/cap/debian/chef_install.rb
@@ -5,11 +5,11 @@ module VagrantPlugins
     module Cap
       module Debian
         module ChefInstall
-          def self.chef_install(machine, version, prerelease, download_path)
+          def self.chef_install(machine, project, version, channel, options = {})
             machine.communicate.sudo("apt-get update -y -qq")
             machine.communicate.sudo("apt-get install -y -qq curl")
 
-            command = Omnibus.build_command(version, prerelease, download_path)
+            command = Omnibus.sh_command(project, version, channel, options)
             machine.communicate.sudo(command)
           end
         end
diff --git a/plugins/provisioners/chef/cap/omnios/chef_install.rb b/plugins/provisioners/chef/cap/omnios/chef_install.rb
index b20332638..034b2ff5a 100644
--- a/plugins/provisioners/chef/cap/omnios/chef_install.rb
+++ b/plugins/provisioners/chef/cap/omnios/chef_install.rb
@@ -5,13 +5,13 @@ module VagrantPlugins
     module Cap
       module OmniOS
         module ChefInstall
-          def self.chef_install(machine, version, prerelease, download_path)
-            su_cmd = machine.config.solaris.suexec_cmd
+          def self.chef_install(machine, project, version, channel, options = {})
+            su = machine.config.solaris.suexec_cmd
 
-            machine.communicate.execute("#{su_cmd} pkg list --no-refresh web/curl > /dev/null 2>&1 || pkg install -q --accept web/curl")
+            machine.communicate.execute("#{su} pkg list --no-refresh web/curl > /dev/null 2>&1 || pkg install -q --accept web/curl")
 
-            command = VagrantPlugins::Chef::Omnibus.build_command(version, prerelease, download_path)
-            machine.communicate.execute(su_cmd + ' ' + command)
+            command = Omnibus.sh_command(project, version, channel, options)
+            machine.communicate.execute("#{su} #{command}")
           end
         end
       end
diff --git a/plugins/provisioners/chef/cap/redhat/chef_install.rb b/plugins/provisioners/chef/cap/redhat/chef_install.rb
index 7d376e7d0..f91356d13 100644
--- a/plugins/provisioners/chef/cap/redhat/chef_install.rb
+++ b/plugins/provisioners/chef/cap/redhat/chef_install.rb
@@ -5,14 +5,14 @@ module VagrantPlugins
     module Cap
       module Redhat
         module ChefInstall
-          def self.chef_install(machine, version, prerelease, download_path)
+          def self.chef_install(machine, project, version, channel, options = {})
             if dnf?(machine)
               machine.communicate.sudo("dnf install -y -q curl")
             else
               machine.communicate.sudo("yum install -y -q curl")
             end
 
-            command = Omnibus.build_command(version, prerelease, download_path)
+            command = Omnibus.sh_command(project, version, channel, options)
             machine.communicate.sudo(command)
           end
 
diff --git a/plugins/provisioners/chef/config/base.rb b/plugins/provisioners/chef/config/base.rb
index 370736fd6..2c46198e9 100644
--- a/plugins/provisioners/chef/config/base.rb
+++ b/plugins/provisioners/chef/config/base.rb
@@ -11,6 +11,12 @@ module VagrantPlugins
         # @return [String]
         attr_accessor :binary_env
 
+        # The name of the Chef project to install. This is "chef" for the Chef
+        # Client or "chefdk" for the Chef Development Kit. Other product names
+        # may be available as well.
+        # @return [String]
+        attr_accessor :product
+
         # Install Chef on the system if it does not exist. Default is true.
         # This is a trinary attribute (it can have three values):
         #
@@ -26,9 +32,11 @@ module VagrantPlugins
         # @return [String, Symbol]
         attr_accessor :log_level
 
-        # Install a prerelease version of Chef.
-        # @return [true, false]
-        attr_accessor :prerelease
+        # The channel from which to download Chef. Currently known values are
+        # "current" and "stable", but more may be added in the future. The
+        # default is "current".
+        # @return [String]
+        attr_accessor :channel
 
         # The version of Chef to install. If Chef is already installed on the
         # system, the installed version is compared with the requested version.
@@ -52,25 +60,38 @@ module VagrantPlugins
         # @return [String]
         attr_accessor :installer_download_path
 
+        # @deprecated
+        def prerelease=(value)
+          STDOUT.puts <<-EOH
+[DEPRECATED] The configuration `chef.prerelease' has been deprecated. Please use
+`chef.channel' instead. The default value for channel is "current", which
+includes prelease versions of Chef Client and the Chef Development Kit. You can
+probably just remove the `prerelease' setting from your Vagrantfile and things
+will continue working as expected.
+EOH
+        end
+
         def initialize
           super
 
           @binary_path = UNSET_VALUE
           @binary_env  = UNSET_VALUE
+          @product     = UNSET_VALUE
           @install     = UNSET_VALUE
           @log_level   = UNSET_VALUE
-          @prerelease  = UNSET_VALUE
+          @channel     = UNSET_VALUE
           @version     = UNSET_VALUE
           @installer_download_path = UNSET_VALUE
         end
 
         def finalize!
-          @binary_path = nil     if @binary_path == UNSET_VALUE
-          @binary_env  = nil     if @binary_env == UNSET_VALUE
-          @install     = true    if @install == UNSET_VALUE
-          @log_level   = :info   if @log_level == UNSET_VALUE
-          @prerelease  = false   if @prerelease == UNSET_VALUE
-          @version     = :latest if @version == UNSET_VALUE
+          @binary_path = nil       if @binary_path == UNSET_VALUE
+          @binary_env  = nil       if @binary_env == UNSET_VALUE
+          @product     = "chef"    if @product == UNSET_VALUE
+          @install     = true      if @install == UNSET_VALUE
+          @log_level   = :info     if @log_level == UNSET_VALUE
+          @channel     = "current" if @channel == UNSET_VALUE
+          @version     = :latest   if @version == UNSET_VALUE
           @installer_download_path = nil  if @installer_download_path == UNSET_VALUE
 
           # Make sure the install is a symbol if it's not a boolean
diff --git a/plugins/provisioners/chef/installer.rb b/plugins/provisioners/chef/installer.rb
index 16467111c..3dc5efadc 100644
--- a/plugins/provisioners/chef/installer.rb
+++ b/plugins/provisioners/chef/installer.rb
@@ -3,10 +3,11 @@ module VagrantPlugins
     class Installer
       def initialize(machine, options = {})
         @machine    = machine
-        @version    = options.fetch(:version, :latest)
-        @prerelease = options.fetch(:prerelease, :latest)
-        @force      = options.fetch(:force, false)
-        @download_path  = options.fetch(:download_path, nil)
+        @product    = options.fetch(:product)
+        @channel    = options.fetch(:channel)
+        @version    = options.fetch(:version)
+        @force      = options.fetch(:force)
+        @options    = options.dup
       end
 
       # This handles verifying the Chef installation, installing it if it was
@@ -28,7 +29,7 @@ module VagrantPlugins
 
         @machine.ui.detail(I18n.t("vagrant.chef_installing",
           version: @version.to_s))
-        @machine.guest.capability(:chef_install, @version, @prerelease, @download_path)
+        @machine.guest.capability(:chef_install, @product, @version, @channel, @options)
 
         if !@machine.guest.capability(:chef_installed, @version)
           raise Provisioner::Base::ChefError, :install_failed
diff --git a/plugins/provisioners/chef/provisioner/base.rb b/plugins/provisioners/chef/provisioner/base.rb
index 525e98a9e..4f3636ae2 100644
--- a/plugins/provisioners/chef/provisioner/base.rb
+++ b/plugins/provisioners/chef/provisioner/base.rb
@@ -42,9 +42,10 @@ module VagrantPlugins
 
           @logger.info("Checking for Chef installation...")
           installer = Installer.new(@machine,
-            force:      config.install == :force,
-            version:    config.version,
-            prerelease: config.prerelease,
+            product: config.product,
+            channel: config.channel,
+            version: config.version,
+            force: config.install == :force,
             download_path:  config.installer_download_path
           )
           installer.ensure_installed
diff --git a/test/unit/plugins/provisioners/chef/config/base_test.rb b/test/unit/plugins/provisioners/chef/config/base_test.rb
index 4b018f11b..4c1a31321 100644
--- a/test/unit/plugins/provisioners/chef/config/base_test.rb
+++ b/test/unit/plugins/provisioners/chef/config/base_test.rb
@@ -23,6 +23,13 @@ describe VagrantPlugins::Chef::Config::Base do
     end
   end
 
+  describe "#product" do
+    it "defaults to \"chef\"" do
+      subject.finalize!
+      expect(subject.product).to eq("chef")
+    end
+  end
+
   describe "#install" do
     it "defaults to true" do
       subject.finalize!
@@ -49,10 +56,18 @@ describe VagrantPlugins::Chef::Config::Base do
     end
   end
 
-  describe "#prerelease" do
-    it "defaults to true" do
+  describe "#channel" do
+    it "defaults to \"current\"" do
       subject.finalize!
-      expect(subject.prerelease).to be(false)
+      expect(subject.channel).to eq("current")
+    end
+  end
+
+  describe "#prerelease" do
+    it "should not exist in Vagrant 1.9" do
+      if Vagrant::VERSION >= "1.9"
+        raise "This option should be removed!"
+      end
     end
   end
 
diff --git a/website/docs/source/v2/provisioning/chef_common.html.md b/website/docs/source/v2/provisioning/chef_common.html.md
index b5347d522..48d3f12cf 100644
--- a/website/docs/source/v2/provisioning/chef_common.html.md
+++ b/website/docs/source/v2/provisioning/chef_common.html.md
@@ -30,13 +30,18 @@ their purpose.
 - `installer_download_path` (string) - The path where the Chef installer will be
   downloaded to. This option is only honored if the `install` attribute is
   `true` or `"force"`. The default value is to use the path provided by Chef's
-  Omnibus installer, which varies between releases.
+  Omnibus installer, which varies between releases. This value has no effect on
+  Windows because Chef's omnibus installer lacks the option on Windows.
 
 - `log_level` (string) - The Chef log level. See the Chef docs for acceptable
   values.
 
-- `prerelease` (boolean) - Install a prerelease version of Chef. The default
-  value is false.
+- `product` (string) - The name of the Chef product to install. The default
+  value is "chef", which corresponds to the Chef Client. You can also specify
+  "chefdk", which will install the Chef Development Kit.
+
+- `channel` (string) - The release channel from which to pull the Chef Client
+  or the Chef Development Kit. The default value is `"current"`.
 
 - `version` (string) - The version of Chef to install on the guest. If Chef is
   already installed on the system, the installed version is compared with the

From c30467a6f981c1ad28f54c848b0307676d4d5224 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 15:01:09 -0800
Subject: [PATCH 202/354] Allow Chef to install on Windows

---
 .../chef/cap/windows/chef_install.rb          | 16 +++++
 plugins/provisioners/chef/omnibus.rb          | 39 ++++++-----
 plugins/provisioners/chef/plugin.rb           | 40 +++++++-----
 .../plugins/provisioners/chef/omnibus_test.rb | 65 ++++++++-----------
 4 files changed, 89 insertions(+), 71 deletions(-)
 create mode 100644 plugins/provisioners/chef/cap/windows/chef_install.rb

diff --git a/plugins/provisioners/chef/cap/windows/chef_install.rb b/plugins/provisioners/chef/cap/windows/chef_install.rb
new file mode 100644
index 000000000..f1f2317a6
--- /dev/null
+++ b/plugins/provisioners/chef/cap/windows/chef_install.rb
@@ -0,0 +1,16 @@
+require_relative "../../omnibus"
+
+module VagrantPlugins
+  module Chef
+    module Cap
+      module Windows
+        module ChefInstall
+          def self.chef_install(machine, project, version, channel, options = {})
+            command = Omnibus.ps_command(project, version, channel, options)
+            machine.communicate.sudo(command)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/provisioners/chef/omnibus.rb b/plugins/provisioners/chef/omnibus.rb
index 5c2eef2fb..897e5282d 100644
--- a/plugins/provisioners/chef/omnibus.rb
+++ b/plugins/provisioners/chef/omnibus.rb
@@ -1,32 +1,39 @@
 module VagrantPlugins
   module Chef
+    # Read more about the Omnibus installer here:
+    #
+    #   https://docs.chef.io/install_omnibus.html
+    #
     module Omnibus
-      OMNITRUCK = "https://www.chef.io/chef/install.sh".freeze
+      OMNITRUCK = "https://omnitruck.chef.io".freeze
 
-      # Read more about the Omnibus installer here:
-      # https://docs.getchef.com/install_omnibus.html
-      def build_command(version, prerelease = false, download_path = nil)
-        command = "curl -sL #{OMNITRUCK} | sudo bash"
-
-        if prerelease || version != :latest || download_path != nil
-          command << " -s --"
-        end
-
-        if prerelease
-          command << " -p"
-        end
+      def sh_command(project, version, channel, options = {})
+        command =  "curl -sL #{OMNITRUCK}/install.sh | sudo bash"
+        command << " -s -- -P \"#{project}\" -c \"#{channel}\""
 
         if version != :latest
           command << " -v \"#{version}\""
         end
 
-        if download_path
-          command << " -d \"#{download_path}\""
+        if options[:download_path]
+          command << " -d \"#{options[:download_path]}\""
         end
 
         command
       end
-      module_function :build_command
+      module_function :sh_command
+
+      def ps_command(project, version, channel, options = {})
+        command =  ". { iwr -useb #{OMNITRUCK}/install.ps1 } | iex; install"
+        command << " -project '#{project}' -channel '#{channel}'"
+
+        if version != :latest
+          command << " -version '#{version}'"
+        end
+
+        command
+      end
+      module_function :ps_command
     end
   end
 end
diff --git a/plugins/provisioners/chef/plugin.rb b/plugins/provisioners/chef/plugin.rb
index 540429fad..f7af36138 100644
--- a/plugins/provisioners/chef/plugin.rb
+++ b/plugins/provisioners/chef/plugin.rb
@@ -53,29 +53,14 @@ module VagrantPlugins
         Provisioner::ChefZero
       end
 
-      guest_capability(:linux, :chef_installed) do
-        require_relative "cap/linux/chef_installed"
-        Cap::Linux::ChefInstalled
-      end
-
-      guest_capability(:windows, :chef_installed) do
-        require_relative "cap/windows/chef_installed"
-        Cap::Windows::ChefInstalled
-      end
-
       guest_capability(:debian, :chef_install) do
         require_relative "cap/debian/chef_install"
         Cap::Debian::ChefInstall
       end
 
-      guest_capability(:redhat, :chef_install) do
-        require_relative "cap/redhat/chef_install"
-        Cap::Redhat::ChefInstall
-      end
-
-      guest_capability(:omnios, :chef_installed) do
-        require_relative "cap/omnios/chef_installed"
-        Cap::OmniOS::ChefInstalled
+      guest_capability(:linux, :chef_installed) do
+        require_relative "cap/linux/chef_installed"
+        Cap::Linux::ChefInstalled
       end
 
       guest_capability(:omnios, :chef_install) do
@@ -83,6 +68,25 @@ module VagrantPlugins
         Cap::OmniOS::ChefInstall
       end
 
+      guest_capability(:omnios, :chef_installed) do
+        require_relative "cap/omnios/chef_installed"
+        Cap::OmniOS::ChefInstalled
+      end
+
+      guest_capability(:redhat, :chef_install) do
+        require_relative "cap/redhat/chef_install"
+        Cap::Redhat::ChefInstall
+      end
+
+      guest_capability(:windows, :chef_install) do
+        require_relative "cap/windows/chef_install"
+        Cap::Windows::ChefInstall
+      end
+
+      guest_capability(:windows, :chef_installed) do
+        require_relative "cap/windows/chef_installed"
+        Cap::Windows::ChefInstalled
+      end
     end
   end
 end
diff --git a/test/unit/plugins/provisioners/chef/omnibus_test.rb b/test/unit/plugins/provisioners/chef/omnibus_test.rb
index b053f94bc..5e8c4aaea 100644
--- a/test/unit/plugins/provisioners/chef/omnibus_test.rb
+++ b/test/unit/plugins/provisioners/chef/omnibus_test.rb
@@ -3,53 +3,44 @@ require_relative "../../../base"
 require Vagrant.source_root.join("plugins/provisioners/chef/omnibus")
 
 describe VagrantPlugins::Chef::Omnibus do
-  let(:prefix) { "curl -sL #{described_class.const_get(:OMNITRUCK)}" }
+  describe "#sh_command" do
+    it "includes the project name" do
+      command = described_class.sh_command("chef", nil, "stable")
+      expect(command).to include %|-P "chef"|
+    end
 
-  let(:version) { :latest }
-  let(:prerelease) { false }
-  let(:download_path) { nil }
+    it "includes the channel" do
+      command = described_class.sh_command("chef", nil, "stable")
+      expect(command).to include %|-c "stable"|
+    end
 
-  let(:build_command) { described_class.build_command(version, prerelease, download_path) }
+    it "includes the version" do
+      command = described_class.sh_command("chef", "1.2.3", "stable")
+      expect(command).to include %|-v "1.2.3"|
+    end
 
-  context "when prerelease is given" do
-    let(:prerelease) { true }
-
-    it "returns the correct command" do
-      expect(build_command).to eq("#{prefix} | sudo bash -s -- -p")
+    it "includes the download path" do
+      command = described_class.sh_command("chef", "1.2.3", "stable",
+        download_path: "/some/path",
+      )
+      expect(command).to include %|-d "/some/path"|
     end
   end
 
-  context "when download_path is given" do
-    let(:download_path) { '/tmp/path/to/omnibuses' }
-
-    it "returns the correct command" do
-      expect(build_command).to eq("#{prefix} | sudo bash -s -- -d \"/tmp/path/to/omnibuses\"")
+  describe "#ps_command" do
+    it "includes the project name" do
+      command = described_class.ps_command("chef", nil, "stable")
+      expect(command).to include %|-project 'chef'|
     end
-  end
 
-  context "when version is :latest" do
-    let(:version) { :latest }
-
-    it "returns the correct command" do
-      expect(build_command).to eq("#{prefix} | sudo bash")
+    it "includes the channel" do
+      command = described_class.ps_command("chef", nil, "stable")
+      expect(command).to include %|-channel 'stable'|
     end
-  end
 
-  context "when version is a string" do
-    let(:version) { "1.2.3" }
-
-    it "returns the correct command" do
-      expect(build_command).to eq("#{prefix} | sudo bash -s -- -v \"1.2.3\"")
-    end
-  end
-
-  context "when prerelease and version and download_path are given" do
-    let(:version) { "1.2.3" }
-    let(:prerelease) { true }
-    let(:download_path) { "/some/path" }
-
-    it "returns the correct command" do
-      expect(build_command).to eq("#{prefix} | sudo bash -s -- -p -v \"1.2.3\" -d \"/some/path\"")
+    it "includes the version" do
+      command = described_class.ps_command("chef", "1.2.3", "stable")
+      expect(command).to include %|-version '1.2.3'|
     end
   end
 end

From 74eb3109cfa1eac23b4c0c216098716a394db9bb Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Fri, 20 Nov 2015 00:07:34 +0100
Subject: [PATCH 203/354] provisioners/ansible_local: fix a lame bug

I missed to rename the refactored exceptions as AnsibleCommandFailed in
the guest-based parts. The lack of unit tests for these parts hurts...
on my agenda, I swear!
See c1f3d114f52654e9f285499dd548409edc0c99fe
---
 plugins/provisioners/ansible/provisioner/guest.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/provisioners/ansible/provisioner/guest.rb b/plugins/provisioners/ansible/provisioner/guest.rb
index 3d76e1fed..f8777d93c 100644
--- a/plugins/provisioners/ansible/provisioner/guest.rb
+++ b/plugins/provisioners/ansible/provisioner/guest.rb
@@ -74,7 +74,7 @@ module VagrantPlugins
           ui_running_ansible_command "galaxy", remote_command
 
           result = execute_on_guest(remote_command)
-          raise Ansible::Errors::AnsibleGalaxyAppFailed if result != 0
+          raise Ansible::Errors::AnsibleCommandFailed if result != 0
         end
 
         def execute_ansible_playbook_on_guest
@@ -87,7 +87,7 @@ module VagrantPlugins
           ui_running_ansible_command "playbook", remote_command
 
           result = execute_on_guest(remote_command)
-          raise Ansible::Errors::AnsiblePlaybookAppFailed if result != 0
+          raise Ansible::Errors::AnsibleCommandFailed if result != 0
         end
 
         def execute_on_guest(command)

From c9fe02cea5dabd9136919f3fb350ca9978cab361 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Fri, 20 Nov 2015 00:11:44 +0100
Subject: [PATCH 204/354] provisioners/ansible_local: remove repetitions

---
 plugins/provisioners/ansible/provisioner/guest.rb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/provisioners/ansible/provisioner/guest.rb b/plugins/provisioners/ansible/provisioner/guest.rb
index f8777d93c..a82bf7562 100644
--- a/plugins/provisioners/ansible/provisioner/guest.rb
+++ b/plugins/provisioners/ansible/provisioner/guest.rb
@@ -71,10 +71,7 @@ module VagrantPlugins
           }
           remote_command = config.galaxy_command % command_values
 
-          ui_running_ansible_command "galaxy", remote_command
-
-          result = execute_on_guest(remote_command)
-          raise Ansible::Errors::AnsibleCommandFailed if result != 0
+          execute_ansible_command_on_guest "galaxy", remote_command
         end
 
         def execute_ansible_playbook_on_guest
@@ -84,9 +81,13 @@ module VagrantPlugins
           command = (%w(ansible-playbook) << @command_arguments << config.playbook).flatten
           remote_command = "cd #{config.provisioning_path} && #{Helpers::stringify_ansible_playbook_command(@environment_variables, command)}"
 
-          ui_running_ansible_command "playbook", remote_command
+          execute_ansible_command_on_guest "playbook", remote_command
+        end
 
-          result = execute_on_guest(remote_command)
+        def execute_ansible_command_on_guest(name, command)
+          ui_running_ansible_command name, command
+
+          result = execute_on_guest(command)
           raise Ansible::Errors::AnsibleCommandFailed if result != 0
         end
 

From 29a8ddd9eeb714d42abdb33bbe55a338aaaa8a5e Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 15:12:09 -0800
Subject: [PATCH 205/354] Update CHANGELOG

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2cf82916..559e21e81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,9 @@ IMPROVEMENTS:
   - provisioners/chef: perform cleanup tasks on the guest instead of the host
   - provisioners/chef: automatically generate a node_name if one was not given
     [GH-6555]
+  - provisioners/chef: install Chef automatically on Windows [GH-6557]
+  - provisioners/chef: allow the user to specify the Chef product (such as
+    the Chef Development Kit) [GH-6557]
   - provisioners/shell: Support interactive mode for elevated PowerShell
       scripts [GH-6185]
   - provisioners/ansible: add new `force_remote_user` option to control whether

From 6dbc74d814c15606ebf4c3e1b9d8a1092c8106a5 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Fri, 20 Nov 2015 00:13:01 +0100
Subject: [PATCH 206/354] provisioners/ansible: fix code indentation

---
 plugins/provisioners/ansible/provisioner/host.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/provisioners/ansible/provisioner/host.rb b/plugins/provisioners/ansible/provisioner/host.rb
index ccf72ca8e..23d59f7d2 100644
--- a/plugins/provisioners/ansible/provisioner/host.rb
+++ b/plugins/provisioners/ansible/provisioner/host.rb
@@ -88,9 +88,9 @@ module VagrantPlugins
 
         def execute_ansible_galaxy_from_host
           command_values = {
-              :role_file => get_galaxy_role_file(machine.env.root_path),
-              :roles_path => get_galaxy_roles_path(machine.env.root_path)
-            }
+            :role_file => get_galaxy_role_file(machine.env.root_path),
+            :roles_path => get_galaxy_roles_path(machine.env.root_path)
+          }
           command_template = config.galaxy_command.gsub(' ', VAGRANT_ARG_SEPARATOR)
           str_command = command_template % command_values
 

From 238403244610bec3c54b7515b68d1426992926dc Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Fri, 20 Nov 2015 00:21:41 +0100
Subject: [PATCH 207/354] provisioners/ansible: freeze a constant value

Kudos @sethvargo :)

[skip ci]
---
 plugins/provisioners/ansible/config/base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/provisioners/ansible/config/base.rb b/plugins/provisioners/ansible/config/base.rb
index f14b15597..2cefe4a89 100644
--- a/plugins/provisioners/ansible/config/base.rb
+++ b/plugins/provisioners/ansible/config/base.rb
@@ -3,7 +3,7 @@ module VagrantPlugins
     module Config
       class Base < Vagrant.plugin("2", :config)
 
-        GALAXY_COMMAND_DEFAULT = "ansible-galaxy install --role-file=%{role_file} --roles-path=%{roles_path} --force"
+        GALAXY_COMMAND_DEFAULT = "ansible-galaxy install --role-file=%{role_file} --roles-path=%{roles_path} --force".freeze
 
         attr_accessor :extra_vars
         attr_accessor :galaxy_role_file

From df207d2637eba8fd5dc63a0f120425494e46b95a Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 15:52:16 -0800
Subject: [PATCH 208/354] Require nodes_path for Chef Zero provisioning

Fixes GH-6110
---
 plugins/provisioners/chef/config/chef_zero.rb |  4 ++
 templates/locales/en.yml                      |  5 ++-
 .../chef/config/chef_zero_test.rb             | 44 ++++++++++++++-----
 .../source/v2/provisioning/chef_zero.html.md  |  6 ++-
 4 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/plugins/provisioners/chef/config/chef_zero.rb b/plugins/provisioners/chef/config/chef_zero.rb
index 9b1daf1a5..671c2690c 100644
--- a/plugins/provisioners/chef/config/chef_zero.rb
+++ b/plugins/provisioners/chef/config/chef_zero.rb
@@ -73,6 +73,10 @@ module VagrantPlugins
             errors << I18n.t("vagrant.config.chef.cookbooks_path_empty")
           end
 
+          if [nodes_path].flatten.compact.empty?
+            errors << I18n.t("vagrant.config.chef.nodes_path_empty")
+          end
+
           if environment && environments_path.empty?
             errors << I18n.t("vagrant.config.chef.environment_path_required")
           end
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 05f9f4b0d..10fee4f09 100755
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1402,7 +1402,10 @@ en:
       common:
         bad_field: "The following settings shouldn't exist: %{fields}"
       chef:
-        cookbooks_path_empty: "Must specify a cookbooks path for chef solo."
+        cookbooks_path_empty: |-
+          Missing required value for `chef.cookbooks_path'.
+        nodes_path_empty: |-
+          Missing required value for `chef.nodes_path'.
         environment_path_missing: |-
           Environment path not found: %{path}
         environment_path_required: |-
diff --git a/test/unit/plugins/provisioners/chef/config/chef_zero_test.rb b/test/unit/plugins/provisioners/chef/config/chef_zero_test.rb
index 9a1f98cd6..1767da562 100644
--- a/test/unit/plugins/provisioners/chef/config/chef_zero_test.rb
+++ b/test/unit/plugins/provisioners/chef/config/chef_zero_test.rb
@@ -82,7 +82,7 @@ describe VagrantPlugins::Chef::Config::ChefZero do
       it "returns an error" do
         subject.cookbooks_path = nil
         subject.finalize!
-        expect(errors).to eq [I18n.t("vagrant.config.chef.cookbooks_path_empty")]
+        expect(errors).to include(I18n.t("vagrant.config.chef.cookbooks_path_empty"))
       end
     end
 
@@ -90,7 +90,7 @@ describe VagrantPlugins::Chef::Config::ChefZero do
       it "returns an error" do
         subject.cookbooks_path = []
         subject.finalize!
-        expect(errors).to eq [I18n.t("vagrant.config.chef.cookbooks_path_empty")]
+        expect(errors).to include(I18n.t("vagrant.config.chef.cookbooks_path_empty"))
       end
     end
 
@@ -98,7 +98,31 @@ describe VagrantPlugins::Chef::Config::ChefZero do
       it "returns an error" do
         subject.cookbooks_path = [nil, nil]
         subject.finalize!
-        expect(errors).to eq [I18n.t("vagrant.config.chef.cookbooks_path_empty")]
+        expect(errors).to include(I18n.t("vagrant.config.chef.cookbooks_path_empty"))
+      end
+    end
+
+    context "when the nodes_path is nil" do
+      it "returns an error" do
+        subject.nodes_path = nil
+        subject.finalize!
+        expect(errors).to include(I18n.t("vagrant.config.chef.nodes_path_empty"))
+      end
+    end
+
+    context "when the nodes_path is an empty array" do
+      it "returns an error" do
+        subject.nodes_path = []
+        subject.finalize!
+        expect(errors).to include(I18n.t("vagrant.config.chef.nodes_path_empty"))
+      end
+    end
+
+    context "when the nodes_path is an array with nil" do
+      it "returns an error" do
+        subject.nodes_path = [nil, nil]
+        subject.finalize!
+        expect(errors).to include(I18n.t("vagrant.config.chef.nodes_path_empty"))
       end
     end
 
@@ -111,7 +135,7 @@ describe VagrantPlugins::Chef::Config::ChefZero do
         it "returns an error" do
           subject.environments_path = nil
           subject.finalize!
-          expect(errors).to eq [I18n.t("vagrant.config.chef.environment_path_required")]
+          expect(errors).to include(I18n.t("vagrant.config.chef.environment_path_required"))
         end
       end
 
@@ -119,7 +143,7 @@ describe VagrantPlugins::Chef::Config::ChefZero do
         it "returns an error" do
           subject.environments_path = []
           subject.finalize!
-          expect(errors).to eq [I18n.t("vagrant.config.chef.environment_path_required")]
+          expect(errors).to include(I18n.t("vagrant.config.chef.environment_path_required"))
         end
       end
 
@@ -127,7 +151,7 @@ describe VagrantPlugins::Chef::Config::ChefZero do
         it "returns an error" do
           subject.environments_path = [nil, nil]
           subject.finalize!
-          expect(errors).to eq [I18n.t("vagrant.config.chef.environment_path_required")]
+          expect(errors).to include(I18n.t("vagrant.config.chef.environment_path_required"))
         end
       end
 
@@ -136,11 +160,9 @@ describe VagrantPlugins::Chef::Config::ChefZero do
           env_path = "/path/to/environments/that/will/never/exist"
           subject.environments_path = env_path
           subject.finalize!
-          expect(errors).to eq [
-            I18n.t("vagrant.config.chef.environment_path_missing",
-              path: env_path
-            )
-          ]
+          expect(errors).to include(I18n.t("vagrant.config.chef.environment_path_missing",
+            path: env_path,
+          ))
         end
       end
     end
diff --git a/website/docs/source/v2/provisioning/chef_zero.html.md b/website/docs/source/v2/provisioning/chef_zero.html.md
index bd2527fc9..48b691cf8 100644
--- a/website/docs/source/v2/provisioning/chef_zero.html.md
+++ b/website/docs/source/v2/provisioning/chef_zero.html.md
@@ -41,8 +41,9 @@ available below this section.
 * `environments_path` (string) - A path where environment definitions are
   located. By default, no environments folder is set.
 
-* `nodes_path` (string or array) - A list of paths where node objects (in JSON format) are stored. By default, no
-  nodes path is set.
+* `nodes_path` (string or array) - A list of paths where node objects
+  (in JSON format) are stored. By default, no nodes path is set. This value is
+  required.
 
 * `environment` (string) - The environment you want the Chef run to be
   a part of. This requires Chef 11.6.0 or later, and that `environments_path`
@@ -75,6 +76,7 @@ Vagrant.configure("2") do |config|
     # Specify the local paths where Chef data is stored
     chef.cookbooks_path = "cookbooks"
     chef.data_bags_path = "data_bags"
+    chef.nodes_path = "nodes"
     chef.roles_path = "roles"
 
     # Add a recipe

From 76f3dce5dba92afc2cf296464d8b8de90eddffcb Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 15:52:21 -0800
Subject: [PATCH 209/354] Remove deprecated options

---
 plugins/provisioners/chef/config/chef_solo.rb | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/plugins/provisioners/chef/config/chef_solo.rb b/plugins/provisioners/chef/config/chef_solo.rb
index a9630a7b8..f74146f52 100644
--- a/plugins/provisioners/chef/config/chef_solo.rb
+++ b/plugins/provisioners/chef/config/chef_solo.rb
@@ -49,31 +49,6 @@ module VagrantPlugins
           @synced_folder_type  = UNSET_VALUE
         end
 
-        # @deprecated This is deprecated in Chef and will be removed in Chef 12.
-        def recipe_url=(value)
-          puts "DEPRECATION: The 'recipe_url' setting for the Chef Solo"
-          puts "provisioner is deprecated. This value will be removed in"
-          puts "Chef 12. It is recommended you use the Chef Apply provisioner"
-          puts "instead. The 'recipe_url' setting will be removed in the next"
-          puts "version of Vagrant."
-
-          if value
-            @recipe_url = value
-          end
-        end
-
-        def nfs=(value)
-          puts "DEPRECATION: The 'nfs' setting for the Chef Solo provisioner is"
-          puts "deprecated. Please use the 'synced_folder_type' setting instead."
-          puts "The 'nfs' setting will be removed in the next version of Vagrant."
-
-          if value
-            @synced_folder_type = "nfs"
-          else
-            @synced_folder_type = nil
-          end
-        end
-
         #------------------------------------------------------------
         # Internal methods
         #------------------------------------------------------------

From f040f2bbebfbc2a036b30460880bca8f1f850c55 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 15:56:18 -0800
Subject: [PATCH 210/354] Update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 559e21e81..2c93c96e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,6 +87,8 @@ BUG FIXES:
     [GH-6005, GH-6064, GH-6541]
   - provisioners/chef: only force the formatter on Chef 11 or higher
     [GH-6278, GH-6556]
+  - provisioners/chef: require `nodes_path` to be set for Chef Zero
+    [GH-6110, GH-6559]
   - provisioners/puppet: apply provisioner uses correct default manifests
     with environments. [GH-5987]
   - provisioners/puppet: remove broken backticks [GH-6404]

From c5417679499a33e5765a93b9fd6e45fbd8bdc6cd Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Nov 2015 15:59:39 -0800
Subject: [PATCH 211/354] core: add tests for box collection cleanup [GH-6002]

---
 lib/vagrant/action/builtin/box_remove.rb      |  2 +-
 lib/vagrant/box_collection.rb                 | 23 +++-----
 .../vagrant/action/builtin/box_remove_test.rb | 26 ++------
 test/unit/vagrant/box_collection_test.rb      | 59 +++++++++++++++++++
 4 files changed, 74 insertions(+), 36 deletions(-)

diff --git a/lib/vagrant/action/builtin/box_remove.rb b/lib/vagrant/action/builtin/box_remove.rb
index 47dedd1fa..cf80542cb 100644
--- a/lib/vagrant/action/builtin/box_remove.rb
+++ b/lib/vagrant/action/builtin/box_remove.rb
@@ -111,7 +111,7 @@ module Vagrant
                                 provider: box.provider,
                                 version: box.version))
             box.destroy!
-            env[:box_collection].clean_up(box)
+            env[:box_collection].clean(box.name)
 
             # Passes on the removed box to the rest of the middleware chain
             env[:box_removed] = box
diff --git a/lib/vagrant/box_collection.rb b/lib/vagrant/box_collection.rb
index 17c2f3927..6e83ad4ee 100644
--- a/lib/vagrant/box_collection.rb
+++ b/lib/vagrant/box_collection.rb
@@ -12,9 +12,9 @@ module Vagrant
   # for accessing/finding individual boxes, adding new boxes, or deleting
   # boxes.
   class BoxCollection
-    TEMP_PREFIX = "vagrant-box-add-temp-"
-    VAGRANT_SLASH = "-VAGRANTSLASH-"
-    VAGRANT_COLON = "-VAGRANTCOLON-"
+    TEMP_PREFIX = "vagrant-box-add-temp-".freeze
+    VAGRANT_SLASH = "-VAGRANTSLASH-".freeze
+    VAGRANT_COLON = "-VAGRANTCOLON-".freeze
 
     # The directory where the boxes in this collection are stored.
     #
@@ -348,17 +348,12 @@ module Vagrant
       end
     end
 
-    # Removes the whole directory of a given box if there are no
-    # other versions nor providers of the box exist.
-    def clean_up(box)
-      return false if exists?(box.name)
-
-      box_directory = box.name
-        .gsub('/', VAGRANT_SLASH)
-        .gsub(':', VAGRANT_COLON)
-
-      path = File.join(directory, box_directory)
-      FileUtils.rm_r(path)
+    # Cleans the directory for a box by removing the folders that are
+    # empty.
+    def clean(name)
+      return false if exists?(name)
+      path = File.join(directory, dir_name(name))
+      FileUtils.rm_rf(path)
     end
 
     protected
diff --git a/test/unit/vagrant/action/builtin/box_remove_test.rb b/test/unit/vagrant/action/builtin/box_remove_test.rb
index 016fec243..f1a740218 100644
--- a/test/unit/vagrant/action/builtin/box_remove_test.rb
+++ b/test/unit/vagrant/action/builtin/box_remove_test.rb
@@ -30,7 +30,7 @@ describe Vagrant::Action::Builtin::BoxRemove do
 
     expect(box_collection).to receive(:find).with(
       "foo", :virtualbox, "1.0").and_return(box)
-    expect(box_collection).to receive(:clean_up).with(box)
+    expect(box_collection).to receive(:clean).with(box.name)
       .and_return(true)
     expect(box).to receive(:destroy!).once
     expect(app).to receive(:call).with(env).once
@@ -52,7 +52,7 @@ describe Vagrant::Action::Builtin::BoxRemove do
 
     expect(box_collection).to receive(:find).with(
       "foo", :virtualbox, "1.0").and_return(box)
-    expect(box_collection).to receive(:clean_up).with(box)
+    expect(box_collection).to receive(:clean).with(box.name)
       .and_return(false)
     expect(box).to receive(:destroy!).once
     expect(app).to receive(:call).with(env).once
@@ -74,7 +74,7 @@ describe Vagrant::Action::Builtin::BoxRemove do
 
     expect(box_collection).to receive(:find).with(
       "foo", :virtualbox, "1.0").and_return(box)
-    expect(box_collection).to receive(:clean_up).with(box)
+    expect(box_collection).to receive(:clean).with(box.name)
       .and_return(false)
     expect(box).to receive(:destroy!).once
     expect(app).to receive(:call).with(env).once
@@ -84,22 +84,6 @@ describe Vagrant::Action::Builtin::BoxRemove do
     expect(env[:box_removed]).to equal(box)
   end
 
-  it "deletes the whole directory of the box if it's the last box on the system" do
-    box_collection.stub(
-      all: [
-        ["foo", "1.0", :virtualbox],
-      ])
-
-    env[:box_name] = "foo"
-
-    expect(box_collection).to receive(:find).with(
-      "foo", :virtualbox, "1.0").and_return(box)
-    expect(box_collection).to receive(:clean_up).with(box)
-      .and_return(true)
-
-    subject.call(env)
-  end
-
   context "checking if a box is in use" do
     def new_entry(name, provider, version, valid=true)
       Vagrant::MachineIndex::Entry.new.tap do |entry|
@@ -132,7 +116,7 @@ describe Vagrant::Action::Builtin::BoxRemove do
       expect(box_collection).to receive(:find).with(
         "foo", :virtualbox, "1.0").and_return(box)
       expect(box).to receive(:destroy!).once
-      expect(box_collection).to receive(:clean_up).with(box)
+      expect(box_collection).to receive(:clean).with(box.name)
         .and_return(true)
 
       subject.call(env)
@@ -147,7 +131,7 @@ describe Vagrant::Action::Builtin::BoxRemove do
 
       expect(box_collection).to receive(:find).with(
         "foo", :virtualbox, "1.0").and_return(box)
-      expect(box_collection).to receive(:clean_up).with(box)
+      expect(box_collection).to receive(:clean).with(box.name)
         .and_return(true)
       expect(box).to receive(:destroy!).once
 
diff --git a/test/unit/vagrant/box_collection_test.rb b/test/unit/vagrant/box_collection_test.rb
index a09d23559..4a22b5b72 100644
--- a/test/unit/vagrant/box_collection_test.rb
+++ b/test/unit/vagrant/box_collection_test.rb
@@ -44,6 +44,65 @@ describe Vagrant::BoxCollection do
     end
   end
 
+  describe "#clean" do
+    it "removes the directory if no other versions of the box exists" do
+      # Create a few boxes, immediately destroy them
+      environment.box3("foo", "1.0", :virtualbox)
+      environment.box3("foo", "1.0", :vmware)
+
+      # Delete them all
+      subject.all.each do |parts|
+        subject.find(parts[0], parts[2], ">= 0").destroy!
+      end
+
+      # Cleanup
+      subject.clean("foo")
+
+      # Make sure the whole directory is empty
+      expect(environment.boxes_dir.children).to be_empty
+    end
+
+    it "doesn't remove the directory if a provider exists" do
+      # Create a few boxes, immediately destroy them
+      environment.box3("foo", "1.0", :virtualbox)
+      environment.box3("foo", "1.0", :vmware)
+
+      # Delete them all
+      subject.find("foo", :virtualbox, ">= 0").destroy!
+
+      # Cleanup
+      subject.clean("foo")
+
+      # Make sure the whole directory is not empty
+      expect(environment.boxes_dir.children).to_not be_empty
+
+      # Make sure the results still exist
+      results = subject.all
+      expect(results.length).to eq(1)
+      expect(results.include?(["foo", "1.0", :vmware])).to be
+    end
+
+    it "doesn't remove the directory if a version exists" do
+      # Create a few boxes, immediately destroy them
+      environment.box3("foo", "1.0", :virtualbox)
+      environment.box3("foo", "1.2", :virtualbox)
+
+      # Delete them all
+      subject.find("foo", :virtualbox, ">= 1.1").destroy!
+
+      # Cleanup
+      subject.clean("foo")
+
+      # Make sure the whole directory is not empty
+      expect(environment.boxes_dir.children).to_not be_empty
+
+      # Make sure the results still exist
+      results = subject.all
+      expect(results.length).to eq(1)
+      expect(results.include?(["foo", "1.0", :virtualbox])).to be
+    end
+  end
+
   describe "#find" do
     it "returns nil if the box does not exist" do
       expect(subject.find("foo", :i_dont_exist, ">= 0")).to be_nil

From 66c99ddb7057dcc023335e853fa33c72ad768efe Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Nov 2015 16:01:09 -0800
Subject: [PATCH 212/354] update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c93c96e2..36d37c103 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,8 @@ BUG FIXES:
   - core: don't check for metadata if the download URL is not HTTP [GH-6540]
   - core: don't make custom dotfile path if there is no Vagrantfile [GH-6542]
   - core: more robust check for admin privs on Windows [GH-5616]
+  - commands/box: removing all versions and providers of a box will properly
+      clean all directories in `~/.vagrant.d/boxes` [GH-3570]
   - commands/rdp: prefer `xfreerdp` if it is available on Linux [GH-6475]
   - commands/up: the `--provision-with` flag works with provisioner names [GH-5981]
   - communicator/ssh: fix potential crash case with PTY [GH-6225]

From 1fd9aec493ee0a2f2f9b859734c8a99b7f024b2b Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 16:07:58 -0800
Subject: [PATCH 213/354] Only append folder suffixes if we are sharing host
 folder paths

Fixes GH-6472
---
 plugins/provisioners/chef/provisioner/chef_solo.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/provisioners/chef/provisioner/chef_solo.rb b/plugins/provisioners/chef/provisioner/chef_solo.rb
index 1fc29da6e..fd8582138 100644
--- a/plugins/provisioners/chef/provisioner/chef_solo.rb
+++ b/plugins/provisioners/chef/provisioner/chef_solo.rb
@@ -104,7 +104,9 @@ module VagrantPlugins
             end
 
             # If we have specified a folder name to append then append it
-            remote_path += "/#{appended_folder}" if appended_folder
+            if type == :host
+              remote_path += "/#{appended_folder}" if appended_folder
+            end
 
             # Append the result
             results << [type, local_path, remote_path]

From e0ef592544eb41e8a4957b86d1ac5508404e403c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Nov 2015 16:14:13 -0800
Subject: [PATCH 214/354] core: retry if server doesn't support byte ranges on
 download [GH-4479]

---
 CHANGELOG.md                   | 2 ++
 lib/vagrant/util/downloader.rb | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36d37c103..9c9cb7187 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,8 @@ BUG FIXES:
   - core: don't check for metadata if the download URL is not HTTP [GH-6540]
   - core: don't make custom dotfile path if there is no Vagrantfile [GH-6542]
   - core: more robust check for admin privs on Windows [GH-5616]
+  - core: properly detect when HTTP server doesn't support byte ranges and
+      retry from scratch [GH-4479]
   - commands/box: removing all versions and providers of a box will properly
       clean all directories in `~/.vagrant.d/boxes` [GH-3570]
   - commands/rdp: prefer `xfreerdp` if it is available on Linux [GH-6475]
diff --git a/lib/vagrant/util/downloader.rb b/lib/vagrant/util/downloader.rb
index edaf99e85..03e623897 100644
--- a/lib/vagrant/util/downloader.rb
+++ b/lib/vagrant/util/downloader.rb
@@ -138,11 +138,14 @@ module Vagrant
           # If we already retried, raise it.
           raise if retried
 
+          @logger.error("Exit code: #{e.extra_data[:code]}")
+
           # If its any error other than 33, it is an error.
-          raise if e.extra_data[:exit_code].to_i != 33
+          raise if e.extra_data[:code].to_i != 33
 
           # Exit code 33 means that the server doesn't support ranges.
           # In this case, try again without resume.
+          @logger.error("Error is server doesn't support byte ranges. Retrying from scratch.")
           @continue = false
           retried = true
           retry

From ec85548bd6eabf0c9cddef615abc77ae7b913e02 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 16:16:30 -0800
Subject: [PATCH 215/354] Support arrays for data_bags_path

Fixes GH-5988
---
 plugins/provisioners/chef/provisioner/chef_solo.rb    | 2 +-
 templates/provisioners/chef_solo/solo.erb             | 4 ++--
 templates/provisioners/chef_zero/zero.erb             | 3 ++-
 website/docs/source/v2/provisioning/chef_solo.html.md | 5 +++--
 website/docs/source/v2/provisioning/chef_zero.html.md | 5 +++--
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/plugins/provisioners/chef/provisioner/chef_solo.rb b/plugins/provisioners/chef/provisioner/chef_solo.rb
index fd8582138..a436a8485 100644
--- a/plugins/provisioners/chef/provisioner/chef_solo.rb
+++ b/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
diff --git a/templates/provisioners/chef_solo/solo.erb b/templates/provisioners/chef_solo/solo.erb
index a3b01ed3b..7bfc32717 100644
--- a/templates/provisioners/chef_solo/solo.erb
+++ b/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 -%>
diff --git a/templates/provisioners/chef_zero/zero.erb b/templates/provisioners/chef_zero/zero.erb
index 8c4b76407..fa533152b 100644
--- a/templates/provisioners/chef_zero/zero.erb
+++ b/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 %>
diff --git a/website/docs/source/v2/provisioning/chef_solo.html.md b/website/docs/source/v2/provisioning/chef_solo.html.md
index a43232bed..77d3825ab 100644
--- a/website/docs/source/v2/provisioning/chef_solo.html.md
+++ b/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.
diff --git a/website/docs/source/v2/provisioning/chef_zero.html.md b/website/docs/source/v2/provisioning/chef_zero.html.md
index 48b691cf8..e409dc26a 100644
--- a/website/docs/source/v2/provisioning/chef_zero.html.md
+++ b/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.

From a59dede6760ae3902dfcbc71f38e79276ed31859 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Nov 2015 16:18:57 -0800
Subject: [PATCH 216/354] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c9cb7187..5f2357446 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@ BUG FIXES:
   - core: more robust check for admin privs on Windows [GH-5616]
   - core: properly detect when HTTP server doesn't support byte ranges and
       retry from scratch [GH-4479]
+  - commands/box: the update command supports CA settings [GH-4473]
   - commands/box: removing all versions and providers of a box will properly
       clean all directories in `~/.vagrant.d/boxes` [GH-3570]
   - commands/rdp: prefer `xfreerdp` if it is available on Linux [GH-6475]

From 6a147e1146e493f61286821f32552edbb2a83019 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 16:22:03 -0800
Subject: [PATCH 217/354] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f2357446..6a04e4e41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@ IMPROVEMENTS:
   - provisioners/chef: install Chef automatically on Windows [GH-6557]
   - provisioners/chef: allow the user to specify the Chef product (such as
     the Chef Development Kit) [GH-6557]
+  - provisioners/chef: allow data_bags_path to be an array [GH-5988, GH-6561]
   - provisioners/shell: Support interactive mode for elevated PowerShell
       scripts [GH-6185]
   - provisioners/ansible: add new `force_remote_user` option to control whether

From 2b9173e15afc678315080410688f3daaa230a73b Mon Sep 17 00:00:00 2001
From: Eli Skeggs <eskeggs@globesherpa.com>
Date: Mon, 30 Jun 2014 16:41:31 -0700
Subject: [PATCH 218/354] Support environment variable forwarding, fixes #4131

Signed-off-by: Eli Skeggs <eskeggs@globesherpa.com>
---
 lib/vagrant/machine.rb                          |  1 +
 lib/vagrant/util/ssh.rb                         | 12 ++++++++++++
 plugins/commands/ssh_config/command.rb          |  3 ++-
 plugins/communicators/ssh/communicator.rb       | 17 +++++++++++++++++
 plugins/kernel_v1/config/ssh.rb                 |  3 +++
 plugins/kernel_v2/config/ssh.rb                 |  3 +++
 .../source/v2/vagrantfile/ssh_settings.html.md  |  5 +++++
 7 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/lib/vagrant/machine.rb b/lib/vagrant/machine.rb
index c1d0e8d7a..e7d547a39 100644
--- a/lib/vagrant/machine.rb
+++ b/lib/vagrant/machine.rb
@@ -442,6 +442,7 @@ module Vagrant
       # We also set some fields that are purely controlled by Varant
       info[:forward_agent] = @config.ssh.forward_agent
       info[:forward_x11]   = @config.ssh.forward_x11
+      info[:forward_env]   = @config.ssh.forward_env
 
       info[:ssh_command] = @config.ssh.ssh_command if @config.ssh.ssh_command
 
diff --git a/lib/vagrant/util/ssh.rb b/lib/vagrant/util/ssh.rb
index 20afcdb04..5f3876ce9 100644
--- a/lib/vagrant/util/ssh.rb
+++ b/lib/vagrant/util/ssh.rb
@@ -138,6 +138,10 @@ module Vagrant
           command_options += ["-o", "ProxyCommand=#{ssh_info[:proxy_command]}"]
         end
 
+        if ssh_info[:forward_env]
+          command_options += ["-o", "SendEnv=" + ssh_info[:forward_env].keys().join(" ")]
+        end
+
         # Configurables -- extra_args should always be last due to the way the
         # ssh args parser works. e.g. if the user wants to use the -t option,
         # any shell command(s) she'd like to run on the remote server would
@@ -172,6 +176,14 @@ module Vagrant
         LOGGER.info("Executing SSH in subprocess: #{ssh} #{command_options.inspect}")
         process = ChildProcess.build(ssh, *command_options)
         process.io.inherit!
+
+        # Forward configured environment variables.
+        if ssh_info[:forward_env]
+          ssh_info[:forward_env].each do |host_var, guest_var|
+            process.environment[guest_var] = ENV[guest_var]
+          end
+        end
+
         process.start
         process.wait
         return process.exit_code
diff --git a/plugins/commands/ssh_config/command.rb b/plugins/commands/ssh_config/command.rb
index 6013a90b7..94e89c141 100644
--- a/plugins/commands/ssh_config/command.rb
+++ b/plugins/commands/ssh_config/command.rb
@@ -41,7 +41,8 @@ module VagrantPlugins
             forward_agent: ssh_info[:forward_agent],
             forward_x11:   ssh_info[:forward_x11],
             proxy_command: ssh_info[:proxy_command],
-            ssh_command: ssh_info[:ssh_command]
+            ssh_command:   ssh_info[:ssh_command],
+            forward_env:   ssh_info[:forward_env],
           }
 
           # Render the template and output directly to STDOUT
diff --git a/plugins/communicators/ssh/communicator.rb b/plugins/communicators/ssh/communicator.rb
index 40f49e82c..86999502b 100644
--- a/plugins/communicators/ssh/communicator.rb
+++ b/plugins/communicators/ssh/communicator.rb
@@ -328,6 +328,17 @@ module VagrantPlugins
         auth_methods << "publickey" if ssh_info[:private_key_path]
         auth_methods << "password" if ssh_info[:password]
 
+        # Build the environment
+        env_revert = {}
+        send_env_array = nil
+        if ssh_info[:forward_agent]
+          send_env_array = ssh_info[:forward_env].values()
+          ssh_info[:forward_env].each do |host_var, guest_var|
+            env_revert[guest_var] = ENV[guest_var]
+            ENV[guest_var] = ENV[host_var]
+          end
+        end
+
         # Build the options we'll use to initiate the connection via Net::SSH
         common_connect_opts = {
           auth_methods:          auth_methods,
@@ -338,6 +349,7 @@ module VagrantPlugins
           paranoid:              false,
           password:              ssh_info[:password],
           port:                  ssh_info[:port],
+          send_env:              send_env_array,
           timeout:               15,
           user_known_hosts_file: [],
           verbose:               :debug,
@@ -430,6 +442,11 @@ module VagrantPlugins
           # This is raised if a private key type that Net-SSH doesn't support
           # is used. Show a nicer error.
           raise Vagrant::Errors::SSHKeyTypeNotSupported
+        ensure
+          # TODO: will this leak?
+          env_revert.each do |guest_var, guest_value|
+            ENV[guest_var] = guest_value
+          end
         end
 
         @connection          = connection
diff --git a/plugins/kernel_v1/config/ssh.rb b/plugins/kernel_v1/config/ssh.rb
index 7226917ca..7d9b944b5 100644
--- a/plugins/kernel_v1/config/ssh.rb
+++ b/plugins/kernel_v1/config/ssh.rb
@@ -13,6 +13,7 @@ module VagrantPlugins
       attr_accessor :private_key_path
       attr_accessor :forward_agent
       attr_accessor :forward_x11
+      attr_accessor :forward_env
       attr_accessor :shell
 
       def initialize
@@ -26,6 +27,7 @@ module VagrantPlugins
         @private_key_path = UNSET_VALUE
         @forward_agent    = UNSET_VALUE
         @forward_x11      = UNSET_VALUE
+        @forward_env      = UNSET_VALUE
         @shell            = UNSET_VALUE
       end
 
@@ -37,6 +39,7 @@ module VagrantPlugins
         new.ssh.private_key_path = @private_key_path if @private_key_path != UNSET_VALUE
         new.ssh.forward_agent    = @forward_agent if @forward_agent != UNSET_VALUE
         new.ssh.forward_x11      = @forward_x11 if @forward_x11 != UNSET_VALUE
+        new.ssh.forward_env      = @forward_env if @forward_env != UNSET_VALUE
         new.ssh.shell            = @shell if @shell != UNSET_VALUE
       end
     end
diff --git a/plugins/kernel_v2/config/ssh.rb b/plugins/kernel_v2/config/ssh.rb
index 95603142c..c9e0a6695 100644
--- a/plugins/kernel_v2/config/ssh.rb
+++ b/plugins/kernel_v2/config/ssh.rb
@@ -7,6 +7,7 @@ module VagrantPlugins
     class SSHConfig < SSHConnectConfig
       attr_accessor :forward_agent
       attr_accessor :forward_x11
+      attr_accessor :forward_env
       attr_accessor :guest_port
       attr_accessor :keep_alive
       attr_accessor :shell
@@ -22,6 +23,7 @@ module VagrantPlugins
 
         @forward_agent = UNSET_VALUE
         @forward_x11   = UNSET_VALUE
+        @forward_env   = UNSET_VALUE
         @guest_port    = UNSET_VALUE
         @keep_alive    = UNSET_VALUE
         @proxy_command = UNSET_VALUE
@@ -45,6 +47,7 @@ module VagrantPlugins
 
         @forward_agent = false if @forward_agent == UNSET_VALUE
         @forward_x11   = false if @forward_x11 == UNSET_VALUE
+        @forward_env   = false if @forward_env == UNSET_VALUE
         @guest_port = 22 if @guest_port == UNSET_VALUE
         @keep_alive = true if @keep_alive == UNSET_VALUE
         @proxy_command = nil if @proxy_command == UNSET_VALUE
diff --git a/website/docs/source/v2/vagrantfile/ssh_settings.html.md b/website/docs/source/v2/vagrantfile/ssh_settings.html.md
index cadeca060..67bfb7936 100644
--- a/website/docs/source/v2/vagrantfile/ssh_settings.html.md
+++ b/website/docs/source/v2/vagrantfile/ssh_settings.html.md
@@ -67,6 +67,11 @@ is enabled. Defaults to false.
 
 <hr>
 
+`config.ssh.forward_env` - A hash of host environment variable names to guest
+environment variable names.
+
+<hr>
+
 `config.ssh.insert_key` - If `true`, Vagrant will automatically insert
 a keypair to use for SSH, replacing Vagrant's default insecure key
 inside the machine if detected. By default, this is true.

From 02a351841e0331604dc66e555c1146704cbba435 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 16:32:43 -0800
Subject: [PATCH 219/354] Use an array instead of map

---
 lib/vagrant/util/ssh.rb                        |  6 +++---
 plugins/communicators/ssh/communicator.rb      | 18 +-----------------
 .../source/v2/vagrantfile/ssh_settings.html.md |  9 +++++++--
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/lib/vagrant/util/ssh.rb b/lib/vagrant/util/ssh.rb
index 5f3876ce9..f5d6b916d 100644
--- a/lib/vagrant/util/ssh.rb
+++ b/lib/vagrant/util/ssh.rb
@@ -139,7 +139,7 @@ module Vagrant
         end
 
         if ssh_info[:forward_env]
-          command_options += ["-o", "SendEnv=" + ssh_info[:forward_env].keys().join(" ")]
+          command_options += ["-o", "SendEnv=#{ssh_info[:forward_env].join(" ")}"]
         end
 
         # Configurables -- extra_args should always be last due to the way the
@@ -179,8 +179,8 @@ module Vagrant
 
         # Forward configured environment variables.
         if ssh_info[:forward_env]
-          ssh_info[:forward_env].each do |host_var, guest_var|
-            process.environment[guest_var] = ENV[guest_var]
+          ssh_info[:forward_env].each do |key|
+            process.environment[key] = ENV[key]
           end
         end
 
diff --git a/plugins/communicators/ssh/communicator.rb b/plugins/communicators/ssh/communicator.rb
index 86999502b..19b2306b1 100644
--- a/plugins/communicators/ssh/communicator.rb
+++ b/plugins/communicators/ssh/communicator.rb
@@ -328,28 +328,17 @@ module VagrantPlugins
         auth_methods << "publickey" if ssh_info[:private_key_path]
         auth_methods << "password" if ssh_info[:password]
 
-        # Build the environment
-        env_revert = {}
-        send_env_array = nil
-        if ssh_info[:forward_agent]
-          send_env_array = ssh_info[:forward_env].values()
-          ssh_info[:forward_env].each do |host_var, guest_var|
-            env_revert[guest_var] = ENV[guest_var]
-            ENV[guest_var] = ENV[host_var]
-          end
-        end
-
         # Build the options we'll use to initiate the connection via Net::SSH
         common_connect_opts = {
           auth_methods:          auth_methods,
           config:                false,
           forward_agent:         ssh_info[:forward_agent],
+          forward_env:           ssh_info[:forward_env],
           keys:                  ssh_info[:private_key_path],
           keys_only:             true,
           paranoid:              false,
           password:              ssh_info[:password],
           port:                  ssh_info[:port],
-          send_env:              send_env_array,
           timeout:               15,
           user_known_hosts_file: [],
           verbose:               :debug,
@@ -442,11 +431,6 @@ module VagrantPlugins
           # This is raised if a private key type that Net-SSH doesn't support
           # is used. Show a nicer error.
           raise Vagrant::Errors::SSHKeyTypeNotSupported
-        ensure
-          # TODO: will this leak?
-          env_revert.each do |guest_var, guest_value|
-            ENV[guest_var] = guest_value
-          end
         end
 
         @connection          = connection
diff --git a/website/docs/source/v2/vagrantfile/ssh_settings.html.md b/website/docs/source/v2/vagrantfile/ssh_settings.html.md
index 67bfb7936..5db92e034 100644
--- a/website/docs/source/v2/vagrantfile/ssh_settings.html.md
+++ b/website/docs/source/v2/vagrantfile/ssh_settings.html.md
@@ -67,8 +67,13 @@ is enabled. Defaults to false.
 
 <hr>
 
-`config.ssh.forward_env` - A hash of host environment variable names to guest
-environment variable names.
+`config.ssh.forward_env` - An array of host environment variables to forward to
+the guest. If you are familiar with OpenSSH, this corresponds to the `SendEnv`
+paramter.
+
+```ruby
+config.ssh.forward_env = ["CUSTOM_VAR"]
+```
 
 <hr>
 

From 33d1bca02e93c09065f45a0f8a07e447229c4caf Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 16:39:16 -0800
Subject: [PATCH 220/354] Update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a04e4e41..514eddad5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,8 @@ IMPROVEMENTS:
   - command/plugin: Add `--plugin-clean-sources` flag to reset plugin install
       sources, primarily for corp firewalls. [GH-4738]
   - command/up: provisioners are run on suspend resume [GH-5815]
+  - communicators/ssh: allow specifying host environment variables to forward
+    to guests [GH-4132, GH-6562]
   - communicators/winrm: Configurable execution time limit [GH-6213]
   - providers/virtualbox: cache version lookup, which caused significant
       slowdown on some Windows hosts [GH-6552]

From 20940d1a2faf09055a473c44392743250820268a Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 16:55:48 -0800
Subject: [PATCH 221/354] Use subprocess as a poor-man's exec for local-exec

Fixes GH-5307
---
 plugins/pushes/local-exec/push.rb             | 25 +++++++++++++++++++
 .../plugins/pushes/local-exec/push_test.rb    | 12 ++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/plugins/pushes/local-exec/push.rb b/plugins/pushes/local-exec/push.rb
index 718b1ab04..d4bc75176 100644
--- a/plugins/pushes/local-exec/push.rb
+++ b/plugins/pushes/local-exec/push.rb
@@ -39,8 +39,33 @@ module VagrantPlugins
 
       # Execute the script, raising an exception if it fails.
       def execute!(*cmd)
+        if Vagrant::Util::Platform.windows?
+          execute_subprocess!(*cmd)
+        else
+          execute_exec!(*cmd)
+        end
+      end
+
+      private
+
+      # Run the command as exec (unix).
+      def execute_exec!(*cmd)
         Vagrant::Util::SafeExec.exec(cmd[0], *cmd[1..-1])
       end
+
+      # Run the command as a subprocess (windows).
+      def execute_subprocess!(*cmd)
+        cmd = cmd.dup << { notify: [:stdout, :stderr] }
+        result = Vagrant::Util::Subprocess.execute(*cmd) do |type, data|
+          if type == :stdout
+            @env.ui.info(data, new_line: false)
+          elsif type == :stderr
+            @env.ui.warn(data, new_line: false)
+          end
+        end
+
+        Kernel.exit(result.exit_code)
+      end
     end
   end
 end
diff --git a/test/unit/plugins/pushes/local-exec/push_test.rb b/test/unit/plugins/pushes/local-exec/push_test.rb
index 1efdfa3b1..e7c04060d 100644
--- a/test/unit/plugins/pushes/local-exec/push_test.rb
+++ b/test/unit/plugins/pushes/local-exec/push_test.rb
@@ -93,9 +93,19 @@ describe VagrantPlugins::LocalExecPush::Push do
   end
 
   describe "#execute!" do
-    it "safe execs" do
+    it "uses exec on unix" do
+      allow(Vagrant::Util::Platform).to receive(:windows?).and_return(false)
       expect(Vagrant::Util::SafeExec).to receive(:exec)
       expect { subject.execute! }.to_not raise_error
     end
+
+    it "uses subprocess on windows" do
+      allow(Vagrant::Util::Platform).to receive(:windows?).and_return(true)
+      result = double("result", exit_code: 0)
+      expect(Vagrant::Util::Subprocess).to receive(:execute).and_return(result)
+      expect { subject.execute! }.to raise_error { |e|
+        expect(e).to be_a(SystemExit)
+      }
+    end
   end
 end

From 7f4d5c82de4245a92aa64471be43031b890d0037 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 17:07:49 -0800
Subject: [PATCH 222/354] Update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 514eddad5..a4b453570 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -104,6 +104,8 @@ BUG FIXES:
   - provisioners/puppet-server: works with Puppet Collection 1 [GH-6389]
   - provisioners/salt: call correct executables on Windows [GH-5999]
   - provisioners/salt: log level and colorize works for masterless [GH-6474]
+  - push/local-exec: use subprocess on windows when fork does not exist
+    [GH-5307, GH-6563]
   - push/heroku: use current branch [GH-6554]
   - synced\_folders/rsync: on Windows, replace all paths with Cygwin
       paths since all rsync implementations require this [GH-6160]

From 40336016e1daf83a3f08590df953b766203a0c8f Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 18:08:47 -0800
Subject: [PATCH 223/354] Use the correct option for sending the environment

---
 plugins/communicators/ssh/communicator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/communicators/ssh/communicator.rb b/plugins/communicators/ssh/communicator.rb
index 19b2306b1..a9190f569 100644
--- a/plugins/communicators/ssh/communicator.rb
+++ b/plugins/communicators/ssh/communicator.rb
@@ -333,7 +333,7 @@ module VagrantPlugins
           auth_methods:          auth_methods,
           config:                false,
           forward_agent:         ssh_info[:forward_agent],
-          forward_env:           ssh_info[:forward_env],
+          send_env:              ssh_info[:forward_env],
           keys:                  ssh_info[:private_key_path],
           keys_only:             true,
           paranoid:              false,

From d3ab73cf4a206facc0d3a48d2fc6462ad421c853 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Nov 2015 18:18:43 -0800
Subject: [PATCH 224/354] core: when packaging, preserve generated key
 [GH-5780]

---
 lib/vagrant/action/general/package.rb | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/vagrant/action/general/package.rb b/lib/vagrant/action/general/package.rb
index 58991222c..beb6f05fc 100644
--- a/lib/vagrant/action/general/package.rb
+++ b/lib/vagrant/action/general/package.rb
@@ -30,7 +30,7 @@ module Vagrant
         def call(env)
           @env = env
           file_name = File.basename(@env["package.output"].to_s)
-          
+
           raise Errors::PackageOutputDirectory if File.directory?(tar_path)
           raise Errors::PackageOutputExists, file_name:file_name if File.exist?(tar_path)
           raise Errors::PackageRequiresDirectory if !env["package.directory"] ||
@@ -113,6 +113,21 @@ module Vagrant
 
           # If we don't have a generated private key, we do nothing
           path = @env[:machine].data_dir.join("private_key")
+          if !path.file?
+            # If we have a private key that was copied into this box,
+            # then we copy that. This is a bit of a heuristic and can be a
+            # security risk if the key is named the correct thing, but
+            # we'll take that risk for dev environments.
+            (@env[:machine].config.ssh.private_key_path || []).each do |p|
+              # If we have the correctly named key, copy it
+              if File.basename(p) == "vagrant_private_key"
+                path = Pathname.new(p)
+                break
+              end
+            end
+          end
+
+          # If we still have no matching key, do nothing
           return if !path.file?
 
           # Copy it into our box directory

From 240c393e69e1832d6cea5461c64e1037646ef442 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Nov 2015 18:20:16 -0800
Subject: [PATCH 225/354] update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4b453570..cae545d78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,6 +71,8 @@ BUG FIXES:
   - commands/box: the update command supports CA settings [GH-4473]
   - commands/box: removing all versions and providers of a box will properly
       clean all directories in `~/.vagrant.d/boxes` [GH-3570]
+  - commands/package: when re-packaging a packaged box, preserve the
+      generated SSH key [GH-5780]
   - commands/rdp: prefer `xfreerdp` if it is available on Linux [GH-6475]
   - commands/up: the `--provision-with` flag works with provisioner names [GH-5981]
   - communicator/ssh: fix potential crash case with PTY [GH-6225]

From f5cadc93fa3b5a99f69675e89f60cafa832042b8 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Nov 2015 18:35:18 -0800
Subject: [PATCH 226/354] guests/linux: POSIX sed [GH-6104]

---
 plugins/guests/linux/cap/remove_public_key.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/guests/linux/cap/remove_public_key.rb b/plugins/guests/linux/cap/remove_public_key.rb
index a8d773a40..de696fa69 100644
--- a/plugins/guests/linux/cap/remove_public_key.rb
+++ b/plugins/guests/linux/cap/remove_public_key.rb
@@ -10,8 +10,10 @@ module VagrantPlugins
 
           machine.communicate.tap do |comm|
             if comm.test("test -f ~/.ssh/authorized_keys")
-              comm.execute(
-                "sed -i '/^.*#{contents}.*$/d' ~/.ssh/authorized_keys")
+              comm.execute(<<SCRIPT)
+sed -e '/^.*#{contents}.*$/d' ~/.ssh/authorized_keys > ~/.ssh/authorized_keys.new
+mv ~/.ssh/authorized_keys.new ~/.ssh/authorized_keys
+SCRIPT
             end
           end
         end

From d2983d4fe4774efabd489575a2e7dfa190b6bd99 Mon Sep 17 00:00:00 2001
From: Jason Casden <jmcasden@ncsu.edu>
Date: Fri, 7 Aug 2015 13:44:08 -0400
Subject: [PATCH 227/354] Use official Docker installer and upgrade for :latest
 installs

---
 .../docker/cap/debian/docker_install.rb       | 18 +++------------
 .../docker/cap/redhat/docker_install.rb       | 22 +++++++++++--------
 plugins/provisioners/docker/installer.rb      |  6 ++---
 3 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/plugins/provisioners/docker/cap/debian/docker_install.rb b/plugins/provisioners/docker/cap/debian/docker_install.rb
index b9fbed673..d1dd0222a 100644
--- a/plugins/provisioners/docker/cap/debian/docker_install.rb
+++ b/plugins/provisioners/docker/cap/debian/docker_install.rb
@@ -4,26 +4,14 @@ module VagrantPlugins
       module Debian
         module DockerInstall
           def self.docker_install(machine, version)
-            package = 'lxc-docker'
+            package = 'docker-engine'
             package << "-#{version}" if version != :latest
 
             machine.communicate.tap do |comm|
               comm.sudo("apt-get update -y")
-              # TODO: Perform check on the host machine if aufs is installed and using LXC
-              if machine.provider_name != :lxc
-                # Attempt to install linux-image-extra for this kernel, if it exists
-                 package_name = "linux-image-extra-`uname -r`"
-                 comm.sudo("lsmod | grep aufs || modprobe aufs || apt-cache show #{package_name} && apt-get install -y #{package_name} || true")
-              end
               comm.sudo("apt-get install -y --force-yes -q curl")
-              comm.sudo("curl -sSL https://get.docker.com/gpg | apt-key add -")
-              comm.sudo("echo deb https://get.docker.com/ubuntu docker main > /etc/apt/sources.list.d/docker.list")
-              comm.sudo("apt-get update")
-              comm.sudo("echo lxc lxc/directory string /var/lib/lxc | debconf-set-selections")
-              comm.sudo("apt-get install -y --force-yes -q xz-utils #{package} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold'")
-
-              # chmod the directory if it exists
-              comm.sudo("chmod 0755 /var/lib/docker")
+              comm.sudo("apt-get purge -y lxc-docker*")
+              comm.sudo("curl -sSL https://get.docker.com/ | sh")
             end
           end
         end
diff --git a/plugins/provisioners/docker/cap/redhat/docker_install.rb b/plugins/provisioners/docker/cap/redhat/docker_install.rb
index 2d6bd1e51..7afd30587 100644
--- a/plugins/provisioners/docker/cap/redhat/docker_install.rb
+++ b/plugins/provisioners/docker/cap/redhat/docker_install.rb
@@ -8,28 +8,32 @@ module VagrantPlugins
               machine.ui.warn(I18n.t("vagrant.docker_install_with_version_not_supported"))
             end
 
+            machine.communicate.tap do |comm|
+              comm.sudo("yum -y update")
+              comm.sudo("yum -y remove docker-io*")
+              comm.sudo("curl -sSL https://get.docker.com/ | sh")
+            end
+
             case machine.guest.capability("flavor")
+
             when :rhel_7
-              docker_install_rhel7(machine)
+              docker_enable_rhel7(machine)
             else
-              docker_install_default(machine)
+              docker_enable_default(machine)
             end
           end
 
-          def self.docker_install_rhel7(machine)
+          def self.docker_enable_rhel7(machine)
             machine.communicate.tap do |comm|
-              comm.sudo("yum -y install docker")
               comm.sudo("systemctl start docker.service")
               comm.sudo("systemctl enable docker.service")
             end
           end
 
-          def self.docker_install_default(machine)
+          def self.docker_enable_default(machine)
             machine.communicate.tap do |comm|
-              if ! comm.test("rpm -qa | grep epel-release")
-                comm.sudo("rpm -ivh http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm")
-              end
-              comm.sudo("yum -y install docker-io")
+              comm.sudo("service docker start")
+              comm.sudo("chkconfig docker on")
             end
           end
         end
diff --git a/plugins/provisioners/docker/installer.rb b/plugins/provisioners/docker/installer.rb
index cfcebdd43..b144ec1e6 100644
--- a/plugins/provisioners/docker/installer.rb
+++ b/plugins/provisioners/docker/installer.rb
@@ -15,10 +15,10 @@ module VagrantPlugins
           return
         end
 
-        if !@machine.guest.capability(:docker_installed)
-          @machine.ui.detail(I18n.t("vagrant.docker_installing", version: @version.to_s))
-          @machine.guest.capability(:docker_install, @version)
+        @machine.ui.detail(I18n.t("vagrant.docker_installing", version: @version.to_s))
+        @machine.guest.capability(:docker_install, @version)
 
+        if !@machine.guest.capability(:docker_installed)
           if !@machine.guest.capability(:docker_installed)
             raise DockerError, :install_failed
           end

From 7076d192c9d00d6efa81916a2418a8fb6f0cc1a2 Mon Sep 17 00:00:00 2001
From: Jason Casden <jmcasden@ncsu.edu>
Date: Fri, 7 Aug 2015 14:12:38 -0400
Subject: [PATCH 228/354] Quiet package commands

---
 plugins/provisioners/docker/cap/debian/docker_install.rb | 9 +++------
 plugins/provisioners/docker/cap/redhat/docker_install.rb | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/plugins/provisioners/docker/cap/debian/docker_install.rb b/plugins/provisioners/docker/cap/debian/docker_install.rb
index d1dd0222a..11f748632 100644
--- a/plugins/provisioners/docker/cap/debian/docker_install.rb
+++ b/plugins/provisioners/docker/cap/debian/docker_install.rb
@@ -4,13 +4,10 @@ module VagrantPlugins
       module Debian
         module DockerInstall
           def self.docker_install(machine, version)
-            package = 'docker-engine'
-            package << "-#{version}" if version != :latest
-
             machine.communicate.tap do |comm|
-              comm.sudo("apt-get update -y")
-              comm.sudo("apt-get install -y --force-yes -q curl")
-              comm.sudo("apt-get purge -y lxc-docker*")
+              comm.sudo("apt-get update -qq -y")
+              comm.sudo("apt-get install -qq -y --force-yes curl")
+              comm.sudo("apt-get purge -qq -y lxc-docker*")
               comm.sudo("curl -sSL https://get.docker.com/ | sh")
             end
           end
diff --git a/plugins/provisioners/docker/cap/redhat/docker_install.rb b/plugins/provisioners/docker/cap/redhat/docker_install.rb
index 7afd30587..4f1756df9 100644
--- a/plugins/provisioners/docker/cap/redhat/docker_install.rb
+++ b/plugins/provisioners/docker/cap/redhat/docker_install.rb
@@ -9,8 +9,8 @@ module VagrantPlugins
             end
 
             machine.communicate.tap do |comm|
-              comm.sudo("yum -y update")
-              comm.sudo("yum -y remove docker-io*")
+              comm.sudo("yum -q -y update")
+              comm.sudo("yum -q -y remove docker-io*")
               comm.sudo("curl -sSL https://get.docker.com/ | sh")
             end
 

From f5a0c3ed5bd201a084bb4c4410813c99a48d73bf Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 17:45:16 -0800
Subject: [PATCH 229/354] Deprecate docker.version

---
 .../docker/cap/debian/docker_install.rb          |  2 +-
 .../docker/cap/fedora/docker_install.rb          |  6 +-----
 .../docker/cap/redhat/docker_install.rb          |  7 +------
 plugins/provisioners/docker/config.rb            | 16 ++++++++++------
 plugins/provisioners/docker/installer.rb         |  7 +++----
 plugins/provisioners/docker/provisioner.rb       |  2 +-
 templates/locales/en.yml                         |  8 +-------
 .../plugins/provisioners/docker/config_test.rb   | 13 ++++---------
 .../docs/source/v2/provisioning/docker.html.md   |  3 ---
 9 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/plugins/provisioners/docker/cap/debian/docker_install.rb b/plugins/provisioners/docker/cap/debian/docker_install.rb
index 11f748632..7b81df0f9 100644
--- a/plugins/provisioners/docker/cap/debian/docker_install.rb
+++ b/plugins/provisioners/docker/cap/debian/docker_install.rb
@@ -3,7 +3,7 @@ module VagrantPlugins
     module Cap
       module Debian
         module DockerInstall
-          def self.docker_install(machine, version)
+          def self.docker_install(machine)
             machine.communicate.tap do |comm|
               comm.sudo("apt-get update -qq -y")
               comm.sudo("apt-get install -qq -y --force-yes curl")
diff --git a/plugins/provisioners/docker/cap/fedora/docker_install.rb b/plugins/provisioners/docker/cap/fedora/docker_install.rb
index 16377f410..8feb5b0e2 100644
--- a/plugins/provisioners/docker/cap/fedora/docker_install.rb
+++ b/plugins/provisioners/docker/cap/fedora/docker_install.rb
@@ -3,11 +3,7 @@ module VagrantPlugins
     module Cap
       module Fedora
         module DockerInstall
-          def self.docker_install(machine, version)
-            if version != :latest
-              machine.ui.warn(I18n.t("vagrant.docker_install_with_version_not_supported"))
-            end
-
+          def self.docker_install(machine)
             machine.communicate.tap do |comm|
               if dnf?(machine)
                 comm.sudo("dnf -y install docker")
diff --git a/plugins/provisioners/docker/cap/redhat/docker_install.rb b/plugins/provisioners/docker/cap/redhat/docker_install.rb
index 4f1756df9..9324c8f5b 100644
--- a/plugins/provisioners/docker/cap/redhat/docker_install.rb
+++ b/plugins/provisioners/docker/cap/redhat/docker_install.rb
@@ -3,11 +3,7 @@ module VagrantPlugins
     module Cap
       module Redhat
         module DockerInstall
-          def self.docker_install(machine, version)
-            if version != :latest
-              machine.ui.warn(I18n.t("vagrant.docker_install_with_version_not_supported"))
-            end
-
+          def self.docker_install(machine)
             machine.communicate.tap do |comm|
               comm.sudo("yum -q -y update")
               comm.sudo("yum -q -y remove docker-io*")
@@ -15,7 +11,6 @@ module VagrantPlugins
             end
 
             case machine.guest.capability("flavor")
-
             when :rhel_7
               docker_enable_rhel7(machine)
             else
diff --git a/plugins/provisioners/docker/config.rb b/plugins/provisioners/docker/config.rb
index bcf4cf672..8e9de55da 100644
--- a/plugins/provisioners/docker/config.rb
+++ b/plugins/provisioners/docker/config.rb
@@ -4,11 +4,18 @@ module VagrantPlugins
   module DockerProvisioner
     class Config < Vagrant.plugin("2", :config)
       attr_reader :images
-      attr_accessor :version
+
+      def version=(value)
+          STDOUT.puts <<-EOH
+[DEPRECATED] The configuration `docker.version' has been deprecated. Docker no
+longer allows you to specify the version of Docker you want installed and will
+automatically choose the best version for your guest. Please remove this option
+from your Vagrantfile.
+EOH
+      end
 
       def initialize
-        @images         = Set.new
-        @version        = UNSET_VALUE
+        @images = Set.new
 
         @__build_images   = []
         @__containers     = Hash.new { |h, k| h[k] = {} }
@@ -65,9 +72,6 @@ module VagrantPlugins
       end
 
       def finalize!
-        @version = "latest" if @version == UNSET_VALUE
-        @version = @version.to_sym
-
         @__containers.each do |name, params|
           params[:image] ||= name
           params[:auto_assign_name] = true if !params.key?(:auto_assign_name)
diff --git a/plugins/provisioners/docker/installer.rb b/plugins/provisioners/docker/installer.rb
index b144ec1e6..da71ed1a5 100644
--- a/plugins/provisioners/docker/installer.rb
+++ b/plugins/provisioners/docker/installer.rb
@@ -1,9 +1,8 @@
 module VagrantPlugins
   module DockerProvisioner
     class Installer
-      def initialize(machine, version)
+      def initialize(machine)
         @machine = machine
-        @version = version
       end
 
       # This handles verifying the Docker installation, installing it if it was
@@ -15,8 +14,8 @@ module VagrantPlugins
           return
         end
 
-        @machine.ui.detail(I18n.t("vagrant.docker_installing", version: @version.to_s))
-        @machine.guest.capability(:docker_install, @version)
+        @machine.ui.detail(I18n.t("vagrant.docker_installing"))
+        @machine.guest.capability(:docker_install)
 
         if !@machine.guest.capability(:docker_installed)
           if !@machine.guest.capability(:docker_installed)
diff --git a/plugins/provisioners/docker/provisioner.rb b/plugins/provisioners/docker/provisioner.rb
index 8b9d609a3..aa4aca27e 100644
--- a/plugins/provisioners/docker/provisioner.rb
+++ b/plugins/provisioners/docker/provisioner.rb
@@ -11,7 +11,7 @@ module VagrantPlugins
       def initialize(machine, config, installer = nil, client = nil)
         super(machine, config)
 
-        @installer = installer || Installer.new(@machine, config.version)
+        @installer = installer || Installer.new(@machine)
         @client    = client    || Client.new(@machine)
       end
 
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 10fee4f09..3367c500a 100755
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -123,14 +123,8 @@ en:
       installed and attempt to continue.
     docker_configure_autostart: |-
       Configuring Docker to autostart containers...
-    docker_install_with_version_not_supported: |-
-      Vagrant is not capable of installing a specific version of Docker
-      onto the guest machine and the latest version will be installed.
-      This is a limitation of Vagrant knowing how to interact with this
-      operating system. This isn't a bug, but if you know how to fix this
-      please report it to Vagrant.
     docker_installing: |-
-      Installing Docker (%{version}) onto machine...
+      Installing Docker onto machine...
     docker_pulling_images:
       Pulling Docker images...
     docker_pulling_single: |-
diff --git a/test/unit/plugins/provisioners/docker/config_test.rb b/test/unit/plugins/provisioners/docker/config_test.rb
index e12f883c4..ba2b6836d 100644
--- a/test/unit/plugins/provisioners/docker/config_test.rb
+++ b/test/unit/plugins/provisioners/docker/config_test.rb
@@ -139,15 +139,10 @@ describe VagrantPlugins::DockerProvisioner::Config do
   end
 
   describe "#version" do
-    it "defaults to latest" do
-      subject.finalize!
-      expect(subject.version).to eql(:latest)
-    end
-
-    it "converts to a symbol" do
-      subject.version = "v27"
-      subject.finalize!
-      expect(subject.version).to eql(:v27)
+    it "is removed in Vagrant 1.9" do
+      if Vagrant::VERSION >= "1.9"
+        raise "Remove deprecated option"
+      end
     end
   end
 end
diff --git a/website/docs/source/v2/provisioning/docker.html.md b/website/docs/source/v2/provisioning/docker.html.md
index 0e03ec660..cb0d526fd 100644
--- a/website/docs/source/v2/provisioning/docker.html.md
+++ b/website/docs/source/v2/provisioning/docker.html.md
@@ -42,9 +42,6 @@ for you (if it isn't already installed).
   can also use the `pull_images` function. See the example below this
   section for more information.
 
-* `version` (string) - The version of Docker to install. This defaults to
-  "latest" and will install the latest version of Docker.
-
 In addition to the options that can be set, various functions are available
 and can be called to configure other aspects of the Docker provisioner. Most
 of these functions have examples in more detailed sections below.

From bad4c2103d4cd56bb3ef57c76fc58e1360762389 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 18:25:28 -0800
Subject: [PATCH 230/354] Only install Docker if it is not already installed

---
 plugins/provisioners/docker/installer.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/provisioners/docker/installer.rb b/plugins/provisioners/docker/installer.rb
index da71ed1a5..3f2ae95ad 100644
--- a/plugins/provisioners/docker/installer.rb
+++ b/plugins/provisioners/docker/installer.rb
@@ -14,13 +14,13 @@ module VagrantPlugins
           return
         end
 
-        @machine.ui.detail(I18n.t("vagrant.docker_installing"))
-        @machine.guest.capability(:docker_install)
+        if !@machine.guest.capability(:docker_installed)
+          @machine.ui.detail(I18n.t("vagrant.docker_installing"))
+          @machine.guest.capability(:docker_install)
+        end
 
         if !@machine.guest.capability(:docker_installed)
-          if !@machine.guest.capability(:docker_installed)
-            raise DockerError, :install_failed
-          end
+          raise DockerError, :install_failed
         end
 
         if @machine.guest.capability?(:docker_configure_vagrant_user)

From 1b08cfcd0945d1f7c2273d9c56d90a1e456d26aa Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 19 Nov 2015 18:34:31 -0800
Subject: [PATCH 231/354] Do not fail if uninstalling lxc/docker-io fails

---
 plugins/provisioners/docker/cap/debian/docker_install.rb | 2 +-
 plugins/provisioners/docker/cap/redhat/docker_install.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/provisioners/docker/cap/debian/docker_install.rb b/plugins/provisioners/docker/cap/debian/docker_install.rb
index 7b81df0f9..33724f673 100644
--- a/plugins/provisioners/docker/cap/debian/docker_install.rb
+++ b/plugins/provisioners/docker/cap/debian/docker_install.rb
@@ -7,7 +7,7 @@ module VagrantPlugins
             machine.communicate.tap do |comm|
               comm.sudo("apt-get update -qq -y")
               comm.sudo("apt-get install -qq -y --force-yes curl")
-              comm.sudo("apt-get purge -qq -y lxc-docker*")
+              comm.sudo("apt-get purge -qq -y lxc-docker* || true")
               comm.sudo("curl -sSL https://get.docker.com/ | sh")
             end
           end
diff --git a/plugins/provisioners/docker/cap/redhat/docker_install.rb b/plugins/provisioners/docker/cap/redhat/docker_install.rb
index 9324c8f5b..0a6868b8b 100644
--- a/plugins/provisioners/docker/cap/redhat/docker_install.rb
+++ b/plugins/provisioners/docker/cap/redhat/docker_install.rb
@@ -6,7 +6,7 @@ module VagrantPlugins
           def self.docker_install(machine)
             machine.communicate.tap do |comm|
               comm.sudo("yum -q -y update")
-              comm.sudo("yum -q -y remove docker-io*")
+              comm.sudo("yum -q -y remove docker-io* || true")
               comm.sudo("curl -sSL https://get.docker.com/ | sh")
             end
 

From f69d9a6515a13b36ad6589767f1c973078410162 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Nov 2015 18:38:05 -0800
Subject: [PATCH 232/354] update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cae545d78..45910d147 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -85,6 +85,8 @@ BUG FIXES:
   - guests/debian: graceful shutdown works properly with newer releases [GH-5986]
   - guests/fedora: Preserve `localhost` entry when changing hostname [GH-6203]
   - guests/fedora: Use dnf if it is available [GH-6301]
+  - guests/linux: when replacing a public SSH key, use POSIX-compliant
+      sed flags [GH-6565]
   - guests/suse: DHCP network interfaces properly configured [GH-6502]
   - hosts/slackware: Better detection of NFS [GH-6367]
   - providers/hyper-v: support generation 2 VMs [GH-6372]

From 32f6accb25fa36e633b30a8b7c657fe4182438ca Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Nov 2015 18:50:39 -0800
Subject: [PATCH 233/354] commands/box: don't halt on metadata download failure
 [GH-6453]

---
 CHANGELOG.md                             | 1 +
 plugins/commands/box/command/outdated.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45910d147..462bf8890 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,6 +71,7 @@ BUG FIXES:
   - commands/box: the update command supports CA settings [GH-4473]
   - commands/box: removing all versions and providers of a box will properly
       clean all directories in `~/.vagrant.d/boxes` [GH-3570]
+  - commands/box: outdated global won't halt on metadata download failure [GH-6453]
   - commands/package: when re-packaging a packaged box, preserve the
       generated SSH key [GH-5780]
   - commands/rdp: prefer `xfreerdp` if it is available on Linux [GH-6475]
diff --git a/plugins/commands/box/command/outdated.rb b/plugins/commands/box/command/outdated.rb
index cde932e1a..4fd6e5cf3 100644
--- a/plugins/commands/box/command/outdated.rb
+++ b/plugins/commands/box/command/outdated.rb
@@ -66,7 +66,7 @@ module VagrantPlugins
             md = nil
             begin
               md = box.load_metadata(download_options)
-            rescue Vagrant::Errors::DownloaderError => e
+            rescue Vagrant::Errors::BoxMetadataDownloadError => e
               @env.ui.error(I18n.t(
                 "vagrant.box_outdated_metadata_error",
                 name: box.name,

From 2ade66443e776bf637f96a74d9d1231b5eadd44c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Nov 2015 23:57:16 -0800
Subject: [PATCH 234/354] core: retry bundler network calls a few times
 [GH-6097]

---
 CHANGELOG.md           | 2 ++
 lib/vagrant/bundler.rb | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 462bf8890..0652429cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,6 +74,8 @@ BUG FIXES:
   - commands/box: outdated global won't halt on metadata download failure [GH-6453]
   - commands/package: when re-packaging a packaged box, preserve the
       generated SSH key [GH-5780]
+  - commands/plugin: retry plugin install automatically a few times to
+      avoid network issues [GH-6097]
   - commands/rdp: prefer `xfreerdp` if it is available on Linux [GH-6475]
   - commands/up: the `--provision-with` flag works with provisioner names [GH-5981]
   - communicator/ssh: fix potential crash case with PTY [GH-6225]
diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb
index e12b89174..e6b5aca14 100644
--- a/lib/vagrant/bundler.rb
+++ b/lib/vagrant/bundler.rb
@@ -42,6 +42,9 @@ module Vagrant
           yield
         end
       end
+
+      # Configure Bundler to retry
+      ::Bundler.settings[:retry] = 3
     end
 
     # Initializes Bundler and the various gem paths so that we can begin

From 9c1b014536e61b332cfaa00774a87a240cce8ed9 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 20 Nov 2015 10:25:09 -0800
Subject: [PATCH 235/354] core: remove saved synced folders not from
 Vagrantfile

---
 .../action/builtin/mixin_synced_folders.rb    | 27 ++++++++-
 lib/vagrant/action/builtin/synced_folders.rb  |  6 +-
 .../builtin/mixin_synced_folders_test.rb      | 56 +++++++++++++++----
 .../action/builtin/synced_folders_test.rb     | 27 +++++++++
 4 files changed, 101 insertions(+), 15 deletions(-)

diff --git a/lib/vagrant/action/builtin/mixin_synced_folders.rb b/lib/vagrant/action/builtin/mixin_synced_folders.rb
index fb0abcce2..08fa867a9 100644
--- a/lib/vagrant/action/builtin/mixin_synced_folders.rb
+++ b/lib/vagrant/action/builtin/mixin_synced_folders.rb
@@ -76,6 +76,16 @@ module Vagrant
           if opts[:merge]
             existing = cached_synced_folders(machine)
             if existing
+              if opts[:vagrantfile]
+                # Go through and find any cached that were from the
+                # Vagrantfile itself. We remove those if it was requested.
+                existing.each do |impl, fs|
+                  fs.each do |id, data|
+                    fs.delete(id) if data[:__vagrantfile]
+                  end
+                end
+              end
+
               folders.each do |impl, fs|
                 existing[impl] ||= {}
                 fs.each do |id, data|
@@ -101,7 +111,12 @@ module Vagrant
           return cached_synced_folders(machine) if opts[:cached]
 
           config = opts[:config]
-          config ||= machine.config.vm
+          root   = false
+          if !config
+            config = machine.config.vm
+            root   = true
+          end
+
           config_folders = config.synced_folders
           folders = {}
 
@@ -131,9 +146,17 @@ module Vagrant
               end
             end
 
+            # Get the data to store
+            data = data.dup
+            if root
+              # If these are the root synced folders (attached directly)
+              # to the Vagrantfile, then we mark it as such.
+              data[:__vagrantfile] = true
+            end
+
             # Keep track of this shared folder by the implementation.
             folders[impl] ||= {}
-            folders[impl][id] = data.dup
+            folders[impl][id] = data
           end
 
           # If we have folders with the "default" key, then determine the
diff --git a/lib/vagrant/action/builtin/synced_folders.rb b/lib/vagrant/action/builtin/synced_folders.rb
index 230676d66..b56c212db 100644
--- a/lib/vagrant/action/builtin/synced_folders.rb
+++ b/lib/vagrant/action/builtin/synced_folders.rb
@@ -23,6 +23,7 @@ module Vagrant
             config: env[:synced_folders_config],
           }
 
+          @logger.info("SyncedFolders loading from cache: #{opts[:cached]}")
           folders = synced_folders(env[:machine], **opts)
           original_folders = folders
 
@@ -121,8 +122,11 @@ module Vagrant
 
             save_synced_folders(env[:machine], all)
           else
+            save_opts = { merge: true }
+            save_opts[:vagrantfile] = true if !opts[:config]
+
             # Save the synced folders
-            save_synced_folders(env[:machine], original_folders, merge: true)
+            save_synced_folders(env[:machine], original_folders, **save_opts)
           end
         end
       end
diff --git a/test/unit/vagrant/action/builtin/mixin_synced_folders_test.rb b/test/unit/vagrant/action/builtin/mixin_synced_folders_test.rb
index 264e158d2..67a5eca27 100644
--- a/test/unit/vagrant/action/builtin/mixin_synced_folders_test.rb
+++ b/test/unit/vagrant/action/builtin/mixin_synced_folders_test.rb
@@ -114,11 +114,13 @@ describe Vagrant::Action::Builtin::MixinSyncedFolders do
       result = subject.synced_folders(machine)
       expect(result.length).to eq(2)
       expect(result[:default]).to eq({
-        "another" => folders["another"],
-        "foo" => folders["foo"],
-        "root" => folders["root"],
+        "another" => folders["another"].merge(__vagrantfile: true),
+        "foo" => folders["foo"].merge(__vagrantfile: true),
+        "root" => folders["root"].merge(__vagrantfile: true),
+      })
+      expect(result[:nfs]).to eq({
+        "nfs" => folders["nfs"].merge(__vagrantfile: true),
       })
-      expect(result[:nfs]).to eq({ "nfs" => folders["nfs"] })
     end
 
     it "should return the proper set of folders of a custom config" do
@@ -185,16 +187,20 @@ describe Vagrant::Action::Builtin::MixinSyncedFolders do
       result = subject.synced_folders(machine, cached: true)
       expect(result.length).to eq(2)
       expect(result[:default]).to eq({
-        "another" => old_folders["another"],
-        "foo" => old_folders["foo"],
-        "root" => old_folders["root"],
+        "another" => old_folders["another"].merge(__vagrantfile: true),
+        "foo" => old_folders["foo"].merge(__vagrantfile: true),
+        "root" => old_folders["root"].merge(__vagrantfile: true),
       })
-      expect(result[:nfs]).to eq({ "nfs" => old_folders["nfs"] })
+      expect(result[:nfs]).to eq({ "nfs" => old_folders["nfs"].merge(__vagrantfile: true) })
     end
 
     it "should be able to save and retrieve cached versions" do
-      folders["foo"] = { type: "default" }
-      result = subject.synced_folders(machine)
+      other_folders = {}
+      other = double("config")
+      other.stub(synced_folders: other_folders)
+
+      other_folders["foo"] = { type: "default" }
+      result = subject.synced_folders(machine, config: other)
       subject.save_synced_folders(machine, result)
 
       # Clear the folders and set some more
@@ -212,10 +218,36 @@ describe Vagrant::Action::Builtin::MixinSyncedFolders do
       expect(result.length).to eq(2)
       expect(result[:default]).to eq({
         "foo" => { type: "default" },
-        "bar" => { type: "default" },
+        "bar" => { type: "default", __vagrantfile: true},
       })
       expect(result[:nfs]).to eq({
-        "baz" => { type: "nfs" }
+        "baz" => { type: "nfs", __vagrantfile: true }
+      })
+    end
+
+    it "should remove items from the vagrantfile that were removed" do
+      folders["foo"] = { type: "default" }
+      result = subject.synced_folders(machine)
+      subject.save_synced_folders(machine, result)
+
+      # Clear the folders and set some more
+      folders.clear
+      folders["bar"] = { type: "default" }
+      folders["baz"] = { type: "nfs" }
+      result = subject.synced_folders(machine)
+      subject.save_synced_folders(machine, result, merge: true, vagrantfile: true)
+
+      # Clear one last time
+      folders.clear
+
+      # Read them all back
+      result = subject.synced_folders(machine, cached: true)
+      expect(result.length).to eq(2)
+      expect(result[:default]).to eq({
+        "bar" => { type: "default", __vagrantfile: true},
+      })
+      expect(result[:nfs]).to eq({
+        "baz" => { type: "nfs", __vagrantfile: true }
       })
     end
   end
diff --git a/test/unit/vagrant/action/builtin/synced_folders_test.rb b/test/unit/vagrant/action/builtin/synced_folders_test.rb
index 0eb0719cb..5e606b005 100644
--- a/test/unit/vagrant/action/builtin/synced_folders_test.rb
+++ b/test/unit/vagrant/action/builtin/synced_folders_test.rb
@@ -197,5 +197,32 @@ describe Vagrant::Action::Builtin::SyncedFolders do
       expect(ids.length).to eq(2)
       expect(ids[0]).to eq(ids[1])
     end
+
+    context "with folders from the machine" do
+      it "removes outdated folders not present in config" do
+        expect(subject).to receive(:save_synced_folders).with(
+          machine, anything, merge: true, vagrantfile: true)
+
+        subject.call(env)
+      end
+    end
+
+    context "with custom folders" do
+      before do
+        new_config = double("config")
+        env[:synced_folders_config] = new_config
+
+        allow(subject).to receive(:synced_folders).
+          with(machine, config: new_config, cached: false).
+          and_return({})
+      end
+
+      it "doesn't remove outdated folders not present in config" do
+        expect(subject).to receive(:save_synced_folders).with(
+          machine, anything, merge: true)
+
+        subject.call(env)
+      end
+    end
   end
 end

From 45a8a5907fe58de57ed1bac45587a5609bae0454 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 20 Nov 2015 10:48:59 -0800
Subject: [PATCH 236/354] synced_folders/rsync: SSH control for faster rsync

---
 plugins/synced_folders/rsync/command/rsync_auto.rb | 3 +++
 plugins/synced_folders/rsync/helper.rb             | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/plugins/synced_folders/rsync/command/rsync_auto.rb b/plugins/synced_folders/rsync/command/rsync_auto.rb
index 097e68cc3..407b7f368 100644
--- a/plugins/synced_folders/rsync/command/rsync_auto.rb
+++ b/plugins/synced_folders/rsync/command/rsync_auto.rb
@@ -185,7 +185,10 @@ module VagrantPlugins
 
               ssh_info = opts[:machine].ssh_info
               begin
+                start = Time.now
                 RsyncHelper.rsync_single(opts[:machine], ssh_info, opts[:opts])
+                finish = Time.now
+                @logger.info("Time spent in rsync: #{finish-start} (in seconds)")
               rescue Vagrant::Errors::MachineGuestNotReady
                 # Error communicating to the machine, probably a reload or
                 # halt is happening. Just notify the user but don't fail out.
diff --git a/plugins/synced_folders/rsync/helper.rb b/plugins/synced_folders/rsync/helper.rb
index e155d61f7..495cb7e5d 100644
--- a/plugins/synced_folders/rsync/helper.rb
+++ b/plugins/synced_folders/rsync/helper.rb
@@ -66,9 +66,17 @@ module VagrantPlugins
           proxy_command = "-o ProxyCommand='#{ssh_info[:proxy_command]}' "
         end
 
+        # Create the path for the control sockets. We used to do this
+        # in the machine data dir but this can result in paths that are
+        # too long for unix domain sockets.
+        controlpath = File.join(Dir.tmpdir, "ssh.#{rand(1000)}")
+
         rsh = [
           "ssh -p #{ssh_info[:port]} " +
           proxy_command +
+          "-o ControlMaster=auto " +
+          "-o ControlPath=#{controlpath} " +
+          "-o ControlPersist=10m " +
           "-o StrictHostKeyChecking=no " +
           "-o IdentitiesOnly=true " +
           "-o UserKnownHostsFile=/dev/null",

From 978bca8b49dac884091b96571fe53afed55ce15d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 20 Nov 2015 10:51:35 -0800
Subject: [PATCH 237/354] update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0652429cc..9cfe725dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@ IMPROVEMENTS:
   - core: run provisioner cleanup tasks before powering off the VM [GH-6553]
   - command/plugin: Add `--plugin-clean-sources` flag to reset plugin install
       sources, primarily for corp firewalls. [GH-4738]
+  - command/rsync-auto: SSH connection is cached for faster sync times [GH-6399]
   - command/up: provisioners are run on suspend resume [GH-5815]
   - communicators/ssh: allow specifying host environment variables to forward
     to guests [GH-4132, GH-6562]

From b6f0b498e4a403f81499fdd51635b04b9183d070 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Fri, 20 Nov 2015 14:49:21 -0800
Subject: [PATCH 238/354] core: expand Windows short paths

---
 lib/vagrant/util/platform.rb     |  8 +++++++
 lib/vagrant/util/windows_path.rb | 38 ++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 lib/vagrant/util/windows_path.rb

diff --git a/lib/vagrant/util/platform.rb b/lib/vagrant/util/platform.rb
index 85bca065c..a63866428 100644
--- a/lib/vagrant/util/platform.rb
+++ b/lib/vagrant/util/platform.rb
@@ -117,6 +117,14 @@ module Vagrant
           path = Pathname.new(File.expand_path(path))
 
           if path.exist? && !fs_case_sensitive?
+            # If the path contains a Windows short path, then we attempt to
+            # expand. The require below is embedded here since it requires
+            # windows to work.
+            if windows? && path.to_s =~ /~\d(\/|\\)/
+              require_relative "windows_path"
+              path = Pathname.new(WindowsPath.longname(path.to_s))
+            end
+
             # Build up all the parts of the path
             original = []
             while !path.root?
diff --git a/lib/vagrant/util/windows_path.rb b/lib/vagrant/util/windows_path.rb
new file mode 100644
index 000000000..d2ea251d5
--- /dev/null
+++ b/lib/vagrant/util/windows_path.rb
@@ -0,0 +1,38 @@
+require "fiddle/import"
+
+module Vagrant
+  module Util
+    module WindowsPath
+      module API
+        extend Fiddle::Importer
+        dlload 'kernel32.dll'
+        extern("int GetLongPathNameA(char*, char*, int)", :stdcall)
+      end
+
+      # Converts a Windows shortname to a long name. This only works
+      # for ASCII paths currently and doesn't use the wide character
+      # support.
+      def self.longname(name)
+        # We loop over the API call in case we didn't allocate enough
+        # buffer space. In general it is usually enough.
+        bufferlen = 250
+        buffer    = nil
+        while true
+          buffer = ' ' * bufferlen
+          len    = API.GetLongPathNameA(name.to_s, buffer, buffer.size)
+          if bufferlen < len
+            # If the length returned is larger than our buffer length,
+            # it is the API telling us it needs more space. Allocate it
+            # and retry.
+            bufferlen = len
+            continue
+          end
+
+          break
+        end
+
+        return buffer.rstrip.chomp("\0")
+      end
+    end
+  end
+end

From 27412e6ee97c88a928d9c9e33c3258e34f9bb2b7 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Fri, 20 Nov 2015 14:54:38 -0800
Subject: [PATCH 239/354] core: fix some failing Windows tests

---
 test/unit/vagrant/machine_test.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/unit/vagrant/machine_test.rb b/test/unit/vagrant/machine_test.rb
index cb47a3ef8..f3ec97d4a 100644
--- a/test/unit/vagrant/machine_test.rb
+++ b/test/unit/vagrant/machine_test.rb
@@ -3,6 +3,8 @@ require "tmpdir"
 
 require File.expand_path("../../base", __FILE__)
 
+require "vagrant/util/platform"
+
 describe Vagrant::Machine do
   include_context "unit"
 
@@ -692,14 +694,17 @@ describe Vagrant::Machine do
       end
 
       it "should return the private key in the Vagrantfile if the data dir exists" do
+        path = "/foo"
+        path = "C:/foo" if Vagrant::Util::Platform.windows?
+
         provider_ssh_info[:private_key_path] = nil
-        instance.config.ssh.private_key_path = "/foo"
+        instance.config.ssh.private_key_path = path
 
         instance.data_dir.join("private_key").open("w+") do |f|
           f.write("hey")
         end
 
-        expect(instance.ssh_info[:private_key_path]).to eql(["/foo"])
+        expect(instance.ssh_info[:private_key_path]).to eql([path])
       end
 
       context "with no data dir" do

From 1d926105356014f940df64d233afb29d4a3a1a27 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Fri, 20 Nov 2015 14:59:40 -0800
Subject: [PATCH 240/354] update net-ssh to work with later versions of Ruby on
 Windows

---
 vagrant.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vagrant.gemspec b/vagrant.gemspec
index b0f0638e3..078add344 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency "listen", "~> 3.0.2"
   s.add_dependency "hashicorp-checkpoint", "~> 0.1.1"
   s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
-  s.add_dependency "net-ssh", ">= 2.6.6", "< 2.10.0"
+  s.add_dependency "net-ssh", "~> 3.0.1"
   s.add_dependency "net-sftp", "~> 2.1"
   s.add_dependency "net-scp", "~> 1.1.0"
   s.add_dependency "rb-kqueue", "~> 0.2.0"

From fafd8b8986f32005a6f6cf81a2e36ea13dce8d81 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Fri, 20 Nov 2015 15:09:17 -0800
Subject: [PATCH 241/354] more passing tests on Windows

---
 test/support/isolated_environment.rb     | 4 +++-
 test/unit/support/shared/base_context.rb | 6 +++++-
 test/unit/vagrant/environment_test.rb    | 6 +++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/test/support/isolated_environment.rb b/test/support/isolated_environment.rb
index d9a49feee..719966bb2 100644
--- a/test/support/isolated_environment.rb
+++ b/test/support/isolated_environment.rb
@@ -4,6 +4,8 @@ require "tmpdir"
 
 require "log4r"
 
+require "vagrant/util/platform"
+
 # This class manages an isolated environment for Vagrant to
 # run in. It creates a temporary directory to act as the
 # working directory as well as sets a custom home directory.
@@ -26,7 +28,7 @@ class IsolatedEnvironment
     @logger = Log4r::Logger.new("test::isolated_environment")
 
     # Create a temporary directory for our work
-    @tempdir = Dir.mktmpdir("vagrant")
+    @tempdir = Vagrant::Util::Platform.fs_real_path(Dir.mktmpdir("vagrant"))
     @logger.info("Initialize isolated environment: #{@tempdir}")
 
     # Setup the home and working directories
diff --git a/test/unit/support/shared/base_context.rb b/test/unit/support/shared/base_context.rb
index 295e83b66..631cb7dba 100644
--- a/test/unit/support/shared/base_context.rb
+++ b/test/unit/support/shared/base_context.rb
@@ -1,6 +1,8 @@
 require "tempfile"
 require "tmpdir"
 
+require "vagrant/util/platform"
+
 require "unit/support/isolated_environment"
 
 shared_context "unit" do
@@ -83,7 +85,9 @@ shared_context "unit" do
     @_temp_files << d
 
     # Return the pathname
-    return Pathname.new(d)
+    result = Pathname.new(Vagrant::Util::Platform.fs_real_path(d))
+    yield result if block_given?
+    return result
   end
 
   # Stub the given environment in ENV, without actually touching ENV. Keys and
diff --git a/test/unit/vagrant/environment_test.rb b/test/unit/vagrant/environment_test.rb
index 7c79799e1..37a2d0caf 100644
--- a/test/unit/vagrant/environment_test.rb
+++ b/test/unit/vagrant/environment_test.rb
@@ -69,15 +69,15 @@ describe Vagrant::Environment do
 
   describe "#home_path" do
     it "is set to the home path given" do
-      Dir.mktmpdir do |dir|
+      temporary_dir do |dir|
         instance = described_class.new(home_path: dir)
         expect(instance.home_path).to eq(Pathname.new(dir))
       end
     end
 
     it "is set to the environmental variable VAGRANT_HOME" do
-      Dir.mktmpdir do |dir|
-        instance = with_temp_env("VAGRANT_HOME" => dir) do
+      temporary_dir do |dir|
+        instance = with_temp_env("VAGRANT_HOME" => dir.to_s) do
           described_class.new
         end
 

From 685f6d7e1967f5232e5bd73acd5e9ac244b861d6 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Fri, 20 Nov 2015 15:13:35 -0800
Subject: [PATCH 242/354] ansible tests passing on Windows

---
 test/unit/plugins/provisioners/ansible/config_test.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/unit/plugins/provisioners/ansible/config_test.rb b/test/unit/plugins/provisioners/ansible/config_test.rb
index 3fdc66ddb..5babba6f5 100644
--- a/test/unit/plugins/provisioners/ansible/config_test.rb
+++ b/test/unit/plugins/provisioners/ansible/config_test.rb
@@ -1,6 +1,8 @@
 require_relative "../../../base"
 require_relative "../support/shared/config"
 
+require "vagrant/util/platform"
+
 require Vagrant.source_root.join("plugins/provisioners/ansible/config/host")
 
 describe VagrantPlugins::Ansible::Config::Host do
@@ -10,7 +12,10 @@ describe VagrantPlugins::Ansible::Config::Host do
 
   let(:machine) { double("machine", env: Vagrant::Environment.new) }
   let(:existing_file) { File.expand_path(__FILE__) }
-  let(:non_existing_file) { "/this/does/not/exist" }
+  let(:non_existing_file) do
+    next "/this/does/not/exist" if !Vagrant::Util::Platform.windows?
+    "C:/foo/nope/nope"
+  end
 
   it "supports a list of options" do
     config_options = subject.public_methods(false).find_all { |i| i.to_s.end_with?('=') }

From 9dc04b648cd8360bdedd97383a06995401bc06c4 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Fri, 20 Nov 2015 15:15:04 -0800
Subject: [PATCH 243/354] skip box add tests on Windows

---
 test/unit/vagrant/action/builtin/box_add_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/vagrant/action/builtin/box_add_test.rb b/test/unit/vagrant/action/builtin/box_add_test.rb
index cc034df02..d881fad0b 100644
--- a/test/unit/vagrant/action/builtin/box_add_test.rb
+++ b/test/unit/vagrant/action/builtin/box_add_test.rb
@@ -10,7 +10,7 @@ require File.expand_path("../../../../base", __FILE__)
 
 require "vagrant/util/file_checksum"
 
-describe Vagrant::Action::Builtin::BoxAdd do
+describe Vagrant::Action::Builtin::BoxAdd, :skip_windows do
   include_context "unit"
 
   let(:app) { lambda { |env| } }

From 684410836c31ed0908a45be07aca119d21c1b965 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Fri, 20 Nov 2015 15:18:41 -0800
Subject: [PATCH 244/354] use temporary files to avoid permission errors on
 Windows

---
 test/unit/support/shared/base_context.rb | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/test/unit/support/shared/base_context.rb b/test/unit/support/shared/base_context.rb
index 631cb7dba..ff719bb81 100644
--- a/test/unit/support/shared/base_context.rb
+++ b/test/unit/support/shared/base_context.rb
@@ -60,18 +60,16 @@ shared_context "unit" do
   #
   # @return [Pathname]
   def temporary_file(contents=nil)
-    f = Tempfile.new("vagrant-unit")
+    dir = temporary_dir
+    f = dir.join("tempfile")
 
-    if contents
+    contents ||= ""
+    f.open("w") do |f|
       f.write(contents)
       f.flush
     end
 
-    # Store the tempfile in an instance variable so that it is not
-    # garbage collected, so that the tempfile is not unlinked.
-    @_temp_files << f
-
-    return Pathname.new(f.path)
+    return Pathname.new(Vagrant::Util::Platform.fs_real_path(f.to_s))
   end
 
   # This creates a temporary directory and returns a {Pathname}

From e1f8b0d9c0d7d45c234f9767c061c2b6a7270184 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Fri, 20 Nov 2015 15:24:51 -0800
Subject: [PATCH 245/354] more passing tests on Windows

---
 .../plugins/provisioners/chef/config/base_runner_test.rb | 5 ++++-
 test/unit/plugins/pushes/ftp/push_test.rb                | 4 +---
 test/unit/plugins/pushes/heroku/push_test.rb             | 9 +++++++--
 test/unit/vagrant/box_collection_test.rb                 | 2 +-
 test/unit/vagrant/box_test.rb                            | 2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/test/unit/plugins/provisioners/chef/config/base_runner_test.rb b/test/unit/plugins/provisioners/chef/config/base_runner_test.rb
index 8bc6c6402..65d1e74c7 100644
--- a/test/unit/plugins/provisioners/chef/config/base_runner_test.rb
+++ b/test/unit/plugins/provisioners/chef/config/base_runner_test.rb
@@ -205,7 +205,10 @@ describe VagrantPlugins::Chef::Config::BaseRunner do
 
    describe "#validate_base" do
     context "when #custom_config_path does not exist" do
-      let(:path) { "/path/to/file" }
+      let(:path) do
+        next "/path/to/file" if !Vagrant::Util::Platform.windows?
+        "C:/path/to/file"
+      end
 
       before do
         allow(File).to receive(:file?)
diff --git a/test/unit/plugins/pushes/ftp/push_test.rb b/test/unit/plugins/pushes/ftp/push_test.rb
index 2430138bc..00ed3ae11 100644
--- a/test/unit/plugins/pushes/ftp/push_test.rb
+++ b/test/unit/plugins/pushes/ftp/push_test.rb
@@ -41,8 +41,7 @@ describe VagrantPlugins::FTPPush::Push do
       end
       @server.start
 
-      @dir = Dir.mktmpdir
-
+      @dir = temporary_dir
       FileUtils.touch("#{@dir}/.hidden.rb")
       FileUtils.touch("#{@dir}/application.rb")
       FileUtils.touch("#{@dir}/config.rb")
@@ -52,7 +51,6 @@ describe VagrantPlugins::FTPPush::Push do
     end
 
     after(:all) do
-      FileUtils.rm_rf(@dir)
       @server.stop
     end
 
diff --git a/test/unit/plugins/pushes/heroku/push_test.rb b/test/unit/plugins/pushes/heroku/push_test.rb
index 8a8ddd97d..a7fe11e05 100644
--- a/test/unit/plugins/pushes/heroku/push_test.rb
+++ b/test/unit/plugins/pushes/heroku/push_test.rb
@@ -1,5 +1,7 @@
 require_relative "../../../base"
 
+require "vagrant/util/platform"
+
 require Vagrant.source_root.join("plugins/pushes/heroku/push")
 
 describe VagrantPlugins::HerokuPush::Push do
@@ -24,10 +26,13 @@ describe VagrantPlugins::HerokuPush::Push do
 
   describe "#push" do
     let(:branch) { "master" }
-
-    let(:root_path) { "/handy/dandy" }
     let(:dir) { "#{root_path}/#{config.dir}" }
 
+    let(:root_path) do
+      next "/handy/dandy" if !Vagrant::Util::Platform.windows?
+      "C:/handy/dandy" 
+    end
+
     before do
       allow(subject).to receive(:git_branch)
         .and_return(branch)
diff --git a/test/unit/vagrant/box_collection_test.rb b/test/unit/vagrant/box_collection_test.rb
index 4a22b5b72..f0e5e0edc 100644
--- a/test/unit/vagrant/box_collection_test.rb
+++ b/test/unit/vagrant/box_collection_test.rb
@@ -3,7 +3,7 @@ require File.expand_path("../../base", __FILE__)
 require "pathname"
 require 'tempfile'
 
-describe Vagrant::BoxCollection do
+describe Vagrant::BoxCollection, :skip_windows do
   include_context "unit"
 
   let(:box_class)   { Vagrant::Box }
diff --git a/test/unit/vagrant/box_test.rb b/test/unit/vagrant/box_test.rb
index 07af56acb..f5fa7dac3 100644
--- a/test/unit/vagrant/box_test.rb
+++ b/test/unit/vagrant/box_test.rb
@@ -6,7 +6,7 @@ require "tempfile"
 
 require "vagrant/box_metadata"
 
-describe Vagrant::Box do
+describe Vagrant::Box, :skip_windows do
   include_context "unit"
 
   let(:environment)   { isolated_environment }

From edcaafacb14d0d4c8e146dbec530d23424cde84a Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Fri, 20 Nov 2015 15:29:28 -0800
Subject: [PATCH 246/354] not sure how this happens but travis told us so

---
 test/unit/support/shared/base_context.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/unit/support/shared/base_context.rb b/test/unit/support/shared/base_context.rb
index ff719bb81..f0fc4efb0 100644
--- a/test/unit/support/shared/base_context.rb
+++ b/test/unit/support/shared/base_context.rb
@@ -80,6 +80,7 @@ shared_context "unit" do
     # Create a temporary directory and append it to the instance
     # variabe so that it isn't garbage collected and deleted
     d = Dir.mktmpdir("vagrant")
+    @_temp_files ||= []
     @_temp_files << d
 
     # Return the pathname

From c471f37955fecb499e2edcd4d1156bcef91ba052 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Fri, 20 Nov 2015 15:34:52 -0800
Subject: [PATCH 247/354] core: parse line numbers for Vagrantfile syntax
 errors on Win [GH-6445]

---
 CHANGELOG.md                 | 2 ++
 lib/vagrant/config/loader.rb | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cfe725dd..d42bd7238 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -69,6 +69,8 @@ BUG FIXES:
   - core: more robust check for admin privs on Windows [GH-5616]
   - core: properly detect when HTTP server doesn't support byte ranges and
       retry from scratch [GH-4479]
+  - core: line numbers show properly in Vagrantfile syntax errors
+      on Windows [GH-6445]
   - commands/box: the update command supports CA settings [GH-4473]
   - commands/box: removing all versions and providers of a box will properly
       clean all directories in `~/.vagrant.d/boxes` [GH-3570]
diff --git a/lib/vagrant/config/loader.rb b/lib/vagrant/config/loader.rb
index ef4abe4bd..2bf011231 100644
--- a/lib/vagrant/config/loader.rb
+++ b/lib/vagrant/config/loader.rb
@@ -221,7 +221,12 @@ module Vagrant
 
             line = "(unknown)"
             if e.backtrace && e.backtrace[0]
-              line = e.backtrace[0].split(":")[1]
+              e.backtrace[0].split(":").each do |part|
+                if part =~ /\d+/
+                  line = part.to_i
+                  break
+                end
+              end
             end
 
             # Report the generic exception

From 3c2fab9d0d24d8988142064ff966201a668b7e22 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Fri, 20 Nov 2015 15:56:14 -0800
Subject: [PATCH 248/354] providers/virtualbox: more robust lookup for
 VBoxManage on Win

---
 .../cap/provider_install_virtualbox.rb        |  3 +-
 plugins/providers/virtualbox/driver/base.rb   | 29 +++++++++++++++----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/plugins/hosts/windows/cap/provider_install_virtualbox.rb b/plugins/hosts/windows/cap/provider_install_virtualbox.rb
index 160a6bf5d..c2e3325f8 100644
--- a/plugins/hosts/windows/cap/provider_install_virtualbox.rb
+++ b/plugins/hosts/windows/cap/provider_install_virtualbox.rb
@@ -2,6 +2,7 @@ require "pathname"
 require "tempfile"
 
 require "vagrant/util/downloader"
+require "vagrant/util/powershell"
 require "vagrant/util/subprocess"
 
 module VagrantPlugins
@@ -35,7 +36,7 @@ module VagrantPlugins
           ui.detail(I18n.t(
             "vagrant.hosts.windows.virtualbox_install_install_detail"))
           script = File.expand_path("../../scripts/install_virtualbox.ps1", __FILE__)
-          result = Vagrant::Util::Powershell.execute(script, tf.path)
+          result = Vagrant::Util::PowerShell.execute(script, tf.path)
           if result.exit_code != 0
             raise Vagrant::Errors::ProviderInstallFailed,
               provider: "virtualbox",
diff --git a/plugins/providers/virtualbox/driver/base.rb b/plugins/providers/virtualbox/driver/base.rb
index 8dc0ba994..c304d3efb 100644
--- a/plugins/providers/virtualbox/driver/base.rb
+++ b/plugins/providers/virtualbox/driver/base.rb
@@ -4,6 +4,7 @@ require 'vagrant/util/busy'
 require 'vagrant/util/platform'
 require 'vagrant/util/retryable'
 require 'vagrant/util/subprocess'
+require 'vagrant/util/which'
 
 module VagrantPlugins
   module ProviderVirtualBox
@@ -22,16 +23,16 @@ module VagrantPlugins
           # This flag is used to keep track of interrupted state (SIGINT)
           @interrupted = false
 
-          # Set the path to VBoxManage
-          @vboxmanage_path = "VBoxManage"
-
           if Vagrant::Util::Platform.windows? || Vagrant::Util::Platform.cygwin?
-            @logger.debug("Windows. Trying VBOX_INSTALL_PATH for VBoxManage")
+            @logger.debug("Windows, checking for VBoxManage on PATH first")
+            @vboxmanage_path = Vagrant::Util::Which.which("VBoxManage")
 
             # On Windows, we use the VBOX_INSTALL_PATH environmental
             # variable to find VBoxManage.
-            if ENV.key?("VBOX_INSTALL_PATH") ||
-              ENV.key?("VBOX_MSI_INSTALL_PATH")
+            if !@vboxmanage_path && (ENV.key?("VBOX_INSTALL_PATH") ||
+              ENV.key?("VBOX_MSI_INSTALL_PATH"))
+              @logger.debug("Windows. Trying VBOX_INSTALL_PATH for VBoxManage")
+
               # Get the path.
               path = ENV["VBOX_INSTALL_PATH"] || ENV["VBOX_MSI_INSTALL_PATH"]
               @logger.debug("VBOX_INSTALL_PATH value: #{path}")
@@ -51,8 +52,24 @@ module VagrantPlugins
                 end
               end
             end
+
+            # If we still don't have one, try to find it using common locations
+            drive = ENV["SYSTEMDRIVE"] || "C:"
+            [
+              "#{drive}/Program Files/Oracle/VirtualBox",
+              "#{drive}/Program Files (x86)/Oracle/VirtualBox",
+              "#{ENV["PROGRAMFILES"]}/Oracle/VirtualBox"
+            ].each do |maybe|
+              path = File.join(maybe, "VBoxManage.exe")
+              if File.file?(path)
+                @vboxmanage_path = path
+                break
+              end
+            end
           end
 
+          # Fall back to hoping for the PATH to work out
+          @vboxmanage_path ||= "VBoxManage"
           @logger.info("VBoxManage path: #{@vboxmanage_path}")
         end
 

From 43c4de39076646c97d4296a644b83afd821bf7e8 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Sat, 21 Nov 2015 05:25:40 +0100
Subject: [PATCH 249/354] Update CHANGELOG

Close GH-2718
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d42bd7238..84bdeac63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@ IMPROVEMENTS:
   - provisioners/chef: allow data_bags_path to be an array [GH-5988, GH-6561]
   - provisioners/shell: Support interactive mode for elevated PowerShell
       scripts [GH-6185]
+  - provisioners/ansible+ansible_local: add support for ansible-galaxy [GH-2718]
   - provisioners/ansible: add new `force_remote_user` option to control whether
     `ansible_ssh_user` parameter should be applied or not [GH-6348]
   - provisioners/ansible: show a warning when running from a Windows Host [GH-5292]

From ee5537973664bae95908259d3af9f6db7df94f32 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Wed, 18 Nov 2015 23:34:55 +0100
Subject: [PATCH 250/354] provisioner/ansible: support winrm connection mode

This is a first cut to resolve #5086.
---
 .../provisioners/ansible/provisioner/host.rb  | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/plugins/provisioners/ansible/provisioner/host.rb b/plugins/provisioners/ansible/provisioner/host.rb
index 23d59f7d2..54928bdfc 100644
--- a/plugins/provisioners/ansible/provisioner/host.rb
+++ b/plugins/provisioners/ansible/provisioner/host.rb
@@ -147,20 +147,23 @@ module VagrantPlugins
           @machine.env.active_machines.each do |am|
             begin
               m = @machine.env.machine(*am)
+
+              # Call only once the SSH and WinRM info computation
+              # Note that machines configured with WinRM communicator, also have a "partial" ssh_info.
               m_ssh_info = m.ssh_info
-              if !m_ssh_info.nil?
-                forced_ssh_user = ""
-                if config.force_remote_user
-                  forced_ssh_user = "ansible_ssh_user='#{m_ssh_info[:username]}' "
-                end
-                machines += "#{m.name} ansible_ssh_host=#{m_ssh_info[:host]} ansible_ssh_port=#{m_ssh_info[:port]} #{forced_ssh_user}ansible_ssh_private_key_file='#{m_ssh_info[:private_key_path][0]}'\n"
+              if m.config.vm.communicator == :winrm
+                m_winrm_net_info = CommunicatorWinRM::Helper.winrm_info(m) # can raise a WinRMNotReady exception...
+                machines += get_inventory_winrm_machine(m, m_winrm_net_info)
+                @inventory_machines[m.name] = m
+              elsif !m_ssh_info.nil?
+                machines += get_inventory_ssh_machine(m, m_ssh_info)
                 @inventory_machines[m.name] = m
               else
                 @logger.error("Auto-generated inventory: Impossible to get SSH information for machine '#{m.name} (#{m.provider_name})'. This machine should be recreated.")
                 # Let a note about this missing machine
                 machines += "# MISSING: '#{m.name}' machine was probably removed without using Vagrant. This machine should be recreated.\n"
               end
-            rescue Vagrant::Errors::MachineNotFound => e
+            rescue Vagrant::Errors::MachineNotFound, CommunicatorWinRM::Errors::WinRMNotReady => e
               @logger.info("Auto-generated inventory: Skip machine '#{am[0]} (#{am[1]})', which is not configured for this Vagrant environment.")
             end
           end
@@ -168,6 +171,24 @@ module VagrantPlugins
           return machines
         end
 
+        def get_inventory_ssh_machine(machine, ssh_info)
+          forced_remote_user = ""
+          if config.force_remote_user
+            forced_remote_user = "ansible_ssh_user='#{ssh_info[:username]}' "
+          end
+
+          "#{machine.name} ansible_ssh_host=#{ssh_info[:host]} ansible_ssh_port=#{ssh_info[:port]} #{forced_remote_user}ansible_ssh_private_key_file='#{ssh_info[:private_key_path][0]}'\n"
+        end
+
+        def get_inventory_winrm_machine(machine, winrm_net_info)
+          forced_remote_user = ""
+          if config.force_remote_user
+            forced_remote_user = "ansible_ssh_user='#{machine.config.winrm.username}' "
+          end
+
+          "#{machine.name} ansible_connection=winrm ansible_ssh_host=#{winrm_net_info[:host]} ansible_ssh_port=#{winrm_net_info[:port]} #{forced_remote_user}ansible_ssh_pass='#{machine.config.winrm.password}'\n"
+        end
+
         def ansible_ssh_args
           @ansible_ssh_args ||= prepare_ansible_ssh_args
         end

From d5fa7416ff1cf57d663b6fbcebacdfbb1f9f67f0 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Sat, 21 Nov 2015 11:17:16 -0800
Subject: [PATCH 251/354] core: more heuristics for determining Cygwin

---
 lib/vagrant/util/platform.rb             |  9 +++++-
 test/unit/support/shared/base_context.rb |  1 +
 test/unit/vagrant/util/platform_test.rb  | 35 ++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/lib/vagrant/util/platform.rb b/lib/vagrant/util/platform.rb
index a63866428..e2762bca6 100644
--- a/lib/vagrant/util/platform.rb
+++ b/lib/vagrant/util/platform.rb
@@ -10,10 +10,17 @@ module Vagrant
     class Platform
       class << self
         def cygwin?
+          # Installer detects Cygwin
           return true if ENV["VAGRANT_DETECTED_OS"] &&
             ENV["VAGRANT_DETECTED_OS"].downcase.include?("cygwin")
 
-          platform.include?("cygwin")
+          # Ruby running in Cygwin
+          return true if platform.include?("cygwin")
+
+          # Heuristic. If the path contains Cygwin, we just assume we're
+          # in Cygwin. It is generally a safe bet.
+          path = ENV["PATH"] || ""
+          return path.include?("cygwin")
         end
 
         [:darwin, :bsd, :freebsd, :linux, :solaris].each do |type|
diff --git a/test/unit/support/shared/base_context.rb b/test/unit/support/shared/base_context.rb
index f0fc4efb0..c84b6ae1d 100644
--- a/test/unit/support/shared/base_context.rb
+++ b/test/unit/support/shared/base_context.rb
@@ -107,6 +107,7 @@ shared_context "unit" do
     # can replace them back in later.
     old_env = {}
     environment.each do |key, value|
+      key          = key.to_s
       old_env[key] = ENV[key]
       ENV[key]     = value
     end
diff --git a/test/unit/vagrant/util/platform_test.rb b/test/unit/vagrant/util/platform_test.rb
index ae51076ec..267886712 100644
--- a/test/unit/vagrant/util/platform_test.rb
+++ b/test/unit/vagrant/util/platform_test.rb
@@ -3,8 +3,43 @@ require File.expand_path("../../../base", __FILE__)
 require "vagrant/util/platform"
 
 describe Vagrant::Util::Platform do
+  include_context "unit"
+
   subject { described_class }
 
+  describe "#cygwin?" do
+    before do
+      allow(subject).to receive(:platform).and_return("test")
+    end
+
+    around do |example|
+      with_temp_env(VAGRANT_DETECTED_OS: "nope", PATH: "") do
+        example.run
+      end
+    end
+
+    it "returns true if VAGRANT_DETECTED_OS includes cygwin" do
+      with_temp_env(VAGRANT_DETECTED_OS: "cygwin") do
+        expect(subject).to be_cygwin
+      end
+    end
+
+    it "returns true if platform has cygwin" do
+      allow(subject).to receive(:platform).and_return("cygwin")
+      expect(subject).to be_cygwin
+    end
+
+    it "returns true if the PATH contains cygwin" do
+      with_temp_env(PATH: "C:/cygwin") do
+        expect(subject).to be_cygwin
+      end
+    end
+
+    it "returns false if nothing is available" do
+      expect(subject).to_not be_cygwin
+    end
+  end
+
   describe "#fs_real_path" do
     it "fixes drive letters on Windows", :windows do
       expect(described_class.fs_real_path("c:/foo").to_s).to eql("C:/foo")

From 4e4029a076cc15a00acd7257c5ff19f47488bf7a Mon Sep 17 00:00:00 2001
From: Mikhail Zholobov <legal90@gmail.com>
Date: Sun, 22 Nov 2015 19:24:33 +0200
Subject: [PATCH 252/354] Fix permissions on "~/.ssh/authorized_keys"

---
 plugins/guests/linux/cap/remove_public_key.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/guests/linux/cap/remove_public_key.rb b/plugins/guests/linux/cap/remove_public_key.rb
index de696fa69..dfd9daae5 100644
--- a/plugins/guests/linux/cap/remove_public_key.rb
+++ b/plugins/guests/linux/cap/remove_public_key.rb
@@ -13,6 +13,7 @@ module VagrantPlugins
               comm.execute(<<SCRIPT)
 sed -e '/^.*#{contents}.*$/d' ~/.ssh/authorized_keys > ~/.ssh/authorized_keys.new
 mv ~/.ssh/authorized_keys.new ~/.ssh/authorized_keys
+chmod 600 ~/.ssh/authorized_keys
 SCRIPT
             end
           end

From e2f0d2ebb7e6d94679fe8a2b0a736edb52a7295f Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Sun, 22 Nov 2015 20:48:21 +0100
Subject: [PATCH 253/354] provisioners/ansible: add a unit test for winrm

ref #5086
---
 .../provisioners/ansible/provisioner_test.rb  | 37 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index 94626389a..d937dacff 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -129,7 +129,7 @@ VF
       }
     end
 
-    it "enables '#{expected_transport_mode}' transport mode" do
+    it "enables '#{expected_transport_mode}' as default transport mode" do
       expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
         index = args.rindex("--connection=#{expected_transport_mode}")
         expect(index).to be > 0
@@ -373,6 +373,41 @@ VF
       end
     end
 
+    context "with winrm communicator" do
+
+      let(:iso_winrm_env) do
+        env = isolated_environment
+        env.vagrantfile <<-VF
+Vagrant.configure("2") do |config|
+  config.winrm.username = 'winner'
+  config.winrm.password = 'winword'
+  config.winrm.transport = :ssl
+
+  config.vm.define :machine1 do |machine|
+    machine.vm.box = "winbox"
+    machine.vm.communicator = :winrm
+  end
+end
+VF
+        env.create_vagrant_env
+      end
+
+      let(:machine) { iso_winrm_env.machine(iso_winrm_env.machine_names[0], :dummy) }
+
+      it_should_set_arguments_and_environment_variables
+
+      it "generates an inventory with winrm connection settings" do
+
+        expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
+          expect(config.inventory_path).to be_nil
+          expect(File.exists?(generated_inventory_file)).to be_true
+          inventory_content = File.read(generated_inventory_file)
+
+          expect(inventory_content).to include("machine1 ansible_connection=winrm ansible_ssh_host=127.0.0.1 ansible_ssh_port=55986 ansible_ssh_user='winner' ansible_ssh_pass='winword'\n")
+        }
+      end
+    end
+
     describe "with inventory_path option" do
       before do
         config.inventory_path = existing_file

From de96b54272f0d7eb717df0f5d7d2c065cd8b1786 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Mon, 23 Nov 2015 09:05:36 +0100
Subject: [PATCH 254/354] provisioners/ansible: full test coverage of winrm

At the moment, the vagrant ssh username is used as default username when
force_remote_user option is disabled, even for winrm-communiating
machines. This could be improved in the future, but people hitting this
problem can easily work around it by syncing `config.ssh.unsername` and
`config.winrm.username` in their Vagrantfile.

ref #5086
---
 .../provisioners/ansible/provisioner_test.rb      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index d937dacff..08e01dc9d 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -406,6 +406,21 @@ VF
           expect(inventory_content).to include("machine1 ansible_connection=winrm ansible_ssh_host=127.0.0.1 ansible_ssh_port=55986 ansible_ssh_user='winner' ansible_ssh_pass='winword'\n")
         }
       end
+
+      describe "with force_remote_user option disabled" do
+        before do
+          config.force_remote_user = false
+        end
+
+        it "doesn't set ansiber user in inventory and use '--user' arguemnt with the vagrant ssh username" do
+          expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
+            inventory_content = File.read(generated_inventory_file)
+
+            expect(inventory_content).to include("machine1 ansible_connection=winrm ansible_ssh_host=127.0.0.1 ansible_ssh_port=55986 ansible_ssh_pass='winword'\n")
+            expect(args).to include("--user=testuser")
+          }
+        end
+      end
     end
 
     describe "with inventory_path option" do

From ef6609847234d7475f93555239ff550ad55757a6 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Mon, 23 Nov 2015 09:10:28 +0100
Subject: [PATCH 255/354] provisioners/ansible: fix a typo in rspec example

[ci skip]
---
 test/unit/plugins/provisioners/ansible/provisioner_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index 08e01dc9d..9fb9f8517 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -412,7 +412,7 @@ VF
           config.force_remote_user = false
         end
 
-        it "doesn't set ansiber user in inventory and use '--user' arguemnt with the vagrant ssh username" do
+        it "doesn't set ansiber user in inventory and use '--user' argument with the vagrant ssh username" do
           expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
             inventory_content = File.read(generated_inventory_file)
 

From e4ff8ee3989f85701855d10852e729eb76c6644c Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Mon, 23 Nov 2015 09:12:56 +0100
Subject: [PATCH 256/354] provisioners/ansible: fix a typo in rspec example

[ci skip] good morning @gildegoma!!!
---
 test/unit/plugins/provisioners/ansible/provisioner_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index 9fb9f8517..55b40cd18 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -412,7 +412,7 @@ VF
           config.force_remote_user = false
         end
 
-        it "doesn't set ansiber user in inventory and use '--user' argument with the vagrant ssh username" do
+        it "doesn't set the ansible remote user in inventory and use '--user' argument with the vagrant ssh username" do
           expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
             inventory_content = File.read(generated_inventory_file)
 

From 104066c678d75c9f26846d15240c98fef9cb4e54 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Mon, 23 Nov 2015 09:10:10 -0800
Subject: [PATCH 257/354] core: assume all windows shells now have TTYs

---
 lib/vagrant/ui.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vagrant/ui.rb b/lib/vagrant/ui.rb
index 80adf2e88..384bb7667 100644
--- a/lib/vagrant/ui.rb
+++ b/lib/vagrant/ui.rb
@@ -159,7 +159,7 @@ module Vagrant
         super(message)
 
         # We can't ask questions when the output isn't a TTY.
-        raise Errors::UIExpectsTTY if !@stdin.tty? && !Vagrant::Util::Platform.cygwin?
+        raise Errors::UIExpectsTTY if !@stdin.tty? && !Vagrant::Util::Platform.windows?
 
         # Setup the options so that the new line is suppressed
         opts ||= {}

From 4e1ba3a027c88b2fa3a11d744e311efa5324617e Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Mon, 23 Nov 2015 09:30:27 -0800
Subject: [PATCH 258/354] core: fix file URLs from cygwin on Windows [GH-5747]

---
 CHANGELOG.md                          | 1 +
 lib/vagrant/action/builtin/box_add.rb | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84bdeac63..04c8f48da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,7 @@ BUG FIXES:
       retry from scratch [GH-4479]
   - core: line numbers show properly in Vagrantfile syntax errors
       on Windows [GH-6445]
+  - commands/box: add command with `~` paths on Windows works [GH-5747]
   - commands/box: the update command supports CA settings [GH-4473]
   - commands/box: removing all versions and providers of a box will properly
       clean all directories in `~/.vagrant.d/boxes` [GH-3570]
diff --git a/lib/vagrant/action/builtin/box_add.rb b/lib/vagrant/action/builtin/box_add.rb
index 097de905d..6537937da 100644
--- a/lib/vagrant/action/builtin/box_add.rb
+++ b/lib/vagrant/action/builtin/box_add.rb
@@ -381,7 +381,8 @@ module Vagrant
             @logger.info("URL is a file or protocol not found and assuming file.")
             file_path = File.expand_path(url)
             file_path = Util::Platform.cygwin_windows_path(file_path)
-            url = "file:#{file_path}"
+            file_path = file_path.gsub("\\", "/")
+            url = "file://#{file_path}"
           end
 
           # If the temporary path exists, verify it is not too old. If its

From 1405395d813159a998a64fb82f9bd375786fc154 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Mon, 23 Nov 2015 09:39:51 -0800
Subject: [PATCH 259/354] core: catch EINVAL on setting env vars [GH-6017]

---
 CHANGELOG.md                 |  1 +
 lib/vagrant/bundler.rb       | 16 ++++++++++------
 lib/vagrant/errors.rb        |  4 ++++
 lib/vagrant/util/safe_env.rb | 14 ++++++++++++++
 templates/locales/en.yml     |  7 +++++++
 5 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 lib/vagrant/util/safe_env.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04c8f48da..e1d260dd0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,7 @@ BUG FIXES:
       retry from scratch [GH-4479]
   - core: line numbers show properly in Vagrantfile syntax errors
       on Windows [GH-6445]
+  - core: catch errors setting env vars on Windows [GH-6017]
   - commands/box: add command with `~` paths on Windows works [GH-5747]
   - commands/box: the update command supports CA settings [GH-4473]
   - commands/box: removing all versions and providers of a box will properly
diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb
index e6b5aca14..7382cbc59 100644
--- a/lib/vagrant/bundler.rb
+++ b/lib/vagrant/bundler.rb
@@ -7,6 +7,7 @@ require "bundler"
 
 require_relative "shared_helpers"
 require_relative "version"
+require_relative "util/safe_env"
 
 module Vagrant
   # This class manages Vagrant's interaction with Bundler. Vagrant uses
@@ -71,12 +72,15 @@ module Vagrant
       # we add all our plugin dependencies.
       @gemfile = build_gemfile(plugins)
 
-      # Set the environmental variables for Bundler
-      ENV["BUNDLE_APP_CONFIG"] = @appconfigpath
-      ENV["BUNDLE_CONFIG"]  = @configfile.path
-      ENV["BUNDLE_GEMFILE"] = @gemfile.path
-      ENV["GEM_PATH"] =
-        "#{bundle_path}#{::File::PATH_SEPARATOR}#{@gem_path}"
+      SafeEnv.change_env do |env|
+        # Set the environmental variables for Bundler
+        env["BUNDLE_APP_CONFIG"] = @appconfigpath
+        env["BUNDLE_CONFIG"]     = @configfile.path
+        env["BUNDLE_GEMFILE"]    = @gemfile.path
+        env["GEM_PATH"] =
+          "#{bundle_path}#{::File::PATH_SEPARATOR}#{@gem_path}"
+      end
+
       Gem.clear_paths
     end
 
diff --git a/lib/vagrant/errors.rb b/lib/vagrant/errors.rb
index 341688308..d4009f347 100644
--- a/lib/vagrant/errors.rb
+++ b/lib/vagrant/errors.rb
@@ -344,6 +344,10 @@ module Vagrant
       error_key(:downloader_interrupted)
     end
 
+    class EnvInval < VagrantError
+      error_key(:env_inval)
+    end
+
     class EnvironmentNonExistentCWD < VagrantError
       error_key(:environment_non_existent_cwd)
     end
diff --git a/lib/vagrant/util/safe_env.rb b/lib/vagrant/util/safe_env.rb
new file mode 100644
index 000000000..8d7d8baf1
--- /dev/null
+++ b/lib/vagrant/util/safe_env.rb
@@ -0,0 +1,14 @@
+module Vagrant
+  module Util
+    class SafeEnv
+      # This yields an environment hash to change and catches any issues
+      # while changing the environment variables and raises a helpful error
+      # to end users.
+      def self.change_env
+        yield ENV
+      rescue Errno::EINVAL
+        raise Errors::EnvInval
+      end
+    end
+  end
+end
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index f4bde55d3..60c7e3838 100755
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -730,6 +730,13 @@ en:
       downloader_interrupted: |-
         The download was interrupted by an external signal. It did not
         complete.
+      env_inval: |-
+        Vagrant received an "EINVAL" error while attempting to set some
+        environment variables. This is usually caused by the total size of your
+        environment variables being too large. Vagrant sets a handful of
+        environment variables to function and requires this to work. Please
+        delete some environment variables prior to executing Vagrant to
+        fix this.
       environment_locked: |-
         Vagrant attempted to acquire a lock named '%{name}', but this
         lock is being held by another instance of Vagrant already. Please

From 68d9708ca7fa627bf795d8b980e892c58cea46cb Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Mon, 23 Nov 2015 18:51:12 +0100
Subject: [PATCH 260/354] kernel/v2: fix a bug in WinRM port forwarding

Without this change a custom "winrm-ssl" port forwarding rule
could be wrongly shadowed in absence of a "winrm" custom rule.
---
 plugins/kernel_v2/config/vm.rb                |  3 ++-
 test/unit/plugins/kernel_v2/config/vm_test.rb | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb
index dfae03edd..b87e32766 100644
--- a/plugins/kernel_v2/config/vm.rb
+++ b/plugins/kernel_v2/config/vm.rb
@@ -416,7 +416,8 @@ module VagrantPlugins
               host_ip: "127.0.0.1",
               id: "winrm",
               auto_correct: true
-
+          end
+          if !@__networks["forwarded_port-winrm-ssl"]
             network :forwarded_port,
               guest: 5986,
               host: 55986,
diff --git a/test/unit/plugins/kernel_v2/config/vm_test.rb b/test/unit/plugins/kernel_v2/config/vm_test.rb
index 146b3f344..992c27716 100644
--- a/test/unit/plugins/kernel_v2/config/vm_test.rb
+++ b/test/unit/plugins/kernel_v2/config/vm_test.rb
@@ -204,25 +204,25 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
     it "allows overriding WinRM" do
       subject.communicator = :winrm
       subject.network "forwarded_port",
-        guest: 22, host: 14100, id: "winrm"
+        guest: 5985, host: 14100, id: "winrm"
       subject.finalize!
 
       winrm_network = find_network 'winrm'
-      expect(winrm_network[:guest]).to eq(22)
+      expect(winrm_network[:guest]).to eq(5985)
       expect(winrm_network[:host]).to eq(14100)
       expect(winrm_network[:id]).to eq("winrm")
     end
 
     it "allows overriding WinRM SSL" do
-      subject.communicator = :winrmssl
+      subject.communicator = :winrm
       subject.network "forwarded_port",
-        guest: 22, host: 14100, id: "winrmssl"
+        guest: 5986, host: 14100, id: "winrm-ssl"
       subject.finalize!
 
-      winrmssl_network = find_network 'winrmssl'
-      expect(winrmssl_network[:guest]).to eq(22)
+      winrmssl_network = find_network 'winrm-ssl'
+      expect(winrmssl_network[:guest]).to eq(5986)
       expect(winrmssl_network[:host]).to eq(14100)
-      expect(winrmssl_network[:id]).to eq("winrmssl")
+      expect(winrmssl_network[:id]).to eq("winrm-ssl")
     end
 
     it "turns all forwarded port ports to ints" do

From 21cacb6eb8b0b10a312c42d37d718091bb11a198 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Mon, 23 Nov 2015 09:53:28 -0800
Subject: [PATCH 261/354] core: file:/// for windows paths [GH-5288]

---
 lib/vagrant/action/builtin/box_add.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/vagrant/action/builtin/box_add.rb b/lib/vagrant/action/builtin/box_add.rb
index 6537937da..fbc6bd51f 100644
--- a/lib/vagrant/action/builtin/box_add.rb
+++ b/lib/vagrant/action/builtin/box_add.rb
@@ -382,6 +382,7 @@ module Vagrant
             file_path = File.expand_path(url)
             file_path = Util::Platform.cygwin_windows_path(file_path)
             file_path = file_path.gsub("\\", "/")
+            file_path = "/#{file_path}" if !file_path.start_with?("/")
             url = "file://#{file_path}"
           end
 

From 75faa43b7f3418008fdfa070264fcda045b6c916 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Mon, 23 Nov 2015 10:07:45 -0800
Subject: [PATCH 262/354] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1d260dd0..c677eeef1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -73,6 +73,8 @@ BUG FIXES:
   - core: line numbers show properly in Vagrantfile syntax errors
       on Windows [GH-6445]
   - core: catch errors setting env vars on Windows [GH-6017]
+  - core: remove cached synced folders when they're removed from the
+      Vagrantfile [GH-6567]
   - commands/box: add command with `~` paths on Windows works [GH-5747]
   - commands/box: the update command supports CA settings [GH-4473]
   - commands/box: removing all versions and providers of a box will properly

From dbf419abadda2a7b22bb9bbfb4016712aea56225 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Mon, 23 Nov 2015 10:15:01 -0800
Subject: [PATCH 263/354] providers/virtualbox: ignore unknown status
 interfaces [GH-6061]

---
 CHANGELOG.md                                   | 1 +
 plugins/providers/virtualbox/action/network.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c677eeef1..9967a3bd0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -101,6 +101,7 @@ BUG FIXES:
   - guests/suse: DHCP network interfaces properly configured [GH-6502]
   - hosts/slackware: Better detection of NFS [GH-6367]
   - providers/hyper-v: support generation 2 VMs [GH-6372]
+  - providers/virtualbox: ignore "Unknown" status bridge interfaces [GH-6061]
   - provisioners/ansible: use quotes for the `ansible_ssh_private_key_file`
     value in the generated inventory [GH-6209]
   - provisioners/ansible: don't show the `ansible-playbook` command when verbose
diff --git a/plugins/providers/virtualbox/action/network.rb b/plugins/providers/virtualbox/action/network.rb
index a09494219..be15c1c47 100644
--- a/plugins/providers/virtualbox/action/network.rb
+++ b/plugins/providers/virtualbox/action/network.rb
@@ -148,7 +148,7 @@ module VagrantPlugins
         def bridged_adapter(config)
           # Find the bridged interfaces that are available
           bridgedifs = @env[:machine].provider.driver.read_bridged_interfaces
-          bridgedifs.delete_if { |interface| interface[:status] == "Down" }
+          bridgedifs.delete_if { |interface| interface[:status] == "Down" || interface[:status] == "Unknown" }
 
           # The name of the chosen bridge interface will be assigned to this
           # variable.

From 1a541dc0438aae27a205b2e030899b75d1797ac3 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Mon, 23 Nov 2015 19:55:32 +0100
Subject: [PATCH 264/354] Update CHANGELOG

ref #6581 [ci skip]
---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9967a3bd0..7b77eaf75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -90,6 +90,8 @@ BUG FIXES:
   - communicator/winrm: respect `boot_timeout` setting [GH-6229]
   - communicator/winrm: execute scheduled tasks immediately on Windows XP
       since elevation isn't required [GH-6195]
+  - communicator/winrm: Decouple default port forwarding rules for "winrm" and
+      "winrm-ssl" [GH-6581]
   - communicator/winrm: Hide progress bars from PowerShell v5 [GH-6309]
   - guests/arch: enable network device after setting it up [GH-5737]
   - guests/darwin: advanced networking works with more NICs [GH-6386]

From 601f7d41e5443387a35e8ca7b9c2c2cadedbb5bc Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Mon, 23 Nov 2015 11:11:24 -0800
Subject: [PATCH 265/354] synced_folders/smb: use cred files [GH-4230]

---
 CHANGELOG.md                                  |  2 ++
 plugins/guests/debian/cap/smb.rb              | 18 ++++++++++++++++++
 plugins/guests/debian/plugin.rb               |  5 +++++
 .../linux/cap/mount_smb_shared_folder.rb      | 19 +++++++++++++------
 plugins/synced_folders/smb/synced_folder.rb   |  5 +++++
 templates/locales/en.yml                      |  2 ++
 6 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 plugins/guests/debian/cap/smb.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b77eaf75..d926db4d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -127,6 +127,8 @@ BUG FIXES:
   - push/heroku: use current branch [GH-6554]
   - synced\_folders/rsync: on Windows, replace all paths with Cygwin
       paths since all rsync implementations require this [GH-6160]
+  - synced\_folders/smb: use credentials files to allow for more characters
+      in password [GH-4230]
 
 PLUGIN AUTHOR CHANGES:
 
diff --git a/plugins/guests/debian/cap/smb.rb b/plugins/guests/debian/cap/smb.rb
new file mode 100644
index 000000000..fcc97af36
--- /dev/null
+++ b/plugins/guests/debian/cap/smb.rb
@@ -0,0 +1,18 @@
+module VagrantPlugins
+  module GuestDebian
+    module Cap
+      class SMB
+        def self.smb_install(machine)
+          # Deb/Ubuntu require mount.cifs which doesn't come by default.
+          machine.communicate.tap do |comm|
+            if !comm.test("test -f /sbin/mount.cifs")
+              machine.ui.detail(I18n.t("vagrant.guest_deb_installing_smb"))
+              comm.sudo("apt-get -y update")
+              comm.sudo("apt-get -y install cifs-utils")
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/guests/debian/plugin.rb b/plugins/guests/debian/plugin.rb
index 0ba72ed5d..5d00583e8 100644
--- a/plugins/guests/debian/plugin.rb
+++ b/plugins/guests/debian/plugin.rb
@@ -30,6 +30,11 @@ module VagrantPlugins
         require_relative "cap/rsync"
         Cap::RSync
       end
+
+      guest_capability("debian", "smb_install") do
+        require_relative "cap/smb"
+        Cap::SMB
+      end
     end
   end
 end
diff --git a/plugins/guests/linux/cap/mount_smb_shared_folder.rb b/plugins/guests/linux/cap/mount_smb_shared_folder.rb
index af96104e5..9db7c0ef3 100644
--- a/plugins/guests/linux/cap/mount_smb_shared_folder.rb
+++ b/plugins/guests/linux/cap/mount_smb_shared_folder.rb
@@ -24,17 +24,14 @@ module VagrantPlugins
             mount_gid = "`getent group #{options[:group]} | cut -d: -f3`"
             mount_gid_old = "`id -g #{options[:group]}`"
           end
-
-          smb_password = Shellwords.shellescape(options[:smb_password])
-
+          
           # If a domain is provided in the username, separate it
           username, domain = (options[:smb_username] || '').split('@', 2)
+          smb_password = options[:smb_password]
 
           options[:mount_options] ||= []
           options[:mount_options] << "sec=ntlm"
-          options[:mount_options] << "username=#{username}"
-          options[:mount_options] << "password=#{smb_password}"
-          options[:mount_options] << "domain=#{domain}" if domain
+          options[:mount_options] << "credentials=/etc/smb_creds_#{name}"
 
           # First mount command uses getent to get the group
           mount_options = "-o uid=#{mount_uid},gid=#{mount_gid}"
@@ -49,6 +46,16 @@ module VagrantPlugins
           # Create the guest path if it doesn't exist
           machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
 
+          # Write the credentials file
+          machine.communicate.sudo(<<-SCRIPT)
+cat <<EOF >/etc/smb_creds_#{name}
+username=#{username}
+password=#{smb_password}
+#{domain ? "domain=#{domain}" : ""}
+EOF
+chmod 0600 /etc/smb_creds_#{name}
+SCRIPT
+
           # Attempt to mount the folder. We retry here a few times because
           # it can fail early on.
           attempts = 0
diff --git a/plugins/synced_folders/smb/synced_folder.rb b/plugins/synced_folders/smb/synced_folder.rb
index e3f5a1af2..e74d2fbbf 100644
--- a/plugins/synced_folders/smb/synced_folder.rb
+++ b/plugins/synced_folders/smb/synced_folder.rb
@@ -92,6 +92,11 @@ module VagrantPlugins
             guest: machine.guest.name.to_s
         end
 
+        # Setup if we have it
+        if machine.guest.capability?(:smb_install)
+          machine.guest.capability(:smb_install)
+        end
+
         # Detect the host IP for this guest if one wasn't specified
         # for every folder.
         host_ip = nil
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 60c7e3838..0b93f9c79 100755
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -160,6 +160,8 @@ en:
       description of what they do.
 
       %{list}
+    guest_deb_installing_smb: |-
+      Installing SMB "mount.cifs"...
     global_status_footer: |-
       The above shows information about all known Vagrant environments
       on this machine. This data is cached and may not be completely

From b23b48a61420980e05b4319520609d25921c893c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Mon, 23 Nov 2015 12:05:37 -0800
Subject: [PATCH 266/354] providers/hyper-v: support more than one NIC
 [GH-4346]

---
 CHANGELOG.md                                       |  1 +
 .../hyperv/scripts/get_network_config.ps1          | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d926db4d5..d68390115 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,6 +103,7 @@ BUG FIXES:
   - guests/suse: DHCP network interfaces properly configured [GH-6502]
   - hosts/slackware: Better detection of NFS [GH-6367]
   - providers/hyper-v: support generation 2 VMs [GH-6372]
+  - providers/hyper-v: support VMs with more than one NIC [GH-4346]
   - providers/virtualbox: ignore "Unknown" status bridge interfaces [GH-6061]
   - provisioners/ansible: use quotes for the `ansible_ssh_private_key_file`
     value in the generated inventory [GH-6209]
diff --git a/plugins/providers/hyperv/scripts/get_network_config.ps1 b/plugins/providers/hyperv/scripts/get_network_config.ps1
index f8554297c..b8eab5f9a 100644
--- a/plugins/providers/hyperv/scripts/get_network_config.ps1
+++ b/plugins/providers/hyperv/scripts/get_network_config.ps1
@@ -7,9 +7,19 @@ Param(
 $Dir = Split-Path $script:MyInvocation.MyCommand.Path
 . ([System.IO.Path]::Combine($Dir, "utils\write_messages.ps1"))
 
+$ip_address = ""
 $vm = Get-VM -Id $VmId -ErrorAction "Stop"
-$network = Get-VMNetworkAdapter -VM $vm
-$ip_address = $network.IpAddresses[0]
+$networks = Get-VMNetworkAdapter -VM $vm
+foreach ($network in $networks) {
+  if ($network.IpAddresses.Length -gt 0) {
+    $ip_address = $network.IpAddresses[0]
+    if (-Not ([string]::IsNullOrEmpty($ip_address))) {
+      # We found our IP address!
+      break
+    }
+  }
+}
+
 $resultHash = @{
     ip = "$ip_address"
 }

From 24799575c33574a89b637c1c3fe1dc5bd2c11858 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Mon, 23 Nov 2015 12:06:11 -0800
Subject: [PATCH 267/354] providers/hyperv: fix error

---
 plugins/providers/hyperv/action.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/providers/hyperv/action.rb b/plugins/providers/hyperv/action.rb
index 2d6433a22..61dec2a1a 100644
--- a/plugins/providers/hyperv/action.rb
+++ b/plugins/providers/hyperv/action.rb
@@ -38,7 +38,7 @@ module VagrantPlugins
               end
 
               b2.use ConfigValidate
-              b4.use ProvisionerCleanup, :before
+              b2.use ProvisionerCleanup, :before
               b2.use StopInstance
               b2.use DeleteVM
             end

From 7bb57c6f834df09496f552a4a5cd010ac6c40ba0 Mon Sep 17 00:00:00 2001
From: Lalatendu Mohanty <lmohanty@redhat.com>
Date: Tue, 24 Nov 2015 01:36:17 +0530
Subject: [PATCH 268/354] Making the Fedora guest detection search string
 generic

Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>
---
 plugins/guests/fedora/guest.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/guests/fedora/guest.rb b/plugins/guests/fedora/guest.rb
index c1b48d4ab..f05861cf8 100644
--- a/plugins/guests/fedora/guest.rb
+++ b/plugins/guests/fedora/guest.rb
@@ -4,7 +4,7 @@ module VagrantPlugins
   module GuestFedora
     class Guest < Vagrant.plugin("2", :guest)
       def detect?(machine)
-        machine.communicate.test("grep 'Fedora release 1[6789]\\|Fedora release 2[0-9]' /etc/redhat-release")
+        machine.communicate.test("grep 'Fedora release' /etc/redhat-release")
       end
     end
   end

From 2875928b7661696f2d4f10ca71eafafdd9a651da Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Mon, 23 Nov 2015 12:11:48 -0800
Subject: [PATCH 269/354] remove failing test that was brittle

---
 .../linux/cap/mount_shared_folder_test.rb     | 31 -------------------
 1 file changed, 31 deletions(-)

diff --git a/test/unit/plugins/guests/linux/cap/mount_shared_folder_test.rb b/test/unit/plugins/guests/linux/cap/mount_shared_folder_test.rb
index 047d05e82..714e633d8 100644
--- a/test/unit/plugins/guests/linux/cap/mount_shared_folder_test.rb
+++ b/test/unit/plugins/guests/linux/cap/mount_shared_folder_test.rb
@@ -10,35 +10,4 @@ describe "VagrantPlugins::GuestLinux::Cap::MountSharedFolder" do
     allow(machine).to receive(:communicate).and_return(communicator)
     allow(guest).to receive(:capability).and_return(nil)
   end
-
-  describe "smb" do
-    let(:described_class) do
-      VagrantPlugins::GuestLinux::Plugin.components.guest_capabilities[:linux].get(:mount_smb_shared_folder)
-    end
-
-    describe ".mount_shared_folder" do
-      describe "with a domain" do
-        let(:mount_command) { "mount -t cifs -o uid=`id -u `,gid=`getent group  | cut -d: -f3`,sec=ntlm,username=user,password=pass,domain=domain //host/name " }
-        before do
-          communicator.expect_command mount_command
-          communicator.stub_command mount_command, exit_code: 0
-        end
-        after { communicator.verify_expectations! }
-        it "should call mount with correct args" do
-          described_class.mount_smb_shared_folder(machine, 'name', 'guestpath', {:smb_username => "user@domain", :smb_password => "pass", :smb_host => "host"})
-        end
-      end
-      describe "without a domain" do
-        let(:mount_command) { "mount -t cifs -o uid=`id -u `,gid=`getent group  | cut -d: -f3`,sec=ntlm,username=user,password=pass //host/name " }
-        before do
-          communicator.expect_command mount_command
-          communicator.stub_command mount_command, exit_code: 0
-        end
-        after { communicator.verify_expectations! }
-        it "should call mount with correct args" do
-          described_class.mount_smb_shared_folder(machine, 'name', 'guestpath', {:smb_username => "user", :smb_password => "pass", :smb_host => "host"})
-        end
-      end
-    end
-  end
 end

From 7b89ecc230942c66e59d740552f6b7cf2f02d2c6 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 23 Nov 2015 16:23:16 -0500
Subject: [PATCH 270/354] Add public_address cap for VirtualBox

Fixes GH-5978
---
 .../virtualbox/cap/public_address.rb          | 15 +++++++
 plugins/providers/virtualbox/plugin.rb        |  5 +++
 .../virtualbox/cap/public_address_test.rb     | 43 +++++++++++++++++++
 3 files changed, 63 insertions(+)
 create mode 100644 plugins/providers/virtualbox/cap/public_address.rb
 create mode 100644 test/unit/plugins/providers/virtualbox/cap/public_address_test.rb

diff --git a/plugins/providers/virtualbox/cap/public_address.rb b/plugins/providers/virtualbox/cap/public_address.rb
new file mode 100644
index 000000000..09dd5408e
--- /dev/null
+++ b/plugins/providers/virtualbox/cap/public_address.rb
@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module ProviderVirtualBox
+    module Cap
+      module PublicAddress
+        def self.public_address(machine)
+          return nil if machine.state.id != :running
+
+          ssh_info = machine.ssh_info
+          return nil if !ssh_info
+          ssh_info[:host]
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/providers/virtualbox/plugin.rb b/plugins/providers/virtualbox/plugin.rb
index 84f86ba51..bf355bb6c 100644
--- a/plugins/providers/virtualbox/plugin.rb
+++ b/plugins/providers/virtualbox/plugin.rb
@@ -34,6 +34,11 @@ module VagrantPlugins
         Cap
       end
 
+      provider_capability(:virtualbox, :public_address) do
+        require_relative "cap/public_address"
+        Cap::PublicAddress
+      end
+
       provider_capability(:virtualbox, :snapshot_list) do
         require_relative "cap"
         Cap
diff --git a/test/unit/plugins/providers/virtualbox/cap/public_address_test.rb b/test/unit/plugins/providers/virtualbox/cap/public_address_test.rb
new file mode 100644
index 000000000..d9a581ed2
--- /dev/null
+++ b/test/unit/plugins/providers/virtualbox/cap/public_address_test.rb
@@ -0,0 +1,43 @@
+require_relative "../base"
+
+require Vagrant.source_root.join("plugins/providers/virtualbox/cap/public_address")
+
+describe VagrantPlugins::ProviderVirtualBox::Cap::PublicAddress do
+  include_context "unit"
+
+  let(:iso_env) do
+    # We have to create a Vagrantfile so there is a root path
+    env = isolated_environment
+    env.vagrantfile("")
+    env.create_vagrant_env
+  end
+
+  let(:machine) do
+    iso_env.machine(iso_env.machine_names[0], :dummy).tap do |m|
+      allow(m).to receive(:state).and_return(state)
+    end
+  end
+
+  let(:state) do
+    double(:state)
+  end
+
+  describe "#public_address" do
+    it "returns nil when the machine is not running" do
+      allow(state).to receive(:id).and_return(:not_created)
+      expect(described_class.public_address(machine)).to be(nil)
+    end
+
+    it "returns nil when there is no ssh info" do
+      allow(state).to receive(:id).and_return(:not_created)
+      allow(machine).to receive(:ssh_info).and_return(nil)
+      expect(described_class.public_address(machine)).to be(nil)
+    end
+
+    it "returns the host" do
+      allow(state).to receive(:id).and_return(:running)
+      allow(machine).to receive(:ssh_info).and_return(host: "test")
+      expect(described_class.public_address(machine)).to eq("test")
+    end
+  end
+end

From 5ee7f805a8d548ff1c68fe07472a092f4fd7f516 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 23 Nov 2015 16:30:28 -0500
Subject: [PATCH 271/354] Update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d68390115..b1c7ace2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,8 @@ IMPROVEMENTS:
   - communicators/winrm: Configurable execution time limit [GH-6213]
   - providers/virtualbox: cache version lookup, which caused significant
       slowdown on some Windows hosts [GH-6552]
+  - providers/virtualbox: add `public_address` capability for virtualbox
+    [GH-6583, GH-5978]
   - provisioners/chef: perform cleanup tasks on the guest instead of the host
   - provisioners/chef: automatically generate a node_name if one was not given
     [GH-6555]

From e4dad788e16a9d944ea40813c9de5f677dfd97a6 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 23 Nov 2015 17:07:24 -0500
Subject: [PATCH 272/354] Remove website docs that are wrong

---
 website/docs/source/v2/networking/private_network.html.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/website/docs/source/v2/networking/private_network.html.md b/website/docs/source/v2/networking/private_network.html.md
index e1b00df40..31502396f 100644
--- a/website/docs/source/v2/networking/private_network.html.md
+++ b/website/docs/source/v2/networking/private_network.html.md
@@ -43,14 +43,6 @@ The IP address can be determined by using `vagrant ssh` to SSH into the
 machine and using the appropriate command line tool to find the IP,
 such as `ifconfig`.
 
-You can also specify the DHCP IP:
-
-```ruby
-Vagrant.configure("2") do |config|
-  config.vm.network "private_network", type: "dhcp", dhcp_ip: "192.168.0.100"
-end
-```
-
 ## Static IP
 
 You can also specify a static IP address for the machine. This lets you

From 844cca9013be0ebf8de3d3b3b2cc367e041eb1c5 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 23 Nov 2015 17:20:02 -0500
Subject: [PATCH 273/354] Skip nil IP addresses in ipv6 fix

Fixes GH-6558
---
 .../virtualbox/action/network_fix_ipv6.rb     |  3 +-
 .../action/network_fix_ipv6_test.rb           | 33 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 test/unit/plugins/providers/virtualbox/action/network_fix_ipv6_test.rb

diff --git a/plugins/providers/virtualbox/action/network_fix_ipv6.rb b/plugins/providers/virtualbox/action/network_fix_ipv6.rb
index eb4ca48ef..b8b12be58 100644
--- a/plugins/providers/virtualbox/action/network_fix_ipv6.rb
+++ b/plugins/providers/virtualbox/action/network_fix_ipv6.rb
@@ -27,7 +27,8 @@ module VagrantPlugins
           env[:machine].config.vm.networks.each do |type, options|
             next if type != :private_network
             options = scoped_hash_override(options, :virtualbox)
-            next if options[:ip] == ""
+            next if options[:ip].to_s.strip == ""
+
             if IPAddr.new(options[:ip]).ipv6?
               has_v6 = true
               break
diff --git a/test/unit/plugins/providers/virtualbox/action/network_fix_ipv6_test.rb b/test/unit/plugins/providers/virtualbox/action/network_fix_ipv6_test.rb
new file mode 100644
index 000000000..d4b985a63
--- /dev/null
+++ b/test/unit/plugins/providers/virtualbox/action/network_fix_ipv6_test.rb
@@ -0,0 +1,33 @@
+require_relative "../base"
+
+describe VagrantPlugins::ProviderVirtualBox::Action::NetworkFixIPv6 do
+  include_context "unit"
+  include_context "virtualbox"
+
+  let(:iso_env) do
+    env = isolated_environment
+    env.vagrantfile("")
+    env.create_vagrant_env
+  end
+
+  let(:machine) do
+    iso_env.machine(iso_env.machine_names[0], :dummy)
+  end
+
+  let(:env) {{ machine: machine }}
+  let(:app) { lambda { |*args| }}
+
+  subject { described_class.new(app, env) }
+
+  it "ignores nil IP addresses" do
+    allow(machine.config.vm).to receive(:networks)
+      .and_return(private_network: { ip: nil })
+    expect { subject.call(env) }.to_not raise_error
+  end
+
+  it "blank nil IP addresses" do
+    allow(machine.config.vm).to receive(:networks)
+      .and_return(private_network: { ip: "" })
+    expect { subject.call(env) }.to_not raise_error
+  end
+end

From 4c55c39b2df21431f7edb703d1898ccf21bde5fc Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 23 Nov 2015 17:56:54 -0500
Subject: [PATCH 274/354] Add presence helpers

---
 lib/vagrant/util/presence.rb            | 41 ++++++++++++++++++++++
 test/unit/vagrant/util/presence_test.rb | 46 +++++++++++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100644 lib/vagrant/util/presence.rb
 create mode 100644 test/unit/vagrant/util/presence_test.rb

diff --git a/lib/vagrant/util/presence.rb b/lib/vagrant/util/presence.rb
new file mode 100644
index 000000000..d0788efde
--- /dev/null
+++ b/lib/vagrant/util/presence.rb
@@ -0,0 +1,41 @@
+module Vagrant
+  module Util
+    module Presence
+      extend self
+
+      # Determines if the given object is "present". A String is considered
+      # present if the stripped contents are not empty. An Array/Hash is
+      # considered present if they have a length of more than 1. "true" is
+      # always present and `false` and `nil` are always not present. Any other
+      # object is considered to be present.
+      #
+      # @return [true, false]
+      def present?(obj)
+        case obj
+        when String
+          !obj.strip.empty?
+        when Array, Hash
+          !obj.empty?
+        when TrueClass, FalseClass
+          obj
+        when NilClass
+          false
+        when Object
+          true
+        end
+      end
+
+      # Returns the presence of the object. If the object is {present?}, it is
+      # returned. Otherwise `false` is returned.
+      #
+      # @return [Object, false]
+      def presence(obj)
+        if present?(obj)
+          obj
+        else
+          false
+        end
+      end
+    end
+  end
+end
diff --git a/test/unit/vagrant/util/presence_test.rb b/test/unit/vagrant/util/presence_test.rb
new file mode 100644
index 000000000..c20cc046e
--- /dev/null
+++ b/test/unit/vagrant/util/presence_test.rb
@@ -0,0 +1,46 @@
+require File.expand_path("../../../base", __FILE__)
+
+require "vagrant/util/presence"
+
+describe Vagrant::Util::Presence do
+  subject { described_class }
+
+  describe "#presence" do
+    it "returns false for nil" do
+      expect(subject.presence(nil)).to be(false)
+    end
+
+    it "returns false for false" do
+      expect(subject.presence(false)).to be(false)
+    end
+
+    it "returns false for an empty string" do
+      expect(subject.presence("")).to be(false)
+    end
+
+    it "returns false for a string with null bytes" do
+      expect(subject.presence("\u0000")).to be(false)
+    end
+
+    it "returns false for an empty array" do
+      expect(subject.presence([])).to be(false)
+    end
+
+    it "returns false for an empty hash" do
+      expect(subject.presence({})).to be(false)
+    end
+
+    it "returns true for true" do
+      expect(subject.presence(true)).to be(true)
+    end
+
+    it "returns the object for an object" do
+      obj = Object.new
+      expect(subject.presence(obj)).to be(obj)
+    end
+
+    it "returns the class for a class" do
+      expect(subject.presence(String)).to be(String)
+    end
+  end
+end

From 8c3f833e8eb6ed995f35ea66a7022b324de0e982 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 23 Nov 2015 18:14:32 -0500
Subject: [PATCH 275/354] Use the new presence helpers in the Chef provisioner

---
 lib/vagrant/util/presence.rb                         |  6 +++++-
 plugins/provisioners/chef/config/base.rb             | 12 +++++-------
 plugins/provisioners/chef/config/chef_apply.rb       |  8 ++++++--
 plugins/provisioners/chef/config/chef_client.rb      |  7 +++++--
 plugins/provisioners/chef/config/chef_solo.rb        |  8 ++++++--
 plugins/provisioners/chef/config/chef_zero.rb        |  8 ++++++--
 plugins/provisioners/chef/provisioner/base.rb        |  5 ++++-
 plugins/provisioners/chef/provisioner/chef_client.rb |  5 ++++-
 test/unit/vagrant/util/presence_test.rb              |  4 ++++
 9 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/lib/vagrant/util/presence.rb b/lib/vagrant/util/presence.rb
index d0788efde..8032bf6c1 100644
--- a/lib/vagrant/util/presence.rb
+++ b/lib/vagrant/util/presence.rb
@@ -14,7 +14,11 @@ module Vagrant
         case obj
         when String
           !obj.strip.empty?
-        when Array, Hash
+        when Symbol
+          !obj.to_s.strip.empty?
+        when Array
+          !obj.compact.empty?
+        when Hash
           !obj.empty?
         when TrueClass, FalseClass
           obj
diff --git a/plugins/provisioners/chef/config/base.rb b/plugins/provisioners/chef/config/base.rb
index 2c46198e9..0fa306449 100644
--- a/plugins/provisioners/chef/config/base.rb
+++ b/plugins/provisioners/chef/config/base.rb
@@ -1,7 +1,11 @@
+require "vagrant/util/presence"
+
 module VagrantPlugins
   module Chef
     module Config
       class Base < Vagrant.plugin("2", :config)
+        include Vagrant::Util::Presence
+
         # The path to Chef's bin/ directory.
         # @return [String]
         attr_accessor :binary_path
@@ -114,18 +118,12 @@ EOH
         def validate_base(machine)
           errors = _detected_errors
 
-          if missing?(log_level)
+          if !present?(log_level)
             errors << I18n.t("vagrant.provisioners.chef.log_level_empty")
           end
 
           errors
         end
-
-        # Determine if the given string is "missing" (blank)
-        # @return [true, false]
-        def missing?(obj)
-          obj.to_s.strip.empty?
-        end
       end
     end
   end
diff --git a/plugins/provisioners/chef/config/chef_apply.rb b/plugins/provisioners/chef/config/chef_apply.rb
index 8f7081875..b28f13c0b 100644
--- a/plugins/provisioners/chef/config/chef_apply.rb
+++ b/plugins/provisioners/chef/config/chef_apply.rb
@@ -1,9 +1,13 @@
+require "vagrant/util/presence"
+
 require_relative "base"
 
 module VagrantPlugins
   module Chef
     module Config
       class ChefApply < Base
+        include Vagrant::Util::Presence
+
         # The raw recipe text (as a string) to execute via chef-apply.
         # @return [String]
         attr_accessor :recipe
@@ -30,11 +34,11 @@ module VagrantPlugins
         def validate(machine)
           errors = validate_base(machine)
 
-          if missing?(recipe)
+          if !present?(recipe)
             errors << I18n.t("vagrant.provisioners.chef.recipe_empty")
           end
 
-          if missing?(upload_path)
+          if !present?(upload_path)
             errors << I18n.t("vagrant.provisioners.chef.upload_path_empty")
           end
 
diff --git a/plugins/provisioners/chef/config/chef_client.rb b/plugins/provisioners/chef/config/chef_client.rb
index b525a3307..343427155 100644
--- a/plugins/provisioners/chef/config/chef_client.rb
+++ b/plugins/provisioners/chef/config/chef_client.rb
@@ -1,3 +1,4 @@
+require "vagrant/util/presence"
 require "vagrant/util/which"
 
 require_relative "base_runner"
@@ -6,6 +7,8 @@ module VagrantPlugins
   module Chef
     module Config
       class ChefClient < BaseRunner
+        include Vagrant::Util::Presence
+
         # The URL endpoint to the Chef Server.
         # @return [String]
         attr_accessor :chef_server_url
@@ -55,11 +58,11 @@ module VagrantPlugins
         def validate(machine)
           errors = validate_base(machine)
 
-          if chef_server_url.to_s.strip.empty?
+          if !present?(chef_server_url)
             errors << I18n.t("vagrant.config.chef.server_url_empty")
           end
 
-          if validation_key_path.to_s.strip.empty?
+          if !present?(validation_key_path)
             errors << I18n.t("vagrant.config.chef.validation_key_path")
           end
 
diff --git a/plugins/provisioners/chef/config/chef_solo.rb b/plugins/provisioners/chef/config/chef_solo.rb
index f74146f52..79bc7ca58 100644
--- a/plugins/provisioners/chef/config/chef_solo.rb
+++ b/plugins/provisioners/chef/config/chef_solo.rb
@@ -1,9 +1,13 @@
+require "vagrant/util/presence"
+
 require_relative "base_runner"
 
 module VagrantPlugins
   module Chef
     module Config
       class ChefSolo < BaseRunner
+        include Vagrant::Util::Presence
+
         # The path on disk where Chef cookbooks are stored.
         # Default is "cookbooks".
         # @return [String]
@@ -82,11 +86,11 @@ module VagrantPlugins
         def validate(machine)
           errors = validate_base(machine)
 
-          if [cookbooks_path].flatten.compact.empty?
+          if !present?(Array(cookbooks_path))
             errors << I18n.t("vagrant.config.chef.cookbooks_path_empty")
           end
 
-          if environment && environments_path.empty?
+          if environment && !present?(environments_path)
             errors << I18n.t("vagrant.config.chef.environment_path_required")
           end
 
diff --git a/plugins/provisioners/chef/config/chef_zero.rb b/plugins/provisioners/chef/config/chef_zero.rb
index 671c2690c..93a036cd7 100644
--- a/plugins/provisioners/chef/config/chef_zero.rb
+++ b/plugins/provisioners/chef/config/chef_zero.rb
@@ -1,9 +1,13 @@
+require "vagrant/util/presence"
+
 require_relative "chef_solo"
 
 module VagrantPlugins
   module Chef
     module Config
       class ChefZero < BaseRunner
+        include Vagrant::Util::Presence
+
         # The path on disk where Chef cookbooks are stored.
         # Default is "cookbooks".
         # @return [String]
@@ -69,11 +73,11 @@ module VagrantPlugins
         def validate(machine)
           errors = validate_base(machine)
 
-          if [cookbooks_path].flatten.compact.empty?
+          if !present?(Array(cookbooks_path))
             errors << I18n.t("vagrant.config.chef.cookbooks_path_empty")
           end
 
-          if [nodes_path].flatten.compact.empty?
+          if !present?(Array(nodes_path))
             errors << I18n.t("vagrant.config.chef.nodes_path_empty")
           end
 
diff --git a/plugins/provisioners/chef/provisioner/base.rb b/plugins/provisioners/chef/provisioner/base.rb
index 4f3636ae2..1ae4a0808 100644
--- a/plugins/provisioners/chef/provisioner/base.rb
+++ b/plugins/provisioners/chef/provisioner/base.rb
@@ -1,5 +1,6 @@
 require 'tempfile'
 
+require "vagrant/util/presence"
 require "vagrant/util/template_renderer"
 
 require_relative "../installer"
@@ -11,6 +12,8 @@ module VagrantPlugins
       # chef-solo and chef-client provisioning are stored. This is **not an actual
       # provisioner**. Instead, {ChefSolo} or {ChefServer} should be used.
       class Base < Vagrant.plugin("2", :provisioner)
+        include Vagrant::Util::Presence
+
         class ChefError < Vagrant::Errors::VagrantError
           error_namespace("vagrant.provisioners.chef")
         end
@@ -20,7 +23,7 @@ module VagrantPlugins
 
           @logger = Log4r::Logger.new("vagrant::provisioners::chef")
 
-          if @config.node_name.to_s.empty?
+          if !present?(@config.node_name)
             cache = @machine.data_dir.join("chef_node_name")
 
             if !cache.exist?
diff --git a/plugins/provisioners/chef/provisioner/chef_client.rb b/plugins/provisioners/chef/provisioner/chef_client.rb
index e876703d5..5a9ec918e 100644
--- a/plugins/provisioners/chef/provisioner/chef_client.rb
+++ b/plugins/provisioners/chef/provisioner/chef_client.rb
@@ -1,6 +1,7 @@
 require 'pathname'
 
 require 'vagrant'
+require 'vagrant/util/presence'
 require 'vagrant/util/subprocess'
 
 require_relative "base"
@@ -11,6 +12,8 @@ module VagrantPlugins
       # This class implements provisioning via chef-client, allowing provisioning
       # with a chef server.
       class ChefClient < Base
+        include Vagrant::Util::Presence
+
         def configure(root_config)
           raise ChefError, :server_validation_key_required if @config.validation_key_path.nil?
           raise ChefError, :server_validation_key_doesnt_exist if !File.file?(validation_key_path)
@@ -132,7 +135,7 @@ module VagrantPlugins
         def delete_from_chef_server(deletable)
           node_name = @config.node_name || @machine.config.vm.hostname
 
-          if node_name.to_s.empty?
+          if !present?(node_name)
             @machine.ui.warn(I18n.t("vagrant.provisioners.chef.missing_node_name",
               deletable: deletable,
             ))
diff --git a/test/unit/vagrant/util/presence_test.rb b/test/unit/vagrant/util/presence_test.rb
index c20cc046e..8be6e87c1 100644
--- a/test/unit/vagrant/util/presence_test.rb
+++ b/test/unit/vagrant/util/presence_test.rb
@@ -26,6 +26,10 @@ describe Vagrant::Util::Presence do
       expect(subject.presence([])).to be(false)
     end
 
+    it "returns false for an array with nil values" do
+      expect(subject.presence([nil, nil])).to be(false)
+    end
+
     it "returns false for an empty hash" do
       expect(subject.presence({})).to be(false)
     end

From 930e166b47c38236a344b9d909ea29a7b4e69128 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 23 Nov 2015 19:24:06 -0500
Subject: [PATCH 276/354] Add :env option to shell provisioner

---
 plugins/provisioners/shell/config.rb              |  7 +++++++
 plugins/provisioners/shell/provisioner.rb         | 15 ++++++++++++++-
 templates/locales/en.yml                          |  2 ++
 .../plugins/provisioners/shell/config_test.rb     | 11 +++++++++++
 website/docs/source/v2/provisioning/shell.html.md |  4 ++++
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/plugins/provisioners/shell/config.rb b/plugins/provisioners/shell/config.rb
index 24021e9de..d5f260b91 100644
--- a/plugins/provisioners/shell/config.rb
+++ b/plugins/provisioners/shell/config.rb
@@ -5,6 +5,7 @@ module VagrantPlugins
     class Config < Vagrant.plugin("2", :config)
       attr_accessor :inline
       attr_accessor :path
+      attr_accessor :env
       attr_accessor :upload_path
       attr_accessor :args
       attr_accessor :privileged
@@ -18,6 +19,7 @@ module VagrantPlugins
         @args                  = UNSET_VALUE
         @inline                = UNSET_VALUE
         @path                  = UNSET_VALUE
+        @env                   = UNSET_VALUE
         @upload_path           = UNSET_VALUE
         @privileged            = UNSET_VALUE
         @binary                = UNSET_VALUE
@@ -31,6 +33,7 @@ module VagrantPlugins
         @args                 = nil if @args == UNSET_VALUE
         @inline               = nil if @inline == UNSET_VALUE
         @path                 = nil if @path == UNSET_VALUE
+        @env                  = {}  if @env == UNSET_VALUE
         @upload_path          = "/tmp/vagrant-shell" if @upload_path == UNSET_VALUE
         @privileged           = true if @privileged == UNSET_VALUE
         @binary               = false if @binary == UNSET_VALUE
@@ -72,6 +75,10 @@ module VagrantPlugins
           end
         end
 
+        if !env.is_a?(Hash)
+          errors << I18n.t("vagrant.provisioners.shell.env_must_be_a_hash")
+        end
+
         # There needs to be a path to upload the script to
         if !upload_path
           errors << I18n.t("vagrant.provisioners.shell.upload_path_not_set")
diff --git a/plugins/provisioners/shell/provisioner.rb b/plugins/provisioners/shell/provisioner.rb
index 6899f11da..a04d80c92 100644
--- a/plugins/provisioners/shell/provisioner.rb
+++ b/plugins/provisioners/shell/provisioner.rb
@@ -47,7 +47,12 @@ module VagrantPlugins
       # This is the provision method called if SSH is what is running
       # on the remote end, which assumes a POSIX-style host.
       def provision_ssh(args)
-        command = "chmod +x #{config.upload_path} && #{config.upload_path}#{args}"
+        env = config.env.map { |k,v| "#{k}=#{quote_and_escape(v)}" }.join(" ")
+
+        command =  "chmod +x '#{config.upload_path}'"
+        command << " &&"
+        command << " #{env}" if !env.empty?
+        command << " #{config.upload_path}#{args}"
 
         with_script_file do |path|
           # Upload the script to the machine
@@ -107,6 +112,9 @@ module VagrantPlugins
             # Upload it
             comm.upload(path.to_s, upload_path)
 
+            # Build the environment
+            env = config.env.map { |k,v| "$env:#{k} = #{quote_and_escape(v)}" }.join("; ")
+
             # Calculate the path that we'll be executing
             exec_path = upload_path
             exec_path.gsub!('/', '\\')
@@ -125,6 +133,11 @@ module VagrantPlugins
             command = "powershell #{shell_args.to_s} -file #{command}" if
               File.extname(exec_path).downcase == '.ps1'
 
+            # Append the environment
+            if !env.empty?
+              command = "#{env}; #{command}"
+            end
+
             if config.name
               @machine.ui.detail(I18n.t("vagrant.provisioners.shell.running",
                                       script: "script: #{config.name}"))
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 0b93f9c79..2720e9cf4 100755
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -2054,6 +2054,8 @@ en:
         invalid_encoding: |-
           Invalid encoding '%{actual}' for script at '%{path}'.
           Must be '%{default}' or UTF-8.
+        env_must_be_a_hash: |-
+          The shell provisioner's `env' option must be a hash.
         no_path_or_inline: "One of `path` or `inline` must be set."
         path_and_inline_set: "Only one of `path` or `inline` may be set."
         path_invalid: "`path` for shell provisioner does not exist on the host system: %{path}"
diff --git a/test/unit/plugins/provisioners/shell/config_test.rb b/test/unit/plugins/provisioners/shell/config_test.rb
index c0f04dd2f..c4d260b90 100644
--- a/test/unit/plugins/provisioners/shell/config_test.rb
+++ b/test/unit/plugins/provisioners/shell/config_test.rb
@@ -98,6 +98,17 @@ describe "VagrantPlugins::Shell::Config" do
         I18n.t("vagrant.provisioners.shell.interactive_not_elevated")
       ])
     end
+
+    it "returns an error if the environment is not a hash" do
+      subject.env = "foo"
+      subject.finalize!
+
+      result = subject.validate(machine)
+
+      expect(result["shell provisioner"]).to include(
+        I18n.t("vagrant.provisioners.shell.env_must_be_a_hash")
+      )
+    end
   end
 
   describe 'finalize!' do
diff --git a/website/docs/source/v2/provisioning/shell.html.md b/website/docs/source/v2/provisioning/shell.html.md
index d5b0d6174..eaee7779c 100644
--- a/website/docs/source/v2/provisioning/shell.html.md
+++ b/website/docs/source/v2/provisioning/shell.html.md
@@ -39,6 +39,10 @@ The remainder of the available options are optional:
   etc. as needed. You may also pass the arguments in using an array. In this
   case, Vagrant will handle quoting for you.
 
+* `env` (hash) - List of key-value pairs to pass in as environment variables to
+  the script. Vagrant will handle quoting for environment variable values, but
+  the keys remain untouched.
+
 * `binary` (boolean) - Vagrant automatically replaces Windows line endings with
   Unix line endings. If this is true, then Vagrant will not do this. By default
   this is "false". If the shell provisioner is communicating over WinRM, this

From eaf0aeb21003f0b324efc953daebae4d353c0e8b Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 23 Nov 2015 19:35:03 -0500
Subject: [PATCH 277/354] Fix test

---
 test/unit/plugins/provisioners/shell/provisioner_test.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/unit/plugins/provisioners/shell/provisioner_test.rb b/test/unit/plugins/provisioners/shell/provisioner_test.rb
index 8c9201717..8f83f2554 100644
--- a/test/unit/plugins/provisioners/shell/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/shell/provisioner_test.rb
@@ -16,6 +16,7 @@ describe "Vagrant::Shell::Provisioner" do
       double(
         :config,
         :args        => "doesn't matter",
+        :env         => {},
         :upload_path => "arbitrary",
         :remote?     => false,
         :path        => nil,

From 2a6db90afd7403fa021facf901d872b37f529795 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 23 Nov 2015 19:39:13 -0500
Subject: [PATCH 278/354] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1c7ace2d..c8f2bb16e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@ IMPROVEMENTS:
   - provisioners/chef: allow data_bags_path to be an array [GH-5988, GH-6561]
   - provisioners/shell: Support interactive mode for elevated PowerShell
       scripts [GH-6185]
+  - provisioners/shell: add `env` option [GH-6588, GH-6516]
   - provisioners/ansible+ansible_local: add support for ansible-galaxy [GH-2718]
   - provisioners/ansible: add new `force_remote_user` option to control whether
     `ansible_ssh_user` parameter should be applied or not [GH-6348]

From 8f420837a4e8bd522e0ac538c984a77e2421dce9 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 23 Nov 2015 20:00:12 -0500
Subject: [PATCH 279/354] Escape identify file path

---
 templates/commands/ssh_config/config.erb         |  6 +-----
 .../plugins/commands/ssh_config/command_test.rb  | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/templates/commands/ssh_config/config.erb b/templates/commands/ssh_config/config.erb
index 2cdb2dbf4..42b9a8f38 100644
--- a/templates/commands/ssh_config/config.erb
+++ b/templates/commands/ssh_config/config.erb
@@ -6,11 +6,7 @@ Host <%= host_key %>
   StrictHostKeyChecking no
   PasswordAuthentication no
 <% private_key_path.each do |path| %>
-<% if path.include?(" ") -%>
-  IdentityFile "<%= path %>"
-<% else -%>
-  IdentityFile <%= path %>
-<% end -%>
+  IdentityFile <%= path.inspect %>
 <% end -%>
   IdentitiesOnly yes
   LogLevel FATAL
diff --git a/test/unit/plugins/commands/ssh_config/command_test.rb b/test/unit/plugins/commands/ssh_config/command_test.rb
index e458776ec..0922c9a7a 100644
--- a/test/unit/plugins/commands/ssh_config/command_test.rb
+++ b/test/unit/plugins/commands/ssh_config/command_test.rb
@@ -92,8 +92,8 @@ Host #{machine.name}
 
       subject.execute
 
-      expect(output).to include("IdentityFile foo")
-      expect(output).to include("IdentityFile bar")
+      expect(output).to include('IdentityFile "foo"')
+      expect(output).to include('IdentityFile "bar"')
     end
 
     it "puts quotes around an identityfile path if it has a space" do
@@ -107,5 +107,17 @@ Host #{machine.name}
 
       expect(output).to include('IdentityFile "with a space"')
     end
+
+    it "escapes special characters" do
+      allow(machine).to receive(:ssh_info) { ssh_info.merge(private_key_path: ['/private/tmp/test of "vagrant" plugin/']) }
+      output = ""
+      allow(subject).to receive(:safe_puts) do |data|
+        output += data if data
+      end
+
+      subject.execute
+
+      expect(output).to include('"/private/tmp/test of \"vagrant\" plugin/"')
+    end
   end
 end

From 1fd3c955b7b31f34e789584ede2ee1ef6cb5a052 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 23 Nov 2015 20:04:30 -0500
Subject: [PATCH 280/354] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8f2bb16e..8146ae96e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -90,6 +90,7 @@ BUG FIXES:
   - commands/rdp: prefer `xfreerdp` if it is available on Linux [GH-6475]
   - commands/up: the `--provision-with` flag works with provisioner names [GH-5981]
   - communicator/ssh: fix potential crash case with PTY [GH-6225]
+  - communicator/ssh: escape IdentityFile path [GH-6428, GH-6589]
   - communicator/winrm: respect `boot_timeout` setting [GH-6229]
   - communicator/winrm: execute scheduled tasks immediately on Windows XP
       since elevation isn't required [GH-6195]

From bd48d2482563f17851a098851c5439f8599aaba8 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 23 Nov 2015 20:19:45 -0500
Subject: [PATCH 281/354] Respect proxy envvars for login command

---
 plugins/commands/login/client.rb              | 20 +++++++++++++++++--
 .../plugins/commands/login/client_test.rb     |  5 ++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/plugins/commands/login/client.rb b/plugins/commands/login/client.rb
index 63b01f335..fe8811935 100644
--- a/plugins/commands/login/client.rb
+++ b/plugins/commands/login/client.rb
@@ -1,4 +1,5 @@
 require "rest_client"
+require "vagrant/util/downloader"
 
 module VagrantPlugins
   module LoginCommand
@@ -45,8 +46,23 @@ module VagrantPlugins
         with_error_handling do
           url      = "#{Vagrant.server_url}/api/v1/authenticate"
           request  = { "user" => { "login" => user, "password" => pass } }
-          response = RestClient.post(
-            url, JSON.dump(request), content_type: :json)
+
+          proxy   = nil
+          proxy ||= ENV["HTTPS_PROXY"] || ENV["https_proxy"]
+          proxy ||= ENV["HTTP_PROXY"]  || ENV["http_proxy"]
+
+          response = RestClient::Request.execute(
+            method: :post,
+            url: url,
+            payload: JSON.dump(request),
+            proxy: proxy,
+            headers: {
+              accept: :json,
+              content_type: :json,
+              user_agent: Vagrant::Util::Downloader::USER_AGENT,
+            },
+          )
+
           data = JSON.load(response.to_s)
           data["token"]
         end
diff --git a/test/unit/plugins/commands/login/client_test.rb b/test/unit/plugins/commands/login/client_test.rb
index f57670eb0..2f49ec6f5 100644
--- a/test/unit/plugins/commands/login/client_test.rb
+++ b/test/unit/plugins/commands/login/client_test.rb
@@ -67,7 +67,10 @@ describe VagrantPlugins::LoginCommand::Client do
         "token" => "baz",
       }
 
-      headers = { "Content-Type" => "application/json" }
+      headers = {
+        "Accept" => "application/json",
+        "Content-Type" => "application/json",
+      }
 
       stub_request(:post, "#{Vagrant.server_url}/api/v1/authenticate").
         with(body: JSON.dump(request), headers: headers).

From aa4dd7cd0e76c3fe25f01e330932be58398bc566 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 23 Nov 2015 20:25:09 -0500
Subject: [PATCH 282/354] Update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8146ae96e..b0b4b1d8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -83,6 +83,8 @@ BUG FIXES:
   - commands/box: removing all versions and providers of a box will properly
       clean all directories in `~/.vagrant.d/boxes` [GH-3570]
   - commands/box: outdated global won't halt on metadata download failure [GH-6453]
+  - commands/login: respect environment variables in `vagrant login` command
+    [GH-6590, GH-6422]
   - commands/package: when re-packaging a packaged box, preserve the
       generated SSH key [GH-5780]
   - commands/plugin: retry plugin install automatically a few times to

From 3f6b4e2dda1ae0c022cda18996f55936ffa405d4 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 23 Nov 2015 20:37:47 -0500
Subject: [PATCH 283/354] Update docs for sudo for NFS

Fixes GH-6022
---
 website/docs/source/v2/synced-folders/nfs.html.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/website/docs/source/v2/synced-folders/nfs.html.md b/website/docs/source/v2/synced-folders/nfs.html.md
index 962256512..d653751ba 100644
--- a/website/docs/source/v2/synced-folders/nfs.html.md
+++ b/website/docs/source/v2/synced-folders/nfs.html.md
@@ -152,12 +152,13 @@ Cmnd_Alias VAGRANT_EXPORTS_REMOVE = /usr/bin/sed -E -e /*/ d -ibak /etc/exports
 For Ubuntu Linux , sudoers should look like this:
 
 ```
-Cmnd_Alias VAGRANT_EXPORTS_ADD = /usr/bin/tee -a /etc/exports
+ֻCmnd_Alias VAGRANT_EXPORTS_ADD = /usr/bin/tee -a /etc/exports
+Cmnd_Alias VAGRANT_EXPORTS_COPY = /bin/cp /tmp/exports /etc/exports
 Cmnd_Alias VAGRANT_NFSD_CHECK = /etc/init.d/nfs-kernel-server status
 Cmnd_Alias VAGRANT_NFSD_START = /etc/init.d/nfs-kernel-server start
 Cmnd_Alias VAGRANT_NFSD_APPLY = /usr/sbin/exportfs -ar
-Cmnd_Alias VAGRANT_EXPORTS_REMOVE = /bin/sed -r -e * d -ibak /etc/exports
-%sudo ALL=(root) NOPASSWD: VAGRANT_EXPORTS_ADD, VAGRANT_NFSD_CHECK, VAGRANT_NFSD_START, VAGRANT_NFSD_APPLY, VAGRANT_EXPORTS_REMOVE
+Cmnd_Alias VAGRANT_EXPORTS_REMOVE = /bin/sed -r -e * d -ibak /tmp/exports
+%sudo ALL=(root) NOPASSWD: VAGRANT_EXPORTS_ADD, VAGRANT_NFSD_CHECK, VAGRANT_NFSD_START, VAGRANT_NFSD_APPLY, VAGRANT_EXPORTS_REMOVE, VAGRANT_EXPORTS_COPY
 ```
 
 For Fedora Linux, sudoers might look like this (given your user

From c05486b1ada5edec8ed8d1a40ab70f9e79af533f Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 23 Nov 2015 20:40:28 -0500
Subject: [PATCH 284/354] Update docs on owner/group for docker synced folders

Fixes GH-5906
---
 website/docs/source/v2/docker/basics.html.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/website/docs/source/v2/docker/basics.html.md b/website/docs/source/v2/docker/basics.html.md
index 9f4dd97a6..493fc5d7a 100644
--- a/website/docs/source/v2/docker/basics.html.md
+++ b/website/docs/source/v2/docker/basics.html.md
@@ -65,6 +65,9 @@ and networking options into Docker volumes and forwarded ports.
 You don't have to use the Docker-specific configurations to do this.
 This helps keep your Vagrantfile similar to how it has always looked.
 
+The Docker provider does not support specifying options for `owner` or `group`
+on folders synced with a docker container.
+
 Private and public networks are not currently supported.
 
 ## Host VM

From 15ddc1bf9dd615c56a793a53a0beef0c9246b798 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 23 Nov 2015 21:06:57 -0500
Subject: [PATCH 285/354] Add docs for action hooks

Fixes GH-6271
---
 website/docs/source/layouts/layout.erb        |   3 +-
 .../source/v2/plugins/action-hooks.html.md    | 100 ++++++++++++++++++
 2 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 website/docs/source/v2/plugins/action-hooks.html.md

diff --git a/website/docs/source/layouts/layout.erb b/website/docs/source/layouts/layout.erb
index 34672e383..e9831b329 100644
--- a/website/docs/source/layouts/layout.erb
+++ b/website/docs/source/layouts/layout.erb
@@ -269,6 +269,7 @@
 								<ul class="sub unstyled">
 									<li<%= sidebar_current("plugins-usage") %>><a href="/v2/plugins/usage.html">Usage</a></li>
 									<li<%= sidebar_current("plugins-development-basics") %>><a href="/v2/plugins/development-basics.html">Plugin Development Basics</a></li>
+									<li<%= sidebar_current("plugins-action-hooks") %>><a href="/v2/plugins/action-hooks.html">Action Hooks</a></li>
 									<li<%= sidebar_current("plugins-commands") %>><a href="/v2/plugins/commands.html">Commands</a></li>
 									<li<%= sidebar_current("plugins-configuration") %>><a href="/v2/plugins/configuration.html">Configuration</a></li>
 									<li<%= sidebar_current("plugins-guests") %>><a href="/v2/plugins/guests.html">Guests</a></li>
@@ -277,7 +278,7 @@
 									<li<%= sidebar_current("plugins-hostcapabilities") %>><a href="/v2/plugins/host-capabilities.html">Host Capabilities</a></li>
 									<li<%= sidebar_current("plugins-providers") %>><a href="/v2/plugins/providers.html">Providers</a></li>
 									<li<%= sidebar_current("plugins-provisioners") %>><a href="/v2/plugins/provisioners.html">Provisioners</a></li>
-									<li<%= sidebar_current("plugins-packaging") %>><a href="/v2/plugins/packaging.html">Packaging & Distribution</a></li>
+									<li<%= sidebar_current("plugins-packaging") %>><a href="/v2/plugins/packaging.html">Packaging &amp; Distribution</a></li>
 								</ul>
 								<% end %>
 
diff --git a/website/docs/source/v2/plugins/action-hooks.html.md b/website/docs/source/v2/plugins/action-hooks.html.md
new file mode 100644
index 000000000..e5c775bf7
--- /dev/null
+++ b/website/docs/source/v2/plugins/action-hooks.html.md
@@ -0,0 +1,100 @@
+---
+page_title: "Plugin Development Basics - Action Hooks"
+sidebar_current: "plugins-action-hooks"
+---
+
+# Action Hooks
+
+Action hooks provide ways to interact with Vagrant at a very low level by
+injecting middleware in various phases of Vagrant's lifecycle. This is an
+advanced option, even for plugin development.
+
+<div class="alert alert-warn">
+  <p>
+    <strong>Warning: Advanced Topic!</strong> Developing plugins is an
+    advanced topic that only experienced Vagrant users who are reasonably
+    comfortable with Ruby should approach.
+  </p>
+</div>
+
+
+## Public Action Hooks
+
+The following action hooks are available in the core of Vagrant. Please note
+that this list is not exhaustive and additional hooks can be added via plugins.
+
+- `environment_plugins_loaded` - called after the plugins have been loaded,
+  but before the configurations, provisioners, providers, etc. are loaded.
+
+
+- `environment_load` - called after the environment and all configurations are
+  fully loaded.
+
+
+- `environment_unload` - called after the environment is done being used. The
+  environment should not be used in this hook.
+
+
+- `machine_action_boot` - called after the hypervisor has reported the machine
+  was booted.
+
+
+- `machine_action_config_validate` - called after all `Vagrantfile`s have been
+  loaded, merged, and validated.
+
+
+- `machine_action_destroy` - called after the hypervisor has reported the
+  virtual machine is down.
+
+
+- `machine_action_halt` - called after the hypervision has moved the machine
+  into a halted state (usually "stopped" but not "terminated").
+
+
+- `machine_action_package` - called after Vagrant has successfully packaged a
+  new box.
+
+
+- `machine_action_provision` - called after all provisioners have executed.
+
+
+- `machine_action_read_state` - called after Vagrant has loaded state from
+  disk and the hypervisor.
+
+
+- `machine_action_reload` - called after a virtual machine is reloaded (varies
+  by hypervisor).
+
+
+- `machine_action_resume` - called after a virtual machine is moved from the
+  halted to up state.
+
+
+- `machine_action_run_command` - called after a command is executed on the
+  machine.
+
+
+- `machine_action_ssh` - called after an SSH connection has been established.
+
+
+- `machine_action_ssh_run` - called after an SSH command is executed.
+
+
+- `machine_action_start` - called after the machine has been started.
+
+
+- `machine_action_suspend` - called after the machine has been suspended.
+
+
+- `machine_action_sync_folders` - called after synced folders have been set up.
+
+
+- `machine_action_up` - caled after the machine has entered the up state.
+
+
+## Private API
+
+You may find additional action hooks if you browse the Vagrant source code, but
+only the list of action hooks here are guaranteed to persist between Vagrant
+releases. Please do not rely on the internal API as it is subject to change
+without notice.

From 7a1d17042d86ba64ca6f7d8b53ef9d5f9dac8909 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 23 Nov 2015 22:54:31 -0800
Subject: [PATCH 286/354] install VB 5.0.10

---
 plugins/hosts/darwin/cap/provider_install_virtualbox.rb  | 4 ++--
 plugins/hosts/windows/cap/provider_install_virtualbox.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/hosts/darwin/cap/provider_install_virtualbox.rb b/plugins/hosts/darwin/cap/provider_install_virtualbox.rb
index c4748eecb..62a9f34f5 100644
--- a/plugins/hosts/darwin/cap/provider_install_virtualbox.rb
+++ b/plugins/hosts/darwin/cap/provider_install_virtualbox.rb
@@ -10,8 +10,8 @@ module VagrantPlugins
       class ProviderInstallVirtualBox
         # The URL to download VirtualBox is hardcoded so we can have a
         # known-good version to download.
-        URL = "http://download.virtualbox.org/virtualbox/5.0.8/VirtualBox-5.0.8-103449-OSX.dmg".freeze
-        VERSION = "5.0.8".freeze
+        URL = "http://download.virtualbox.org/virtualbox/5.0.10/VirtualBox-5.0.10-104061-OSX.dmg".freeze
+        VERSION = "5.0.10".freeze
 
         def self.provider_install_virtualbox(env)
           tf = Tempfile.new("vagrant")
diff --git a/plugins/hosts/windows/cap/provider_install_virtualbox.rb b/plugins/hosts/windows/cap/provider_install_virtualbox.rb
index c2e3325f8..44ab246c8 100644
--- a/plugins/hosts/windows/cap/provider_install_virtualbox.rb
+++ b/plugins/hosts/windows/cap/provider_install_virtualbox.rb
@@ -11,8 +11,8 @@ module VagrantPlugins
       class ProviderInstallVirtualBox
         # The URL to download VirtualBox is hardcoded so we can have a
         # known-good version to download.
-        URL = "http://download.virtualbox.org/virtualbox/5.0.8/VirtualBox-5.0.8-103449-Win.exe".freeze
-        VERSION = "5.0.8".freeze
+        URL = "http://download.virtualbox.org/virtualbox/5.0.10/VirtualBox-5.0.10-104061-Win.exe".freeze
+        VERSION = "5.0.10".freeze
 
         def self.provider_install_virtualbox(env)
           tf = Tempfile.new("vagrant")

From 5b910c186c9b921894c44610c4c6b9eb74282160 Mon Sep 17 00:00:00 2001
From: Timur Alperovich <timuralp@swiftstack.com>
Date: Tue, 24 Nov 2015 12:18:50 -0800
Subject: [PATCH 287/354] Fix the resolution of SafeEnv.

Recent change broke bundler.rb due to incorrect scope resolution (the
error is: uninitialized constant Vagrant::Bundler::SafeEnv
(NameError).
---
 lib/vagrant/bundler.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb
index 7382cbc59..fe9699ef4 100644
--- a/lib/vagrant/bundler.rb
+++ b/lib/vagrant/bundler.rb
@@ -72,7 +72,7 @@ module Vagrant
       # we add all our plugin dependencies.
       @gemfile = build_gemfile(plugins)
 
-      SafeEnv.change_env do |env|
+      Util::SafeEnv.change_env do |env|
         # Set the environmental variables for Bundler
         env["BUNDLE_APP_CONFIG"] = @appconfigpath
         env["BUNDLE_CONFIG"]     = @configfile.path

From 063f60e593b6c13db3cdeb0c193586432e7dfc13 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Tue, 24 Nov 2015 11:08:30 -0500
Subject: [PATCH 288/354] Add `vagrant port` command

---
 plugins/commands/port/command.rb              | 71 ++++++++++++++
 plugins/commands/port/plugin.rb               | 17 ++++
 .../plugins/commands/port/command_test.rb     | 98 +++++++++++++++++++
 3 files changed, 186 insertions(+)
 create mode 100644 plugins/commands/port/command.rb
 create mode 100644 plugins/commands/port/plugin.rb
 create mode 100644 test/unit/plugins/commands/port/command_test.rb

diff --git a/plugins/commands/port/command.rb b/plugins/commands/port/command.rb
new file mode 100644
index 000000000..276b6baba
--- /dev/null
+++ b/plugins/commands/port/command.rb
@@ -0,0 +1,71 @@
+require "optparse"
+
+module VagrantPlugins
+  module CommandPort
+    class Command < Vagrant.plugin("2", :command)
+      def self.synopsis
+        "displays information about guest port mappings"
+      end
+
+      # @todo support multiple strategies if requested by the community
+      def execute
+        opts = OptionParser.new do |o|
+          o.banner = "Usage: vagrant port [options] [name]"
+          o.separator ""
+          o.separator "Options:"
+          o.separator ""
+
+          o.on("--machine-readable", "Display machine-readable output")
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        @logger.debug("Port command: #{argv.inspect}")
+        with_target_vms(argv, single_target: true) do |vm|
+          vm.action_raw(:config_validate,
+            Vagrant::Action::Builtin::ConfigValidate)
+
+          if vm.state.id != :running
+            @env.ui.error "not running - make this a better error or use the middleware"
+            return 1
+          end
+
+          # This only works for vbox? should it be everywhere?
+          # vm.action_raw(:check_running,
+          #   Vagrant::Action::Builtin::CheckRunning)
+
+          if !vm.provider.capability?(:forwarded_ports)
+            @env.ui.error <<-EOH.strip
+The #{vm.provider_name} provider does not support listing forwarded ports. This
+is most likely a limitation of the provider and not a bug in Vagrant. If you
+believe this is a bug in Vagrant, please search existing issues before opening
+a new one.
+EOH
+            return 1
+          end
+
+          ports = vm.provider.capability(:forwarded_ports)
+
+          if ports.empty?
+            @env.ui.info("The machine has no configured forwarded ports")
+            return 0
+          end
+
+          @env.ui.info <<-EOH
+The forwarded ports for the machine are listed below. Please note that these
+values may differ from values configured in the Vagrantfile if the provider
+supports automatic port collision detection and resolution.
+EOH
+          ports.each do |guest, host|
+            @env.ui.info("#{guest.to_s.rjust(6)} (guest) => #{host} (host)")
+            @env.ui.machine("forwarded_port", guest, host, target: vm.name.to_s)
+          end
+        end
+
+        0
+      end
+    end
+  end
+end
diff --git a/plugins/commands/port/plugin.rb b/plugins/commands/port/plugin.rb
new file mode 100644
index 000000000..be1572afd
--- /dev/null
+++ b/plugins/commands/port/plugin.rb
@@ -0,0 +1,17 @@
+require "vagrant"
+
+module VagrantPlugins
+  module CommandPort
+    class Plugin < Vagrant.plugin("2")
+      name "port command"
+      description <<-DESC
+      The `port` command displays guest port mappings.
+      DESC
+
+      command("port") do
+        require File.expand_path("../command", __FILE__)
+        Command
+      end
+    end
+  end
+end
diff --git a/test/unit/plugins/commands/port/command_test.rb b/test/unit/plugins/commands/port/command_test.rb
new file mode 100644
index 000000000..7bd3dee4e
--- /dev/null
+++ b/test/unit/plugins/commands/port/command_test.rb
@@ -0,0 +1,98 @@
+require File.expand_path("../../../../base", __FILE__)
+
+require Vagrant.source_root.join("plugins/commands/port/command")
+
+describe VagrantPlugins::CommandPort::Command do
+  include_context "unit"
+  include_context "command plugin helpers"
+
+  let(:iso_env) { isolated_environment }
+  let(:env) do
+    iso_env.vagrantfile(<<-VF)
+      Vagrant.configure("2") do |config|
+        config.vm.box = "hashicorp/precise64"
+      end
+    VF
+    iso_env.create_vagrant_env
+  end
+
+  let(:argv)   { [] }
+  let(:pushes) { {} }
+  let(:state)  { double(:state, id: :running) }
+
+  let(:machine) { env.machine(env.machine_names[0], :dummy) }
+
+  subject { described_class.new(argv, env) }
+
+  before do
+    allow(machine).to receive(:state).and_return(state)
+    allow(subject).to receive(:with_target_vms) { |&block| block.call(machine) }
+  end
+
+  describe "#execute" do
+    it "validates the configuration" do
+      iso_env.vagrantfile <<-EOH
+        Vagrant.configure("2") do |config|
+          config.vm.box = "hashicorp/precise64"
+
+          config.push.define "noop" do |push|
+            push.bad = "ham"
+          end
+        end
+      EOH
+
+      subject = described_class.new(argv, iso_env.create_vagrant_env)
+
+      expect { subject.execute }.to raise_error(Vagrant::Errors::ConfigInvalid) { |err|
+        expect(err.message).to include("The following settings shouldn't exist: bad")
+      }
+    end
+
+    it "ensures the vm is running" do
+      allow(state).to receive(:id).and_return(:stopped)
+      expect(env.ui).to receive(:error).with { |message, _|
+        expect(message).to include("make this a better error")
+      }
+
+      expect(subject.execute).to eq(1)
+    end
+
+    it "shows a friendly error when the capability is not supported" do
+      allow(machine.provider).to receive(:capability?).and_return(false)
+      expect(env.ui).to receive(:error).with { |message, _|
+        expect(message).to include("does not support listing forwarded ports")
+      }
+
+      expect(subject.execute).to eq(1)
+    end
+
+    it "returns a friendly message when there are no forwarded ports" do
+      allow(machine.provider).to receive(:capability?).and_return(true)
+      allow(machine.provider).to receive(:capability).with(:forwarded_ports)
+        .and_return([])
+
+      expect(env.ui).to receive(:info).with { |message, _|
+        expect(message).to include("has no configured forwarded ports")
+      }
+
+      expect(subject.execute).to eq(0)
+    end
+
+    it "returns the list of ports" do
+      allow(machine.provider).to receive(:capability?).and_return(true)
+      allow(machine.provider).to receive(:capability).with(:forwarded_ports)
+        .and_return([[2222,22], [1111,11]])
+
+      output = ""
+      allow(env.ui).to receive(:info) do |data|
+        output << data
+      end
+
+      expect(subject.execute).to eq(0)
+
+      expect(output).to include("forwarded ports for the machine")
+      expect(output).to include("2222 (guest) => 22 (host)")
+      expect(output).to include("1111 (guest) => 11 (host)")
+    end
+  end
+end

From 958ce8983b1a64dcd067be284dc0ccf5429e2a09 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Tue, 24 Nov 2015 14:22:59 -0500
Subject: [PATCH 289/354] Remove todo comment

---
 plugins/commands/port/command.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/commands/port/command.rb b/plugins/commands/port/command.rb
index 276b6baba..2ffca44d9 100644
--- a/plugins/commands/port/command.rb
+++ b/plugins/commands/port/command.rb
@@ -7,7 +7,6 @@ module VagrantPlugins
         "displays information about guest port mappings"
       end
 
-      # @todo support multiple strategies if requested by the community
       def execute
         opts = OptionParser.new do |o|
           o.banner = "Usage: vagrant port [options] [name]"

From beb84d32127ff0ecb6a393778ba543f6c65ba144 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Tue, 24 Nov 2015 15:48:07 -0500
Subject: [PATCH 290/354] Move to I18n

---
 plugins/commands/port/command.rb               | 18 ++++++------------
 plugins/commands/port/locales/en.yml           | 16 ++++++++++++++++
 plugins/commands/port/plugin.rb                | 12 +++++++++++-
 .../unit/plugins/commands/port/command_test.rb |  9 +++++++--
 4 files changed, 40 insertions(+), 15 deletions(-)
 create mode 100644 plugins/commands/port/locales/en.yml

diff --git a/plugins/commands/port/command.rb b/plugins/commands/port/command.rb
index 2ffca44d9..a62789f6b 100644
--- a/plugins/commands/port/command.rb
+++ b/plugins/commands/port/command.rb
@@ -36,27 +36,21 @@ module VagrantPlugins
           #   Vagrant::Action::Builtin::CheckRunning)
 
           if !vm.provider.capability?(:forwarded_ports)
-            @env.ui.error <<-EOH.strip
-The #{vm.provider_name} provider does not support listing forwarded ports. This
-is most likely a limitation of the provider and not a bug in Vagrant. If you
-believe this is a bug in Vagrant, please search existing issues before opening
-a new one.
-EOH
+            @env.ui.error(I18n.t("port_command.missing_capability",
+              provider: vm.provider_name,
+            ))
             return 1
           end
 
           ports = vm.provider.capability(:forwarded_ports)
 
           if ports.empty?
-            @env.ui.info("The machine has no configured forwarded ports")
+            @env.ui.info(I18n.t("port_command.empty_ports"))
             return 0
           end
 
-          @env.ui.info <<-EOH
-The forwarded ports for the machine are listed below. Please note that these
-values may differ from values configured in the Vagrantfile if the provider
-supports automatic port collision detection and resolution.
-EOH
+          @env.ui.info(I18n.t("port_command.details"))
+          @env.ui.info("")
           ports.each do |guest, host|
             @env.ui.info("#{guest.to_s.rjust(6)} (guest) => #{host} (host)")
             @env.ui.machine("forwarded_port", guest, host, target: vm.name.to_s)
diff --git a/plugins/commands/port/locales/en.yml b/plugins/commands/port/locales/en.yml
new file mode 100644
index 000000000..8bcfdf1c7
--- /dev/null
+++ b/plugins/commands/port/locales/en.yml
@@ -0,0 +1,16 @@
+en:
+  port_command:
+    details: |-
+      The forwarded ports for the machine are listed below. Please note that
+      these values may differ from values configured in the Vagrantfile if the
+      provider supports automatic port collision detection and resolution.
+    empty_ports: |-
+      The provider reported there are no forwarded ports for this virtual
+      machine. This can be caused if there are no ports specified in the
+      Vagrantfile or if the virtual machine is not currently running. Please
+      check that the virtual machine is running and try again.
+    missing_capability: |-
+      The %{provider} provider does not support listing forwarded ports. This is
+      most likely a limitation of the provider and not a bug in Vagrant. If you
+      believe this is a bug in Vagrant, please search existing issues before
+      opening a new one.
diff --git a/plugins/commands/port/plugin.rb b/plugins/commands/port/plugin.rb
index be1572afd..7437f0436 100644
--- a/plugins/commands/port/plugin.rb
+++ b/plugins/commands/port/plugin.rb
@@ -9,9 +9,19 @@ module VagrantPlugins
       DESC
 
       command("port") do
-        require File.expand_path("../command", __FILE__)
+        require_relative "command"
+        self.init!
         Command
       end
+
+      protected
+
+      def self.init!
+        return if defined?(@_init)
+        I18n.load_path << File.expand_path("../locales/en.yml", __FILE__)
+        I18n.reload!
+        @_init = true
+      end
     end
   end
 end
diff --git a/test/unit/plugins/commands/port/command_test.rb b/test/unit/plugins/commands/port/command_test.rb
index 7bd3dee4e..5ec4027de 100644
--- a/test/unit/plugins/commands/port/command_test.rb
+++ b/test/unit/plugins/commands/port/command_test.rb
@@ -22,6 +22,11 @@ describe VagrantPlugins::CommandPort::Command do
 
   let(:machine) { env.machine(env.machine_names[0], :dummy) }
 
+  before(:all) do
+    I18n.load_path << Vagrant.source_root.join("plugins/commands/port/locales/en.yml")
+    I18n.reload!
+  end
+
   subject { described_class.new(argv, env) }
 
   before do
@@ -51,7 +56,7 @@ describe VagrantPlugins::CommandPort::Command do
     it "ensures the vm is running" do
       allow(state).to receive(:id).and_return(:stopped)
       expect(env.ui).to receive(:error).with { |message, _|
-        expect(message).to include("make this a better error")
+        expect(message).to include("does not support listing forwarded ports")
       }
 
       expect(subject.execute).to eq(1)
@@ -72,7 +77,7 @@ describe VagrantPlugins::CommandPort::Command do
         .and_return([])
 
       expect(env.ui).to receive(:info).with { |message, _|
-        expect(message).to include("has no configured forwarded ports")
+        expect(message).to include("there are no forwarded ports")
       }
 
       expect(subject.execute).to eq(0)

From f20c08f57f94c138403a265e3c03c3748e854f2f Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Tue, 24 Nov 2015 15:48:17 -0500
Subject: [PATCH 291/354] Return nil if the VM is not running when looking at
 forwarded ports

---
 plugins/providers/virtualbox/cap.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/providers/virtualbox/cap.rb b/plugins/providers/virtualbox/cap.rb
index 77f8ee1ad..1c0512407 100644
--- a/plugins/providers/virtualbox/cap.rb
+++ b/plugins/providers/virtualbox/cap.rb
@@ -9,6 +9,8 @@ module VagrantPlugins
       #
       # @return [Hash<Integer, Integer>] Host => Guest port mappings.
       def self.forwarded_ports(machine)
+        return nil if machine.state.id != :running
+
         {}.tap do |result|
           machine.provider.driver.read_forwarded_ports.each do |_, _, h, g|
             result[h] = g

From 4cebe283e8915e22f3be3f3aa30d0afa64c7c746 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Tue, 24 Nov 2015 15:48:29 -0500
Subject: [PATCH 292/354] Remove debug/todo comments

---
 plugins/commands/port/command.rb | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/plugins/commands/port/command.rb b/plugins/commands/port/command.rb
index a62789f6b..76dfd6e17 100644
--- a/plugins/commands/port/command.rb
+++ b/plugins/commands/port/command.rb
@@ -1,8 +1,12 @@
+require "vagrant/util/presence"
+
 require "optparse"
 
 module VagrantPlugins
   module CommandPort
     class Command < Vagrant.plugin("2", :command)
+      include Vagrant::Util::Presence
+
       def self.synopsis
         "displays information about guest port mappings"
       end
@@ -14,6 +18,9 @@ module VagrantPlugins
           o.separator "Options:"
           o.separator ""
 
+          o.on("--guest", "Output the host port that maps to the given guest port") do
+          end
+
           o.on("--machine-readable", "Display machine-readable output")
         end
 
@@ -21,20 +28,10 @@ module VagrantPlugins
         argv = parse_options(opts)
         return if !argv
 
-        @logger.debug("Port command: #{argv.inspect}")
         with_target_vms(argv, single_target: true) do |vm|
           vm.action_raw(:config_validate,
             Vagrant::Action::Builtin::ConfigValidate)
 
-          if vm.state.id != :running
-            @env.ui.error "not running - make this a better error or use the middleware"
-            return 1
-          end
-
-          # This only works for vbox? should it be everywhere?
-          # vm.action_raw(:check_running,
-          #   Vagrant::Action::Builtin::CheckRunning)
-
           if !vm.provider.capability?(:forwarded_ports)
             @env.ui.error(I18n.t("port_command.missing_capability",
               provider: vm.provider_name,
@@ -44,7 +41,7 @@ module VagrantPlugins
 
           ports = vm.provider.capability(:forwarded_ports)
 
-          if ports.empty?
+          if !present?(ports)
             @env.ui.info(I18n.t("port_command.empty_ports"))
             return 0
           end
@@ -57,7 +54,7 @@ module VagrantPlugins
           end
         end
 
-        0
+        return 0
       end
     end
   end

From 050f8d4d7123a87df09ed9e3c9e858a894ee95ae Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Tue, 24 Nov 2015 16:32:58 -0500
Subject: [PATCH 293/354] Allow specifying the guest port search

---
 plugins/commands/port/command.rb              | 41 +++++++++++--
 plugins/commands/port/locales/en.yml          |  4 ++
 .../plugins/commands/port/command_test.rb     | 60 ++++++++++++++++---
 3 files changed, 92 insertions(+), 13 deletions(-)

diff --git a/plugins/commands/port/command.rb b/plugins/commands/port/command.rb
index 76dfd6e17..af35def4b 100644
--- a/plugins/commands/port/command.rb
+++ b/plugins/commands/port/command.rb
@@ -12,13 +12,16 @@ module VagrantPlugins
       end
 
       def execute
+        options = {}
+
         opts = OptionParser.new do |o|
           o.banner = "Usage: vagrant port [options] [name]"
           o.separator ""
           o.separator "Options:"
           o.separator ""
 
-          o.on("--guest", "Output the host port that maps to the given guest port") do
+          o.on("--guest PORT", "Output the host port that maps to the given guest port") do |port|
+            options[:guest] = port
           end
 
           o.on("--machine-readable", "Display machine-readable output")
@@ -46,14 +49,40 @@ module VagrantPlugins
             return 0
           end
 
-          @env.ui.info(I18n.t("port_command.details"))
-          @env.ui.info("")
-          ports.each do |guest, host|
-            @env.ui.info("#{guest.to_s.rjust(6)} (guest) => #{host} (host)")
-            @env.ui.machine("forwarded_port", guest, host, target: vm.name.to_s)
+          if present?(options[:guest])
+            return print_single(vm, ports, options[:guest])
+          else
+            return print_all(vm, ports)
           end
         end
+      end
 
+      private
+
+      # Print all the guest <=> host port mappings.
+      # @return [0] the exit code
+      def print_all(vm, ports)
+        @env.ui.info(I18n.t("port_command.details"))
+        @env.ui.info("")
+        ports.each do |host, guest|
+          @env.ui.info("#{guest.to_s.rjust(6)} (guest) => #{host} (host)")
+          @env.ui.machine("forwarded_port", guest, host, target: vm.name.to_s)
+        end
+        return 0
+      end
+
+      # Print the host mapping that matches the given guest target.
+      # @return [0,1] the exit code
+      def print_single(vm, ports, target)
+        map = ports.find { |_, guest| "#{guest}" == "#{target}" }
+        if !present?(map)
+          @env.ui.error(I18n.t("port_command.no_matching_port",
+            port: target,
+          ))
+          return 1
+        end
+
+        @env.ui.info("#{map[0]}")
         return 0
       end
     end
diff --git a/plugins/commands/port/locales/en.yml b/plugins/commands/port/locales/en.yml
index 8bcfdf1c7..ba1389db7 100644
--- a/plugins/commands/port/locales/en.yml
+++ b/plugins/commands/port/locales/en.yml
@@ -14,3 +14,7 @@ en:
       most likely a limitation of the provider and not a bug in Vagrant. If you
       believe this is a bug in Vagrant, please search existing issues before
       opening a new one.
+    no_matching_port: |-
+      The guest is not currently mapping port %{port} to the host machine. Is
+      the port configured in the Vagrantfile? You may need to run `vagrant reload`
+      if changes were made to the port configuration in the Vagrantfile.
diff --git a/test/unit/plugins/commands/port/command_test.rb b/test/unit/plugins/commands/port/command_test.rb
index 5ec4027de..ac3da72a0 100644
--- a/test/unit/plugins/commands/port/command_test.rb
+++ b/test/unit/plugins/commands/port/command_test.rb
@@ -16,9 +16,7 @@ describe VagrantPlugins::CommandPort::Command do
     iso_env.create_vagrant_env
   end
 
-  let(:argv)   { [] }
-  let(:pushes) { {} }
-  let(:state)  { double(:state, id: :running) }
+  let(:state) { double(:state, id: :running) }
 
   let(:machine) { env.machine(env.machine_names[0], :dummy) }
 
@@ -27,7 +25,7 @@ describe VagrantPlugins::CommandPort::Command do
     I18n.reload!
   end
 
-  subject { described_class.new(argv, env) }
+  subject { described_class.new([], env) }
 
   before do
     allow(machine).to receive(:state).and_return(state)
@@ -46,7 +44,7 @@ describe VagrantPlugins::CommandPort::Command do
         end
       EOH
 
-      subject = described_class.new(argv, iso_env.create_vagrant_env)
+      subject = described_class.new([], iso_env.create_vagrant_env)
 
       expect { subject.execute }.to raise_error(Vagrant::Errors::ConfigInvalid) { |err|
         expect(err.message).to include("The following settings shouldn't exist: bad")
@@ -96,8 +94,56 @@ describe VagrantPlugins::CommandPort::Command do
       expect(subject.execute).to eq(0)
 
       expect(output).to include("forwarded ports for the machine")
-      expect(output).to include("2222 (guest) => 22 (host)")
-      expect(output).to include("1111 (guest) => 11 (host)")
+      expect(output).to include("22 (guest) => 2222 (host)")
+      expect(output).to include("11 (guest) => 1111 (host)")
+    end
+
+    it "prints the matching host port when --guest is given" do
+      argv = ["--guest", "22"]
+      subject = described_class.new(argv, env)
+
+      allow(machine.provider).to receive(:capability?).and_return(true)
+      allow(machine.provider).to receive(:capability).with(:forwarded_ports)
+        .and_return([[2222,22]])
+
+      output = ""
+      allow(env.ui).to receive(:info) do |data|
+        output << data
+      end
+
+      expect(subject.execute).to eq(0)
+
+      expect(output).to eq("2222")
+    end
+
+    it "returns an error with no port is mapped to the --guest option" do
+      argv = ["--guest", "80"]
+      subject = described_class.new(argv, env)
+
+      allow(machine.provider).to receive(:capability?).and_return(true)
+      allow(machine.provider).to receive(:capability).with(:forwarded_ports)
+        .and_return([[2222,22]])
+
+      output = ""
+      allow(env.ui).to receive(:error) do |data|
+        output << data
+      end
+
+      expect(subject.execute).to_not eq(0)
+
+      expect(output).to include("not currently mapping port 80")
     end
   end
 end
+
+
+
+
+
+
+
+
+
+
+
+

From b4371725af7423a855424ee9c153f4331a52748b Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Tue, 24 Nov 2015 16:33:05 -0500
Subject: [PATCH 294/354] Add documentation for port command

---
 website/docs/source/layouts/layout.erb  |  1 +
 website/docs/source/v2/cli/port.html.md | 35 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 website/docs/source/v2/cli/port.html.md

diff --git a/website/docs/source/layouts/layout.erb b/website/docs/source/layouts/layout.erb
index e9831b329..db40d692b 100644
--- a/website/docs/source/layouts/layout.erb
+++ b/website/docs/source/layouts/layout.erb
@@ -104,6 +104,7 @@
 									<li<%= sidebar_current("cli-login") %>><a href="/v2/cli/login.html">login</a></li>
 									<li<%= sidebar_current("cli-package") %>><a href="/v2/cli/package.html">package</a></li>
 									<li<%= sidebar_current("cli-plugin") %>><a href="/v2/cli/plugin.html">plugin</a></li>
+									<li<%= sidebar_current("cli-port") %>><a href="/v2/cli/port.html">port</a></li>
 									<li<%= sidebar_current("cli-powershell") %>><a href="/v2/cli/powershell.html">powershell</a></li>
 									<li<%= sidebar_current("cli-provision") %>><a href="/v2/cli/provision.html">provision</a></li>
 									<li<%= sidebar_current("cli-rdp") %>><a href="/v2/cli/rdp.html">rdp</a></li>
diff --git a/website/docs/source/v2/cli/port.html.md b/website/docs/source/v2/cli/port.html.md
new file mode 100644
index 000000000..97f815de8
--- /dev/null
+++ b/website/docs/source/v2/cli/port.html.md
@@ -0,0 +1,35 @@
+---
+page_title: "vagrant port - Command-Line Interface"
+sidebar_current: "cli-port"
+---
+
+# Port
+
+**Command: `vagrant port`**
+
+The port command displays the full list of guest ports mapped to the host
+machine ports:
+
+```
+$ vagrant port
+    22 (guest) => 2222 (host)
+    80 (guest) => 8080 (host)
+```
+
+In a multi-machine Vagrantfile, the name of the machine must be specified:
+
+```
+$ vagrant port my-machine
+```
+
+## Options
+
+* `--guest PORT` - This displays just the host port that corresponds to the
+  given guest port. If the guest is not forwarding that port, an error is
+  returned. This is useful for quick scripting, for example:
+
+        $ ssh -p $(vagrant port --guest 22)
+
+* `--machine-readable` - This tells Vagrant to display machine-readable output
+  instead of the human-friendly output. More information is available in the
+  [machine-readable output](/v2/cli/machine-readable.html) documentation.

From 3502042d96cfab0b7a0b9e69f6e2c038fe7b125f Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Tue, 24 Nov 2015 16:36:36 -0500
Subject: [PATCH 295/354] Lol whitespace [ci skip]

---
 test/unit/plugins/commands/port/command_test.rb | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/test/unit/plugins/commands/port/command_test.rb b/test/unit/plugins/commands/port/command_test.rb
index ac3da72a0..23abf5d7b 100644
--- a/test/unit/plugins/commands/port/command_test.rb
+++ b/test/unit/plugins/commands/port/command_test.rb
@@ -135,15 +135,3 @@ describe VagrantPlugins::CommandPort::Command do
     end
   end
 end
-
-
-
-
-
-
-
-
-
-
-
-

From 1bb9a48ae7de267aefe6532ca51f3aab01420db3 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Tue, 24 Nov 2015 16:41:13 -0500
Subject: [PATCH 296/354] Fix cap test

---
 test/unit/plugins/providers/virtualbox/cap_test.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/unit/plugins/providers/virtualbox/cap_test.rb b/test/unit/plugins/providers/virtualbox/cap_test.rb
index baa7f610f..52eb9bc43 100644
--- a/test/unit/plugins/providers/virtualbox/cap_test.rb
+++ b/test/unit/plugins/providers/virtualbox/cap_test.rb
@@ -15,14 +15,16 @@ describe VagrantPlugins::ProviderVirtualBox::Cap do
   let(:machine) do
     iso_env.machine(iso_env.machine_names[0], :dummy).tap do |m|
       m.provider.stub(driver: driver)
+      m.stub(state: state)
     end
   end
 
   let(:driver) { double("driver") }
+  let(:state)  { double("state", id: :running) }
 
   describe "#forwarded_ports" do
     it "returns all the forwarded ports" do
-      expect(driver).to receive(:read_forwarded_ports).and_return([
+      allow(driver).to receive(:read_forwarded_ports).and_return([
         [nil, nil, 123, 456],
         [nil, nil, 245, 245],
       ])
@@ -32,5 +34,10 @@ describe VagrantPlugins::ProviderVirtualBox::Cap do
         245 => 245,
       })
     end
+
+    it "returns nil when the machine is not running" do
+      allow(machine).to receive(:state).and_return(double(:state, id: :stopped))
+      expect(described_class.forwarded_ports(machine)).to be(nil)
+    end
   end
 end

From 3d4a133dcefa4c5c15aa3bf569b2d7ae1cfa9a00 Mon Sep 17 00:00:00 2001
From: Mikhail Zholobov <legal90@gmail.com>
Date: Wed, 25 Nov 2015 00:23:19 +0200
Subject: [PATCH 297/354] Add acceptance test for linked clones

---
 .../provider-virtualbox/linked_clone_spec.rb  | 35 +++++++++++++++++++
 .../skeletons/linked_clone/Vagrantfile        |  7 ++++
 2 files changed, 42 insertions(+)
 create mode 100644 test/acceptance/provider-virtualbox/linked_clone_spec.rb
 create mode 100644 test/acceptance/skeletons/linked_clone/Vagrantfile

diff --git a/test/acceptance/provider-virtualbox/linked_clone_spec.rb b/test/acceptance/provider-virtualbox/linked_clone_spec.rb
new file mode 100644
index 000000000..22785f1c7
--- /dev/null
+++ b/test/acceptance/provider-virtualbox/linked_clone_spec.rb
@@ -0,0 +1,35 @@
+# This tests that VM is up as a linked clone
+shared_examples 'provider/linked_clone' do |provider, options|
+  if !options[:box]
+    raise ArgumentError,
+      "box option must be specified for provider: #{provider}"
+  end
+
+  include_context 'acceptance'
+
+  before do
+    environment.skeleton('linked_clone')
+    assert_execute('vagrant', 'box', 'add', 'basic', options[:box])
+  end
+
+  after do
+    assert_execute('vagrant', 'destroy', '--force')
+  end
+
+  it 'creates machine as linked clone' do
+    status('Test: machine is created successfully')
+    result = execute('vagrant', 'up', "--provider=#{provider}")
+    expect(result).to exit_with(0)
+
+    status('Test: master VM is created')
+    expect(result.stdout).to match(/master VM/)
+
+    status('Test: machine is a master VM clone')
+    expect(result.stdout).to match(/Cloning/)
+
+    status('Test: machine is available by ssh')
+    result = execute('vagrant', 'ssh', '-c', 'echo foo')
+    expect(result).to exit_with(0)
+    expect(result.stdout).to match(/foo\n$/)
+  end
+end
diff --git a/test/acceptance/skeletons/linked_clone/Vagrantfile b/test/acceptance/skeletons/linked_clone/Vagrantfile
new file mode 100644
index 000000000..4562b9cf9
--- /dev/null
+++ b/test/acceptance/skeletons/linked_clone/Vagrantfile
@@ -0,0 +1,7 @@
+Vagrant.configure('2') do |config|
+  config.vm.box = 'basic'
+
+  config.vm.provider 'virtualbox' do |v|
+    v.linked_clone = true
+  end
+end

From 6c40a8b66c8d9a43864023732e962c67e5a5a181 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 25 Nov 2015 15:40:54 -0500
Subject: [PATCH 298/354] Update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0b4b1d8f..7fd1d59ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ FEATURES:
 
   - **New Command: `vagrant powershell`**: For machines that support it,
     this will open a PowerShell prompt.
+  - **New Command: `vagrant port`**: For machines that support it, this will
+    display the list of forwarded ports from the guest to the host.
   - **Linked Clones**: VirtualBox and VMware providers now support
     linked clones for very fast (millisecond) imports on up. [GH-4484]
   - **Snapshots**: The `vagrant snapshot` command can be used to checkpoint

From 32bb316564aa1ac51a29a3fa0f2767601c5d00cc Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Wed, 25 Nov 2015 22:48:56 +0100
Subject: [PATCH 299/354] Update CHANGELOG.md

close #5086
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fd1d59ff..0e4f48173 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,7 @@ IMPROVEMENTS:
       scripts [GH-6185]
   - provisioners/shell: add `env` option [GH-6588, GH-6516]
   - provisioners/ansible+ansible_local: add support for ansible-galaxy [GH-2718]
+  - provisioners/ansible: add support for WinRM settings [GH-5086]
   - provisioners/ansible: add new `force_remote_user` option to control whether
     `ansible_ssh_user` parameter should be applied or not [GH-6348]
   - provisioners/ansible: show a warning when running from a Windows Host [GH-5292]

From a9e1ef4fe3d11b81171c85551339c417e2dd0666 Mon Sep 17 00:00:00 2001
From: Romulo De Lazzari <romulodelazzari@gmail.com>
Date: Thu, 26 Nov 2015 15:17:09 +0000
Subject: [PATCH 300/354] update help message on --provision-with to add by
 provisioner name

---
 plugins/commands/provision/command.rb | 2 +-
 plugins/commands/up/start_mixins.rb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/commands/provision/command.rb b/plugins/commands/provision/command.rb
index a67084f75..0dc5bdf00 100644
--- a/plugins/commands/provision/command.rb
+++ b/plugins/commands/provision/command.rb
@@ -15,7 +15,7 @@ module VagrantPlugins
           o.banner = "Usage: vagrant provision [vm-name] [--provision-with x,y,z]"
 
           o.on("--provision-with x,y,z", Array,
-                    "Enable only certain provisioners, by type.") do |list|
+                    "Enable only certain provisioners, by type or by name.") do |list|
             options[:provision_types] = list.map { |type| type.to_sym }
           end
         end
diff --git a/plugins/commands/up/start_mixins.rb b/plugins/commands/up/start_mixins.rb
index 3e088e575..bb397346c 100644
--- a/plugins/commands/up/start_mixins.rb
+++ b/plugins/commands/up/start_mixins.rb
@@ -19,7 +19,7 @@ module VagrantPlugins
         end
 
         parser.on("--provision-with x,y,z", Array,
-                "Enable only certain provisioners, by type.") do |list|
+                "Enable only certain provisioners, by type or by name.") do |list|
           options[:provision_types] = list.map { |type| type.to_sym }
           options[:provision_enabled] = true
           options[:provision_ignore_sentinel] = true

From 2f2c442457d37380a481459019b137eefbc2ac44 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 26 Nov 2015 12:22:23 -0500
Subject: [PATCH 301/354] Document that the `shutdown` command must be on the
 $PATH

- Fixes GH-6449
- Closes GH-6450
---
 website/docs/source/v2/cli/destroy.html.md | 7 +++++--
 website/docs/source/v2/cli/halt.html.md    | 6 ++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/website/docs/source/v2/cli/destroy.html.md b/website/docs/source/v2/cli/destroy.html.md
index 598380cc3..33ec1665b 100644
--- a/website/docs/source/v2/cli/destroy.html.md
+++ b/website/docs/source/v2/cli/destroy.html.md
@@ -12,8 +12,11 @@ destroys all resources that were created during the machine creation process.
 After running this command, your computer should be left at a clean state,
 as if you never created the guest machine in the first place.
 
-This command usually asks for confirmation before destroying. This
-confirmation can be skipped by passing in the `-f` or `--force` flag.
+For linux-based guests, Vagrant uses the `shutdown` command to gracefully
+terminate the machine. Due to the varying nature of operating systems, the
+`shutdown` command may exist at many different locations in the guest's `$PATH`.
+It is the guest machine's responsibility to properly populate the `$PATH` with
+directory containing the `shutdown` command.
 
 ## Options
 
diff --git a/website/docs/source/v2/cli/halt.html.md b/website/docs/source/v2/cli/halt.html.md
index 15091f8a8..0c30a0972 100644
--- a/website/docs/source/v2/cli/halt.html.md
+++ b/website/docs/source/v2/cli/halt.html.md
@@ -13,6 +13,12 @@ Vagrant will first attempt to gracefully shut down the machine by running
 the guest OS shutdown mechanism. If this fails, or if the `--force` flag is
 specified, Vagrant will effectively just shut off power to the machine.
 
+For linux-based guests, Vagrant uses the `shutdown` command to gracefully
+terminate the machine. Due to the varying nature of operating systems, the
+`shutdown` command may exist at many different locations in the guest's `$PATH`.
+It is the guest machine's responsibility to properly populate the `$PATH` with
+directory containing the `shutdown` command.
+
 ## Options
 
 * `-f` or `--force` - Don't attempt to gracefully shut down the machine.

From 64ff69c64b4500ac16b7896afff01d12de3b9bd5 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 26 Nov 2015 13:11:51 -0500
Subject: [PATCH 302/354] Only run cleanup tasks when they are defined on the
 provisioner

This helps with some confusion caused in GH-2538, since the output says:

> Running cleanup tasks for 'shell' provisioner...

But that's actually not true. It is running the cleanup tasks iff the
provisioner defined a cleanup task. This commit changes the
provisioner_cleanup middleware to only run cleanup tasks if the subclass
defines a cleanup task.

The reason we can't just check if the provisioner `respond_to?` the
`cleanup` method is because the parent provisioner base class (which
all provisioners inherit from) defines a blank cleanup method. This is
important because it means we never risk calling an unimplemented
cleanup function, and it also helps define the public API for a
provisioner.
---
 .../action/builtin/provisioner_cleanup.rb     | 18 ++++++++++---
 .../builtin/provisioner_cleanup_test.rb       | 26 +++++++++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/lib/vagrant/action/builtin/provisioner_cleanup.rb b/lib/vagrant/action/builtin/provisioner_cleanup.rb
index c76b88f39..ead72268c 100644
--- a/lib/vagrant/action/builtin/provisioner_cleanup.rb
+++ b/lib/vagrant/action/builtin/provisioner_cleanup.rb
@@ -32,10 +32,20 @@ module Vagrant
 
           # Ask the provisioners to modify the configuration if needed
           provisioner_instances(env).each do |p, _|
-            env[:ui].info(I18n.t(
-              "vagrant.provisioner_cleanup",
-              name: type_map[p].to_s))
-            p.cleanup
+            name = type_map[p].to_s
+
+            # Check if the subclass defined a cleanup method. The parent
+            # provisioning class defines a `cleanup` method, so we cannot use
+            # `respond_to?` here. Instead, we have to check if _this_ instance
+            # defines a cleanup task.
+            if p.public_methods(false).include?(:cleanup)
+              env[:ui].info(I18n.t("vagrant.provisioner_cleanup",
+                name: name,
+              ))
+              p.cleanup
+            else
+              @logger.debug("Skipping cleanup tasks for `#{name}' - not defined")
+            end
           end
         end
       end
diff --git a/test/unit/vagrant/action/builtin/provisioner_cleanup_test.rb b/test/unit/vagrant/action/builtin/provisioner_cleanup_test.rb
index 00132f616..2d3b907c7 100644
--- a/test/unit/vagrant/action/builtin/provisioner_cleanup_test.rb
+++ b/test/unit/vagrant/action/builtin/provisioner_cleanup_test.rb
@@ -55,4 +55,30 @@ describe Vagrant::Action::Builtin::ProvisionerCleanup do
       instance.call(env)
     end
   end
+
+  it "only runs cleanup tasks if the subclass defines it" do
+    parent = Class.new do
+      class_variable_set(:@@cleanup, false)
+
+      def self.called?
+        class_variable_get(:@@cleanup)
+      end
+
+      def cleanup
+        self.class.class_variable_set(:@@cleanup)
+      end
+    end
+
+    child = Class.new(parent)
+
+    allow_any_instance_of(described_class).to receive(:provisioner_type_map)
+      .and_return(child => :test_provisioner)
+    allow_any_instance_of(described_class).to receive(:provisioner_instances)
+      .and_return([child])
+
+    expect(parent.called?).to be(false)
+    instance = described_class.new(app, env)
+    instance.call(env)
+    expect(parent.called?).to be(false)
+  end
 end

From 3c1c553789a1f72c50eca4d8ec6a53db3f61e885 Mon Sep 17 00:00:00 2001
From: Ruben Vermeersch <ruben@rocketeer.be>
Date: Fri, 27 Nov 2015 09:49:38 +0100
Subject: [PATCH 303/354] Document missing sudoers item

---
 contrib/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/README.md b/contrib/README.md
index c89c2ef56..bbdf84141 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -10,5 +10,7 @@ for each item will be kept below.
 * `emacs` - Contains a file for enabling Ruby syntax highlighting for `Vagrantfile`s in `emacs`.
 * `st` - Contains a `.sublime-settings` file for enabling Ruby syntax highlighting
   for `Vagrantfile`s in Sublime Text.
+* `sudoers` - Contains the pieces of `/etc/sudoers` configuration to avoid password entry when
+  starting machines.
 * `vim` - Contains a `.vim` file for enabling Ruby syntax highlighting
-  for `Vagrantfile`s in `vim`.
\ No newline at end of file
+  for `Vagrantfile`s in `vim`.

From 7d81728e4500bee5a7eef6da6bb2332320a0777e Mon Sep 17 00:00:00 2001
From: Reed Loden <reed@reedloden.com>
Date: Sat, 28 Nov 2015 00:04:41 -0800
Subject: [PATCH 304/354] Add checksum validation for the VirtualBox installs
 on Windows and OS X

Use Vagrant::Util::FileChecksum to validate the downloaded VirtualBox
installers.

SHA-256 checksums for VirtualBox files are available at
https://www.virtualbox.org/download/hashes/5.0.10/SHA256SUMS.

Fixes #6611.
---
 lib/vagrant/errors.rb                                 |  4 ++++
 .../hosts/darwin/cap/provider_install_virtualbox.rb   | 11 +++++++++++
 .../hosts/windows/cap/provider_install_virtualbox.rb  | 11 +++++++++++
 templates/locales/en.yml                              |  7 +++++++
 4 files changed, 33 insertions(+)

diff --git a/lib/vagrant/errors.rb b/lib/vagrant/errors.rb
index d4009f347..057d6a823 100644
--- a/lib/vagrant/errors.rb
+++ b/lib/vagrant/errors.rb
@@ -524,6 +524,10 @@ module Vagrant
       error_key(:provider_cant_install)
     end
 
+    class ProviderChecksumMismatch < VagrantError
+      error_key(:provider_checksum_mismatch)
+    end
+
     class ProviderInstallFailed < VagrantError
       error_key(:provider_install_failed)
     end
diff --git a/plugins/hosts/darwin/cap/provider_install_virtualbox.rb b/plugins/hosts/darwin/cap/provider_install_virtualbox.rb
index 62a9f34f5..34f81ef3c 100644
--- a/plugins/hosts/darwin/cap/provider_install_virtualbox.rb
+++ b/plugins/hosts/darwin/cap/provider_install_virtualbox.rb
@@ -2,6 +2,7 @@ require "pathname"
 require "tempfile"
 
 require "vagrant/util/downloader"
+require "vagrant/util/file_checksum"
 require "vagrant/util/subprocess"
 
 module VagrantPlugins
@@ -12,6 +13,7 @@ module VagrantPlugins
         # known-good version to download.
         URL = "http://download.virtualbox.org/virtualbox/5.0.10/VirtualBox-5.0.10-104061-OSX.dmg".freeze
         VERSION = "5.0.10".freeze
+        SHA256SUM = "62f933115498e51ddf5f2dab47dc1eebb42eb78ea1a7665cb91c53edacc847c6".freeze
 
         def self.provider_install_virtualbox(env)
           tf = Tempfile.new("vagrant")
@@ -29,6 +31,15 @@ module VagrantPlugins
           dl = Vagrant::Util::Downloader.new(URL, tf.path, ui: ui)
           dl.download!
 
+          # Validate that the file checksum matches
+          actual = Vagrant::Util::FileChecksum.new(tf.path, Digest::SHA2).checksum
+          if actual != SHA256SUM
+            raise Vagrant::Errors::ProviderChecksumMismatch,
+              provider: "virtualbox",
+              actual: actual,
+              expected: SHA256SUM
+          end
+
           # Launch it
           ui.output(I18n.t(
             "vagrant.hosts.darwin.virtualbox_install_install"))
diff --git a/plugins/hosts/windows/cap/provider_install_virtualbox.rb b/plugins/hosts/windows/cap/provider_install_virtualbox.rb
index 44ab246c8..2179d2164 100644
--- a/plugins/hosts/windows/cap/provider_install_virtualbox.rb
+++ b/plugins/hosts/windows/cap/provider_install_virtualbox.rb
@@ -2,6 +2,7 @@ require "pathname"
 require "tempfile"
 
 require "vagrant/util/downloader"
+require "vagrant/util/file_checksum"
 require "vagrant/util/powershell"
 require "vagrant/util/subprocess"
 
@@ -13,6 +14,7 @@ module VagrantPlugins
         # known-good version to download.
         URL = "http://download.virtualbox.org/virtualbox/5.0.10/VirtualBox-5.0.10-104061-Win.exe".freeze
         VERSION = "5.0.10".freeze
+        SHA256SUM = "3e5ed8fe4ada6eef8dfb4fe6fd79fcab4b242acf799f7d3ab4a17b43838b1e04".freeze
 
         def self.provider_install_virtualbox(env)
           tf = Tempfile.new("vagrant")
@@ -30,6 +32,15 @@ module VagrantPlugins
           dl = Vagrant::Util::Downloader.new(URL, tf.path, ui: ui)
           dl.download!
 
+          # Validate that the file checksum matches
+          actual = Vagrant::Util::FileChecksum.new(tf.path, Digest::SHA2).checksum
+          if actual != SHA256SUM
+            raise Vagrant::Errors::ProviderChecksumMismatch,
+              provider: "virtualbox",
+              actual: actual,
+              expected: SHA256SUM
+          end
+
           # Launch it
           ui.output(I18n.t(
             "vagrant.hosts.windows.virtualbox_install_install"))
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 2720e9cf4..6d39e9ef4 100755
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1015,6 +1015,13 @@ en:
         This is a limitation of this provider. Please report this as a feature
         request to the provider in question. To install this provider, you'll
         have to do so manually.
+      provider_checksum_mismatch: |-
+        The checksum of the downloaded provider '%{provider}' did not match the
+        expected value. If the problem persists, please install the provider
+        manually.
+
+        Expected: %{expected}
+        Received: %{actual}
       provider_install_failed: |-
         Installation of the provider '%{provider}' failed! The stdout
         and stderr are shown below. Please read the error output, resolve it,

From a5ff2415869c6c6c7cbfff9529921dc3b8e41b60 Mon Sep 17 00:00:00 2001
From: Christian Henz <c.henz@software-vision.eu>
Date: Tue, 1 Dec 2015 15:16:51 +0100
Subject: [PATCH 305/354] Updated documentation to reflect the possibility of
 adding group vars.

---
 .../v2/provisioning/ansible_common.html.md      |  9 +++++++++
 .../v2/provisioning/ansible_intro.html.md       | 17 +++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/website/docs/source/v2/provisioning/ansible_common.html.md b/website/docs/source/v2/provisioning/ansible_common.html.md
index cb8daf55e..053938d5c 100644
--- a/website/docs/source/v2/provisioning/ansible_common.html.md
+++ b/website/docs/source/v2/provisioning/ansible_common.html.md
@@ -41,6 +41,15 @@ Some of these options are for advanced usage only and should not be used unless
       "db"  => ["vm3"]
     }
     ```
+  Example with [group variables](http://docs.ansible.com/ansible/intro_inventory.html#group-variables):
+
+    ```ruby
+    ansible.groups = {
+      "atlanta" => ["host1", "host2"],
+      "atlanta:vars" => {"ntp_server" => "ntp.atlanta.example.com",
+                         "proxy" => "proxy.atlanta.example.com"}
+    }
+    ```
 
   Notes:
 
diff --git a/website/docs/source/v2/provisioning/ansible_intro.html.md b/website/docs/source/v2/provisioning/ansible_intro.html.md
index b49568f07..6bbb377b9 100644
--- a/website/docs/source/v2/provisioning/ansible_intro.html.md
+++ b/website/docs/source/v2/provisioning/ansible_intro.html.md
@@ -109,7 +109,7 @@ Note that the generated inventory file is uploaded to the guest VM in a subdirec
 
 **How to generate Inventory Groups:**
 
-The [`groups`](/v2/provisioning/ansible_common.html) option can be used to pass a hash of group names and group members to be included in the generated inventory file.
+The [`groups`](/v2/provisioning/ansible_common.html) option can be used to pass a hash of group names and group members to be included in the generated inventory file. It is also possible to specify [group variables](http://docs.ansible.com/ansible/intro_inventory.html#group-variables).
 
 With this configuration example:
 
@@ -126,7 +126,9 @@ Vagrant.configure(2) do |config|
     ansible.groups = {
       "group1" => ["machine1"],
       "group2" => ["machine2"],
-      "all_groups:children" => ["group1", "group2"]
+      "all_groups:children" => ["group1", "group2"],
+      "group1:vars" => {"variable1" => 9,
+                        "variable2" => "example"}
     }
   end
 end
@@ -149,22 +151,25 @@ machine2
 [all_groups:children]
 group1
 group2
+
+[group1:vars]
+variable1=9
+variable2=example
 ```
 
 **Notes:**
 
   - Prior to Vagrant 1.7.3, the `ansible_ssh_private_key_file` variable was not set in generated inventory, but passed as command line argument to `ansible-playbook` command.
-  - The generation of group variables blocks (e.g. `[group1:vars]`) are intentionally not supported, as it is [not recommended to store group variables in the main inventory file](http://docs.ansible.com/intro_inventory.html#splitting-out-host-and-group-specific-data). A good practice is to store these group (or host) variables in `YAML` files stored in `group_vars/` or `host_vars/` directories in the playbook (or inventory) directory.
+  - The generation of group variables blocks (e.g. `[group1:vars]`) is only possible since Vagrant ???. Note however that setting variables directly in the inventory is not the [preferred practice in Ansible](http://docs.ansible.com/intro_inventory.html#splitting-out-host-and-group-specific-data). If possible, group (or host) variables should be set in `YAML` files stored in the `group_vars/` or `host_vars/` directories in the playbook (or inventory) directory instead.
   - Unmanaged machines and undefined groups are not added to the inventory, to avoid useless Ansible errors (e.g. *unreachable host* or *undefined child group*)
 
-For example, `machine3`, `group3` and `group1:vars` in the example below would not be added to the generated inventory file:
+For example, `machine3` and `group3` in the example below would not be added to the generated inventory file:
 
 ```
 ansible.groups = {
   "group1" => ["machine1"],
   "group2" => ["machine2", "machine3"],
-  "all_groups:children" => ["group1", "group2", "group3"],
-  "group1:vars" => { "variable1" => 9, "variable2" => "example" }
+  "all_groups:children" => ["group1", "group2", "group3"]
 }
 ```
 

From 3fbbfeb8628ee16fa660ec4a9db44867eeef62bb Mon Sep 17 00:00:00 2001
From: Christian Henz <c.henz@software-vision.eu>
Date: Tue, 1 Dec 2015 14:25:41 +0100
Subject: [PATCH 306/354] Expect group variables to be inserted in the test.

---
 .../provisioners/ansible/provisioner_test.rb  | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index 55b40cd18..a382dfc71 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -245,15 +245,11 @@ VF
           "group3" => ["unknown", "#{machine.name}"],
           "bar" => ["#{machine.name}", "group3"],
           "bar:children" => ["group1", "group2", "group3", "group4"],
-          "bar:vars" => ["myvar=foo"],
         }
 
         expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
           inventory_content = File.read(generated_inventory_file)
 
-          # Group variables are intentionally not supported in generated inventory
-          expect(inventory_content).not_to match(/^\[.*:vars\]$/)
-
           # Accept String instead of Array for group that contains a single item
           expect(inventory_content).to include("[group1]\n#{machine.name}\n")
           expect(inventory_content).to include("[group1:children]\nbar\n")
@@ -272,6 +268,30 @@ VF
           expect(inventory_content).to include("[bar:children]\ngroup1\ngroup2\ngroup3\n")
         }
       end
+
+      it "adds group vars to the generated inventory" do
+        config.groups = {
+          "group1" => [machine.name],
+          "group2" => [machine.name],
+          "group3" => [machine.name],
+          "group1:vars" => {"hashvar1" => "hashvalue1", "hashvar2" => "hashvalue2"},
+          "group2:vars" => ["arrayvar1=arrayvalue1", "arrayvar2=arrayvalue2"],
+          "group3:vars" => "stringvar1=stringvalue1 stringvar2=stringvalue2",
+        }
+
+        expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
+          inventory_content = File.read(generated_inventory_file)
+
+          # Hash syntax
+          expect(inventory_content).to include("[group1:vars]\nhashvar1=hashvalue1\nhashvar2=hashvalue2\n")
+
+          # Array syntax
+          expect(inventory_content).to include("[group2:vars]\narrayvar1=arrayvalue1\narrayvar2=arrayvalue2\n")
+
+          # Single string syntax
+          expect(inventory_content).to include("[group3:vars]\nstringvar1=stringvalue1\nstringvar2=stringvalue2\n")
+        }
+      end
     end
 
     describe "with host_key_checking option enabled" do

From dd4ae1a51cfb246d561bced89d3b34ee90a0a38f Mon Sep 17 00:00:00 2001
From: Christian Henz <c.henz@software-vision.eu>
Date: Tue, 1 Dec 2015 14:28:24 +0100
Subject: [PATCH 307/354] Parse and insert group variables into the generated
 inventory.

---
 .../provisioners/ansible/provisioner/base.rb  | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/plugins/provisioners/ansible/provisioner/base.rb b/plugins/provisioners/ansible/provisioner/base.rb
index 7a455b2bf..bf577ab6e 100644
--- a/plugins/provisioners/ansible/provisioner/base.rb
+++ b/plugins/provisioners/ansible/provisioner/base.rb
@@ -88,21 +88,27 @@ module VagrantPlugins
         # Write out groups information.
         # All defined groups will be included, but only supported
         # machines and defined child groups will be included.
-        # Group variables are intentionally skipped.
         def generate_inventory_groups
           groups_of_groups = {}
           defined_groups = []
+          group_vars = {}
           inventory_groups = ""
 
           config.groups.each_pair do |gname, gmembers|
-            # Require that gmembers be an array
-            # (easier to be tolerant and avoid error management of few value)
-            gmembers = [gmembers] if !gmembers.is_a?(Array)
+            if gmembers.is_a?(String)
+              gmembers = gmembers.split(/\s+/)
+            elsif gmembers.is_a?(Hash)
+              gmembers = gmembers.each.collect{ |k, v| "#{k}=#{v}" }
+            elsif !gmembers.is_a?(Array)
+              gmembers = []
+            end
 
             if gname.end_with?(":children")
               groups_of_groups[gname] = gmembers
               defined_groups << gname.sub(/:children$/, '')
-            elsif !gname.include?(':vars')
+            elsif gname.end_with?(":vars")
+              group_vars[gname] = gmembers
+            else
               defined_groups << gname
               inventory_groups += "\n[#{gname}]\n"
               gmembers.each do |gm|
@@ -119,6 +125,12 @@ module VagrantPlugins
             end
           end
 
+          group_vars.each_pair do |gname, gmembers|
+            if defined_groups.include?(gname.sub(/:vars$/, ""))
+              inventory_groups += "\n[#{gname}]\n" + gmembers.join("\n") + "\n"
+            end
+          end
+
           return inventory_groups
         end
 

From 78766ded4e60ccada7d2e6f65923d7e00f3b9063 Mon Sep 17 00:00:00 2001
From: Christian Henz <c.henz@software-vision.eu>
Date: Tue, 1 Dec 2015 16:43:03 +0100
Subject: [PATCH 308/354] Document host_vars option.

---
 .../v2/provisioning/ansible_common.html.md    | 17 +++++++++++
 .../v2/provisioning/ansible_intro.html.md     | 29 +++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/website/docs/source/v2/provisioning/ansible_common.html.md b/website/docs/source/v2/provisioning/ansible_common.html.md
index 053938d5c..44b787e7e 100644
--- a/website/docs/source/v2/provisioning/ansible_common.html.md
+++ b/website/docs/source/v2/provisioning/ansible_common.html.md
@@ -31,6 +31,23 @@ Some of these options are for advanced usage only and should not be used unless
     ```
   These variables take the highest precedence over any other variables.
 
+- `host_vars` (hash) - Set of inventory host variables to be included in the [auto-generated inventory file](http://docs.ansible.com/ansible/intro_inventory.html#host-variables).
+
+  Example:
+
+    ```ruby
+    ansible.host_vars = {
+      "host1" => {"http_port" => 80,
+                  "maxRequestsPerChild" => 808},
+      "host2" => {"http_port" => 303,
+                  "maxRequestsPerChild" => 909}
+    }
+    ```
+
+  Notes:
+
+    - This option has no effect when the `inventory_path` option is defined.
+
 - `groups` (hash) - Set of inventory groups to be included in the [auto-generated inventory file](/v2/provisioning/ansible_intro.html).
 
   Example:
diff --git a/website/docs/source/v2/provisioning/ansible_intro.html.md b/website/docs/source/v2/provisioning/ansible_intro.html.md
index 6bbb377b9..441e8cbc8 100644
--- a/website/docs/source/v2/provisioning/ansible_intro.html.md
+++ b/website/docs/source/v2/provisioning/ansible_intro.html.md
@@ -107,6 +107,35 @@ default ansible_connection=local
 
 Note that the generated inventory file is uploaded to the guest VM in a subdirectory of [`tmp_path`](/v2/provisioning/ansible_local.html), e.g. `/tmp/vagrant-ansible/inventory/vagrant_ansible_local_inventory`.
 
+**Host variables:**
+
+Since Vagrant ???, the [`host_vars`](/v2/provisioning/ansible_common.html) option can be used to set [variables for individual hosts](http://docs.ansible.com/ansible/intro_inventory.html#host-variables) in the generated inventory file (see also the notes on group variables below).
+
+```
+Vagrant.configure(2) do |config|
+  config.vm.define "host1"
+  config.vm.define "host2"
+  config.vm.provision "ansible" do |ansible|
+    ansible.playbook = "playbook.yml"
+    ansible.host_vars = {
+      "host1" => {"http_port" => 80,
+                  "maxRequestsPerChild" => 808},
+      "host2" => {"http_port" => 303,
+                  "maxRequestsPerChild" => 909}
+    }
+  end
+end
+```
+
+Generated inventory:
+
+```
+# Generated by Vagrant
+
+host1 ansible_ssh_host=... http_port=80   maxRequestsPerChild=808
+host2 ansible_ssh_host=... http_port=303  maxRequestsPerChild=909
+```
+
 **How to generate Inventory Groups:**
 
 The [`groups`](/v2/provisioning/ansible_common.html) option can be used to pass a hash of group names and group members to be included in the generated inventory file. It is also possible to specify [group variables](http://docs.ansible.com/ansible/intro_inventory.html#group-variables).

From a5dd61c45081ca8097a807083a679c0266026816 Mon Sep 17 00:00:00 2001
From: Christian Henz <c.henz@software-vision.eu>
Date: Tue, 1 Dec 2015 17:04:56 +0100
Subject: [PATCH 309/354] Added test to expect host vars being inserted into
 inventory.

---
 .../plugins/provisioners/ansible/config_test.rb    |  2 ++
 .../provisioners/ansible/provisioner_test.rb       | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/test/unit/plugins/provisioners/ansible/config_test.rb b/test/unit/plugins/provisioners/ansible/config_test.rb
index 78e352914..f836382a3 100644
--- a/test/unit/plugins/provisioners/ansible/config_test.rb
+++ b/test/unit/plugins/provisioners/ansible/config_test.rb
@@ -30,6 +30,7 @@ describe VagrantPlugins::Ansible::Config::Host do
                             galaxy_roles_path
                             groups
                             host_key_checking
+                            host_vars
                             inventory_path
                             limit
                             playbook
@@ -62,6 +63,7 @@ describe VagrantPlugins::Ansible::Config::Host do
     expect(subject.tags).to be_nil
     expect(subject.skip_tags).to be_nil
     expect(subject.start_at_task).to be_nil
+    expect(subject.host_vars).to eq({})
     expect(subject.groups).to eq({})
     expect(subject.host_key_checking).to be_false
     expect(subject.raw_arguments).to be_nil
diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index a382dfc71..cd76d68f8 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -234,6 +234,20 @@ VF
       end
     end
 
+    describe "with host_vars option" do
+      it_should_create_and_use_generated_inventory
+
+      it "adds host variables to the generated inventory" do
+        config.host_vars = {
+          machine.name => {"http_port" => 80, "maxRequestsPerChild" => 808}
+        }
+        expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
+          inventory_content = File.read(generated_inventory_file)
+          expect(inventory_content).to match("^" + Regexp.quote(machine.name) + ".+http_port=80 maxRequestsPerChild=808")
+        }
+      end
+    end
+
     describe "with groups option" do
       it_should_create_and_use_generated_inventory
 

From 77b11a989ca1aaa02e60068c1754c052bc4e8031 Mon Sep 17 00:00:00 2001
From: Christian Henz <c.henz@software-vision.eu>
Date: Tue, 1 Dec 2015 18:15:40 +0100
Subject: [PATCH 310/354] Implemented host_vars option.

---
 plugins/provisioners/ansible/config/base.rb       |  3 +++
 plugins/provisioners/ansible/provisioner/base.rb  | 13 +++++++++++++
 plugins/provisioners/ansible/provisioner/guest.rb |  2 ++
 plugins/provisioners/ansible/provisioner/host.rb  |  3 +++
 4 files changed, 21 insertions(+)

diff --git a/plugins/provisioners/ansible/config/base.rb b/plugins/provisioners/ansible/config/base.rb
index 2cefe4a89..14ae1a3e6 100644
--- a/plugins/provisioners/ansible/config/base.rb
+++ b/plugins/provisioners/ansible/config/base.rb
@@ -9,6 +9,7 @@ module VagrantPlugins
         attr_accessor :galaxy_role_file
         attr_accessor :galaxy_roles_path
         attr_accessor :galaxy_command
+        attr_accessor :host_vars
         attr_accessor :groups
         attr_accessor :inventory_path
         attr_accessor :limit
@@ -27,6 +28,7 @@ module VagrantPlugins
           @galaxy_role_file    = UNSET_VALUE
           @galaxy_roles_path   = UNSET_VALUE
           @galaxy_command      = UNSET_VALUE
+          @host_vars           = UNSET_VALUE
           @groups              = UNSET_VALUE
           @inventory_path      = UNSET_VALUE
           @limit               = UNSET_VALUE
@@ -46,6 +48,7 @@ module VagrantPlugins
           @galaxy_role_file    = nil                    if @galaxy_role_file    == UNSET_VALUE
           @galaxy_roles_path   = nil                    if @galaxy_roles_path   == UNSET_VALUE
           @galaxy_command      = GALAXY_COMMAND_DEFAULT if @galaxy_command      == UNSET_VALUE
+          @host_vars           = {}                     if @host_vars           == UNSET_VALUE
           @groups              = {}                     if @groups              == UNSET_VALUE
           @inventory_path      = nil                    if @inventory_path      == UNSET_VALUE
           @limit               = nil                    if @limit               == UNSET_VALUE
diff --git a/plugins/provisioners/ansible/provisioner/base.rb b/plugins/provisioners/ansible/provisioner/base.rb
index bf577ab6e..51377a61f 100644
--- a/plugins/provisioners/ansible/provisioner/base.rb
+++ b/plugins/provisioners/ansible/provisioner/base.rb
@@ -70,6 +70,19 @@ module VagrantPlugins
           end
         end
 
+        def get_inventory_host_vars_string(machine_name)
+          vars = config.host_vars[machine_name]
+          s = nil
+          if vars.is_a?(Hash)
+            s = vars.each.collect{ |k, v| "#{k}=#{v}" }.join(" ")
+          elsif vars.is_a?(Array)
+            s = vars.join(" ")
+          elsif vars.is_a?(String)
+            s = vars
+          end
+          if s and !s.empty? then s else nil end
+        end
+
         def generate_inventory
           inventory = "# Generated by Vagrant\n\n"
 
diff --git a/plugins/provisioners/ansible/provisioner/guest.rb b/plugins/provisioners/ansible/provisioner/guest.rb
index a82bf7562..6f0b43f95 100644
--- a/plugins/provisioners/ansible/provisioner/guest.rb
+++ b/plugins/provisioners/ansible/provisioner/guest.rb
@@ -128,6 +128,8 @@ module VagrantPlugins
               else
                 machines += "#{machine_name}\n"
               end
+              host_vars = get_inventory_host_vars_string(machine_name)
+              machines.sub!(/\n$/, " #{host_vars}\n") if host_vars
             end
           end
 
diff --git a/plugins/provisioners/ansible/provisioner/host.rb b/plugins/provisioners/ansible/provisioner/host.rb
index 54928bdfc..dcce98fb8 100644
--- a/plugins/provisioners/ansible/provisioner/host.rb
+++ b/plugins/provisioners/ansible/provisioner/host.rb
@@ -151,12 +151,15 @@ module VagrantPlugins
               # Call only once the SSH and WinRM info computation
               # Note that machines configured with WinRM communicator, also have a "partial" ssh_info.
               m_ssh_info = m.ssh_info
+              host_vars = get_inventory_host_vars_string(m.name)
               if m.config.vm.communicator == :winrm
                 m_winrm_net_info = CommunicatorWinRM::Helper.winrm_info(m) # can raise a WinRMNotReady exception...
                 machines += get_inventory_winrm_machine(m, m_winrm_net_info)
+                machines.sub!(/\n$/, " #{host_vars}\n") if host_vars
                 @inventory_machines[m.name] = m
               elsif !m_ssh_info.nil?
                 machines += get_inventory_ssh_machine(m, m_ssh_info)
+                machines.sub!(/\n$/, " #{host_vars}\n") if host_vars
                 @inventory_machines[m.name] = m
               else
                 @logger.error("Auto-generated inventory: Impossible to get SSH information for machine '#{m.name} (#{m.provider_name})'. This machine should be recreated.")

From c49a146467f7d7a0e441564a2418a1b8a42bb8a6 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Wed, 2 Dec 2015 08:37:41 +0100
Subject: [PATCH 311/354] provisioners/ansible(both): alias String-to-Symbol

String and Symbol types are different when used as a Hash key. By
default the Vagrant machine names are set in Symbol format, but users
may write their `host_vars` entries with String keys. This is a very
simple way to ensure smooth experience, without having to coerce the
data types during the config validation (e.g. with a library like
Hashie, which is currently not in the Vagrant dependencies)

See also:
- https://bugs.ruby-lang.org/issues/5964#note-17
- https://github.com/intridea/hashie#keyconversion
---
 plugins/provisioners/ansible/provisioner/base.rb       |  7 ++++++-
 .../plugins/provisioners/ansible/provisioner_test.rb   | 10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/plugins/provisioners/ansible/provisioner/base.rb b/plugins/provisioners/ansible/provisioner/base.rb
index 51377a61f..981cbf5d1 100644
--- a/plugins/provisioners/ansible/provisioner/base.rb
+++ b/plugins/provisioners/ansible/provisioner/base.rb
@@ -71,7 +71,12 @@ module VagrantPlugins
         end
 
         def get_inventory_host_vars_string(machine_name)
-          vars = config.host_vars[machine_name]
+          # In Ruby, Symbol and String values are different, but
+          # Vagrant has to unify them for better user experience.
+          vars = config.host_vars[machine_name.to_sym]
+          if !vars
+            vars = config.host_vars[machine_name.to_s]
+          end
           s = nil
           if vars.is_a?(Hash)
             s = vars.each.collect{ |k, v| "#{k}=#{v}" }.join(" ")
diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index cd76d68f8..4a352a29e 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -246,6 +246,16 @@ VF
           expect(inventory_content).to match("^" + Regexp.quote(machine.name) + ".+http_port=80 maxRequestsPerChild=808")
         }
       end
+
+      it "retrieves the host variables by machine name, also in String format" do
+        config.host_vars = {
+          "machine1" => "http_port=80 maxRequestsPerChild=808"
+        }
+        expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
+          inventory_content = File.read(generated_inventory_file)
+          expect(inventory_content).to match("^" + Regexp.quote(machine.name) + ".+http_port=80 maxRequestsPerChild=808")
+        }
+      end
     end
 
     describe "with groups option" do

From 3dbcf5083c6bd0ef2731361bf193f102ee549e46 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Wed, 2 Dec 2015 08:42:44 +0100
Subject: [PATCH 312/354] provisioners/ansible(both) add more unit tests

Improve the test coverage of 'get_inventory_host_vars_string' method.
---
 .../provisioners/ansible/provisioner_test.rb  | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index 4a352a29e..a98f456fb 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -237,9 +237,29 @@ VF
     describe "with host_vars option" do
       it_should_create_and_use_generated_inventory
 
-      it "adds host variables to the generated inventory" do
+      it "adds host variables (given in Hash format) to the generated inventory" do
         config.host_vars = {
-          machine.name => {"http_port" => 80, "maxRequestsPerChild" => 808}
+          machine1: {"http_port" => 80, "maxRequestsPerChild" => 808}
+        }
+        expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
+          inventory_content = File.read(generated_inventory_file)
+          expect(inventory_content).to match("^" + Regexp.quote(machine.name) + ".+http_port=80 maxRequestsPerChild=808")
+        }
+      end
+
+      it "adds host variables (given in Array format) to the generated inventory" do
+        config.host_vars = {
+          machine1: ["http_port=80", "maxRequestsPerChild=808"]
+        }
+        expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
+          inventory_content = File.read(generated_inventory_file)
+          expect(inventory_content).to match("^" + Regexp.quote(machine.name) + ".+http_port=80 maxRequestsPerChild=808")
+        }
+      end
+
+      it "adds host variables (given in String format) to the generated inventory " do
+        config.host_vars = {
+          :machine1 => "http_port=80 maxRequestsPerChild=808"
         }
         expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
           inventory_content = File.read(generated_inventory_file)

From c99de13893f036feb37c84a63ea57483f67b3db0 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Wed, 2 Dec 2015 08:47:58 +0100
Subject: [PATCH 313/354] ansible docs: inventory variables support in 1.8+

Ref #6619
---
 website/docs/source/v2/provisioning/ansible_intro.html.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/website/docs/source/v2/provisioning/ansible_intro.html.md b/website/docs/source/v2/provisioning/ansible_intro.html.md
index 441e8cbc8..ee031a893 100644
--- a/website/docs/source/v2/provisioning/ansible_intro.html.md
+++ b/website/docs/source/v2/provisioning/ansible_intro.html.md
@@ -109,7 +109,7 @@ Note that the generated inventory file is uploaded to the guest VM in a subdirec
 
 **Host variables:**
 
-Since Vagrant ???, the [`host_vars`](/v2/provisioning/ansible_common.html) option can be used to set [variables for individual hosts](http://docs.ansible.com/ansible/intro_inventory.html#host-variables) in the generated inventory file (see also the notes on group variables below).
+As of Vagrant 1.8.0, the [`host_vars`](/v2/provisioning/ansible_common.html) option can be used to set [variables for individual hosts](http://docs.ansible.com/ansible/intro_inventory.html#host-variables) in the generated inventory file (see also the notes on group variables below).
 
 ```
 Vagrant.configure(2) do |config|
@@ -138,7 +138,8 @@ host2 ansible_ssh_host=... http_port=303  maxRequestsPerChild=909
 
 **How to generate Inventory Groups:**
 
-The [`groups`](/v2/provisioning/ansible_common.html) option can be used to pass a hash of group names and group members to be included in the generated inventory file. It is also possible to specify [group variables](http://docs.ansible.com/ansible/intro_inventory.html#group-variables).
+The [`groups`](/v2/provisioning/ansible_common.html) option can be used to pass a hash of group names and group members to be included in the generated inventory file.
+As of Vagrant 1.8.0, it is also possible to specify [group variables](http://docs.ansible.com/ansible/intro_inventory.html#group-variables).
 
 With this configuration example:
 
@@ -189,7 +190,7 @@ variable2=example
 **Notes:**
 
   - Prior to Vagrant 1.7.3, the `ansible_ssh_private_key_file` variable was not set in generated inventory, but passed as command line argument to `ansible-playbook` command.
-  - The generation of group variables blocks (e.g. `[group1:vars]`) is only possible since Vagrant ???. Note however that setting variables directly in the inventory is not the [preferred practice in Ansible](http://docs.ansible.com/intro_inventory.html#splitting-out-host-and-group-specific-data). If possible, group (or host) variables should be set in `YAML` files stored in the `group_vars/` or `host_vars/` directories in the playbook (or inventory) directory instead.
+  - The generation of group variables blocks (e.g. `[group1:vars]`) is only possible since Vagrant 1.8.0. Note however that setting variables directly in the inventory is not the [preferred practice in Ansible](http://docs.ansible.com/intro_inventory.html#splitting-out-host-and-group-specific-data). If possible, group (or host) variables should be set in `YAML` files stored in the `group_vars/` or `host_vars/` directories in the playbook (or inventory) directory instead.
   - Unmanaged machines and undefined groups are not added to the inventory, to avoid useless Ansible errors (e.g. *unreachable host* or *undefined child group*)
 
 For example, `machine3` and `group3` in the example below would not be added to the generated inventory file:

From cee517d96369f0bb1d71ee5080d4638a0b5a76e6 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Tue, 1 Dec 2015 16:59:06 -0800
Subject: [PATCH 314/354] core: fix machine readable UI to contain target and
 have proper format

---
 lib/vagrant/ui.rb | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/vagrant/ui.rb b/lib/vagrant/ui.rb
index 384bb7667..bae5ca3d1 100644
--- a/lib/vagrant/ui.rb
+++ b/lib/vagrant/ui.rb
@@ -104,8 +104,8 @@ module Vagrant
       end
 
       [:detail, :warn, :error, :info, :output, :success].each do |method|
-        define_method(method) do |message, *opts|
-          machine("ui", method.to_s, message)
+        define_method(method) do |message, *args, **opts|
+          machine("ui", method.to_s, message, *args, **opts)
         end
       end
 
@@ -280,6 +280,8 @@ module Vagrant
               opts[:bold] = #{method.inspect} != :detail && \
                 #{method.inspect} != :ask
             end
+
+            opts[:target] = @prefix
             @ui.#{method}(format_message(#{method.inspect}, message, **opts), *args, **opts)
           end
         CODE
@@ -324,17 +326,11 @@ module Vagrant
         target = opts[:target] if opts.key?(:target)
         target = "#{target}:" if target != ""
 
-
-
         # Get the lines. The first default is because if the message
         # is an empty string, then we want to still use the empty string.
         lines = [message]
         lines = message.split("\n") if message != ""
 
-        if @ui.is_a?(Vagrant::UI::MachineReadable)
-          return machine(type, message, { :target => target })
-        end
-
         # Otherwise, make sure to prefix every line properly
         lines.map do |line|
           "#{prefix}#{target} #{line}"

From 5c4e71e317262b54f7ceace79fe7d8c66b3fda31 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Tue, 1 Dec 2015 17:06:34 -0800
Subject: [PATCH 315/354] core: machine output provider info for the machine

---
 lib/vagrant/machine.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/vagrant/machine.rb b/lib/vagrant/machine.rb
index e7d547a39..f9ba4bcdf 100644
--- a/lib/vagrant/machine.rb
+++ b/lib/vagrant/machine.rb
@@ -144,6 +144,10 @@ module Vagrant
       if state.id == MachineState::NOT_CREATED_ID
         self.id = nil
       end
+
+      # Output a bunch of information about this machine in
+      # machine-readable format in case someone is listening.
+      @ui.machine("metadata", "provider", provider_name)
     end
 
     # This calls an action on the provider. The provider may or may not

From 350da6e1d53ec897306a56d99c887d24b712df05 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 2 Dec 2015 17:53:08 -0800
Subject: [PATCH 316/354] commands/ssh_config: output machine readable output

---
 plugins/commands/ssh_config/command.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/commands/ssh_config/command.rb b/plugins/commands/ssh_config/command.rb
index 94e89c141..320c8ace5 100644
--- a/plugins/commands/ssh_config/command.rb
+++ b/plugins/commands/ssh_config/command.rb
@@ -47,7 +47,9 @@ module VagrantPlugins
 
           # Render the template and output directly to STDOUT
           template = "commands/ssh_config/config"
-          safe_puts(Vagrant::Util::TemplateRenderer.render(template, variables))
+          config   = Vagrant::Util::TemplateRenderer.render(template, variables)
+          machine.ui.machine("ssh-config", config)
+          safe_puts(config)
           safe_puts
         end
 

From 30d9e243bb99788ead83d1f316797563f184819f Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 2 Dec 2015 18:03:08 -0800
Subject: [PATCH 317/354] fix failing tests

---
 lib/vagrant/ui.rb            |  5 +++--
 test/unit/vagrant/ui_test.rb | 13 +++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/vagrant/ui.rb b/lib/vagrant/ui.rb
index bae5ca3d1..75802352c 100644
--- a/lib/vagrant/ui.rb
+++ b/lib/vagrant/ui.rb
@@ -280,8 +280,9 @@ module Vagrant
               opts[:bold] = #{method.inspect} != :detail && \
                 #{method.inspect} != :ask
             end
-
-            opts[:target] = @prefix
+            if !opts.key?(:target)
+              opts[:target] = @prefix
+            end
             @ui.#{method}(format_message(#{method.inspect}, message, **opts), *args, **opts)
           end
         CODE
diff --git a/test/unit/vagrant/ui_test.rb b/test/unit/vagrant/ui_test.rb
index 61bfe7270..8ac03437e 100644
--- a/test/unit/vagrant/ui_test.rb
+++ b/test/unit/vagrant/ui_test.rb
@@ -313,7 +313,7 @@ describe Vagrant::UI::Prefixed do
 
   describe "#ask" do
     it "does not request bolding" do
-      expect(ui).to receive(:ask).with("    #{prefix}: foo", bold: false)
+      expect(ui).to receive(:ask).with("    #{prefix}: foo", bold: false, target: prefix)
       subject.ask("foo")
     end
   end
@@ -325,12 +325,13 @@ describe Vagrant::UI::Prefixed do
     end
 
     it "prefixes every line" do
-      expect(ui).to receive(:detail).with("    #{prefix}: foo\n    #{prefix}: bar", bold: false)
+      expect(ui).to receive(:detail).with(
+        "    #{prefix}: foo\n    #{prefix}: bar", bold: false, target: prefix)
       subject.detail("foo\nbar")
     end
 
     it "doesn't prefix if requested" do
-      expect(ui).to receive(:detail).with("foo", prefix: false, bold: false)
+      expect(ui).to receive(:detail).with("foo", prefix: false, bold: false, target: prefix)
       subject.detail("foo", prefix: false)
     end
   end
@@ -371,18 +372,18 @@ describe Vagrant::UI::Prefixed do
     end
 
     it "doesn't prefix if requestsed" do
-      expect(ui).to receive(:output).with("foo", prefix: false, bold: true)
+      expect(ui).to receive(:output).with("foo", prefix: false, bold: true, target: prefix)
       subject.output("foo", prefix: false)
     end
 
     it "requests bolding" do
-      expect(ui).to receive(:output).with("==> #{prefix}: foo", bold: true)
+      expect(ui).to receive(:output).with("==> #{prefix}: foo", bold: true, target: prefix)
       subject.output("foo")
     end
 
     it "does not request bolding if class-level disabled" do
       ui.opts[:bold] = false
-      expect(ui).to receive(:output).with("==> #{prefix}: foo", {})
+      expect(ui).to receive(:output).with("==> #{prefix}: foo", target: prefix)
       subject.output("foo")
     end
 

From 7caaffbf389fb298840eafb1edcdf554b977182e Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 2 Dec 2015 18:07:00 -0800
Subject: [PATCH 318/354] website/docs: update machine readable output options

---
 website/docs/source/v2/cli/machine-readable.html.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/website/docs/source/v2/cli/machine-readable.html.md b/website/docs/source/v2/cli/machine-readable.html.md
index 52642eeb1..b3257ea66 100644
--- a/website/docs/source/v2/cli/machine-readable.html.md
+++ b/website/docs/source/v2/cli/machine-readable.html.md
@@ -122,6 +122,15 @@ with the machine-readable output.
 </td>
 </tr>
 
+<tr>
+<td>ssh-config</td>
+<td>
+	The OpenSSH compatible SSH config for a machine. This is usually
+    the result of the "ssh-config" command.
+	<span class="label">targeted</span>
+</td>
+</tr>
+
 <tr>
 <td>state</td>
 <td>

From 06e772a2419222cdcec4b519dcf99cface81e89d Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Thu, 3 Dec 2015 08:14:47 +0100
Subject: [PATCH 319/354] docs (ansible): update inventory host vars example

Better reflect the true generated inventory output.

[ci skip]
---
 website/docs/source/v2/provisioning/ansible_intro.html.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/docs/source/v2/provisioning/ansible_intro.html.md b/website/docs/source/v2/provisioning/ansible_intro.html.md
index ee031a893..daa21aeb4 100644
--- a/website/docs/source/v2/provisioning/ansible_intro.html.md
+++ b/website/docs/source/v2/provisioning/ansible_intro.html.md
@@ -132,8 +132,8 @@ Generated inventory:
 ```
 # Generated by Vagrant
 
-host1 ansible_ssh_host=... http_port=80   maxRequestsPerChild=808
-host2 ansible_ssh_host=... http_port=303  maxRequestsPerChild=909
+host1 ansible_ssh_host=... http_port=80 maxRequestsPerChild=808
+host2 ansible_ssh_host=... http_port=303 maxRequestsPerChild=909
 ```
 
 **How to generate Inventory Groups:**

From 98672819714f25ac4ed59fe6572284d3de8cfd5d Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Thu, 3 Dec 2015 09:34:53 +0100
Subject: [PATCH 320/354] provisioners/ansible: allow symbol in `groups` key

After c49a146467f7d7a0e441564a2418a1b8a42bb8a6, it makes even more sense
to support Symbol datatypes in `groups` option handling.
---
 plugins/provisioners/ansible/provisioner/base.rb           | 4 ++++
 test/unit/plugins/provisioners/ansible/provisioner_test.rb | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/provisioners/ansible/provisioner/base.rb b/plugins/provisioners/ansible/provisioner/base.rb
index 981cbf5d1..ec8075f99 100644
--- a/plugins/provisioners/ansible/provisioner/base.rb
+++ b/plugins/provisioners/ansible/provisioner/base.rb
@@ -113,6 +113,10 @@ module VagrantPlugins
           inventory_groups = ""
 
           config.groups.each_pair do |gname, gmembers|
+            if gname.is_a?(Symbol)
+              gname = gname.to_s
+            end
+
             if gmembers.is_a?(String)
               gmembers = gmembers.split(/\s+/)
             elsif gmembers.is_a?(Hash)
diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index a98f456fb..01b0edbf2 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -287,6 +287,7 @@ VF
           "group1:children" => 'bar',
           "group2" => [iso_env.machine_names[1]],
           "group3" => ["unknown", "#{machine.name}"],
+          group4: [machine.name],
           "bar" => ["#{machine.name}", "group3"],
           "bar:children" => ["group1", "group2", "group3", "group4"],
         }
@@ -304,11 +305,13 @@ VF
           # Skip "unknown" machines
           expect(inventory_content).to include("[group3]\n#{machine.name}\n")
 
+          # Accept Symbol datatype for group names
+          expect(inventory_content).to include("[group4]\n#{machine.name}\n\n")
+
           # Don't mix group names and host names
           expect(inventory_content).to include("[bar]\n#{machine.name}\n")
 
           # A group of groups only includes declared groups
-          expect(inventory_content).not_to match(/^group4$/)
           expect(inventory_content).to include("[bar:children]\ngroup1\ngroup2\ngroup3\n")
         }
       end

From 4c137a9b6bd38433f9fc3b770b32833a701817ae Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Thu, 3 Dec 2015 09:36:57 +0100
Subject: [PATCH 321/354] provisioners/ansible: fix comment indentation

[ci skip]
---
 plugins/provisioners/ansible/provisioner/base.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/provisioners/ansible/provisioner/base.rb b/plugins/provisioners/ansible/provisioner/base.rb
index ec8075f99..6671f0218 100644
--- a/plugins/provisioners/ansible/provisioner/base.rb
+++ b/plugins/provisioners/ansible/provisioner/base.rb
@@ -91,8 +91,8 @@ module VagrantPlugins
         def generate_inventory
           inventory = "# Generated by Vagrant\n\n"
 
-            # This "abstract" step must fill the @inventory_machines list
-            # and return the list of supported host(s)
+          # This "abstract" step must fill the @inventory_machines list
+          # and return the list of supported host(s)
           inventory += generate_inventory_machines
 
           inventory += generate_inventory_groups

From 8517014a9982e9155c9eb1c08ddbe4715d6b957f Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Thu, 3 Dec 2015 09:39:12 +0100
Subject: [PATCH 322/354] provisioners/ansible: update inventory groups tests

With the introduction of inventory variables, group members provided as
String are not splitted (by ' ') into an array (instead of
auto-conversion to a single-item array).
---
 .../provisioners/ansible/provisioner_test.rb  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index 01b0edbf2..9a8188f0f 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -283,36 +283,37 @@ VF
 
       it "adds group sections to the generated inventory" do
         config.groups = {
-          "group1" => "#{machine.name}",
-          "group1:children" => 'bar',
+          "group1" => "machine1",
+          "group1:children" => 'bar group3',
           "group2" => [iso_env.machine_names[1]],
           "group3" => ["unknown", "#{machine.name}"],
           group4: [machine.name],
           "bar" => ["#{machine.name}", "group3"],
-          "bar:children" => ["group1", "group2", "group3", "group4"],
+          "bar:children" => ["group1", "group2", "group3", "group5"],
         }
 
         expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
           inventory_content = File.read(generated_inventory_file)
 
-          # Accept String instead of Array for group that contains a single item
-          expect(inventory_content).to include("[group1]\n#{machine.name}\n")
-          expect(inventory_content).to include("[group1:children]\nbar\n")
+          # Accept String instead of Array for group member list
+          expect(inventory_content).to include("[group1]\nmachine1\n\n")
+          expect(inventory_content).to include("[group1:children]\nbar\ngroup3\n\n")
 
           # Skip "lost" machines
           expect(inventory_content).to include("[group2]\n\n")
 
           # Skip "unknown" machines
-          expect(inventory_content).to include("[group3]\n#{machine.name}\n")
+          expect(inventory_content).to include("[group3]\n#{machine.name}\n\n")
 
           # Accept Symbol datatype for group names
           expect(inventory_content).to include("[group4]\n#{machine.name}\n\n")
 
           # Don't mix group names and host names
-          expect(inventory_content).to include("[bar]\n#{machine.name}\n")
+          expect(inventory_content).to include("[bar]\n#{machine.name}\n\n")
 
           # A group of groups only includes declared groups
-          expect(inventory_content).to include("[bar:children]\ngroup1\ngroup2\ngroup3\n")
+          expect(inventory_content).not_to include("group5")
+          expect(inventory_content).to match(Regexp.quote("[bar:children]\ngroup1\ngroup2\ngroup3\n") + "$")
         }
       end
 

From cc2d11b49710f11e35fa64efa2add554de60a35c Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Thu, 3 Dec 2015 21:50:53 +0100
Subject: [PATCH 323/354] provisioners/ansible+ansible_local: inventory vars

Add support for group and host variables in the generated inventory.

Close #6619
---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e4f48173..249891a71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,8 @@ IMPROVEMENTS:
       scripts [GH-6185]
   - provisioners/shell: add `env` option [GH-6588, GH-6516]
   - provisioners/ansible+ansible_local: add support for ansible-galaxy [GH-2718]
+  - provisioners/ansible+ansible_local: add support for group and host variables
+      in the generated inventory [GH-6619]
   - provisioners/ansible: add support for WinRM settings [GH-5086]
   - provisioners/ansible: add new `force_remote_user` option to control whether
     `ansible_ssh_user` parameter should be applied or not [GH-6348]

From 934bcf94196e19a318ef8776ac1db4dd7cf2c499 Mon Sep 17 00:00:00 2001
From: Kamjar Gerami <kami.gerami@gmail.com>
Date: Thu, 3 Dec 2015 20:22:05 +0100
Subject: [PATCH 324/354] #3539 - Can't use alphanumeric patterns for box names
 in ansible.groups: Host Range Pattern Regex, notification and updates to
 provisioning web source

---
 .../provisioners/ansible/provisioner/base.rb  | 13 +++++++++
 templates/locales/en.yml                      |  6 +++++
 .../v2/provisioning/ansible_intro.html.md     | 27 ++++++++++++++++---
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/plugins/provisioners/ansible/provisioner/base.rb b/plugins/provisioners/ansible/provisioner/base.rb
index 6671f0218..b61426037 100644
--- a/plugins/provisioners/ansible/provisioner/base.rb
+++ b/plugins/provisioners/ansible/provisioner/base.rb
@@ -112,6 +112,13 @@ module VagrantPlugins
           group_vars = {}
           inventory_groups = ""
 
+          # Verify if host range patterns exist and warn
+          if config.groups.any? do |gm|
+            gm.to_s[/(?:\[[a-z]:[a-z]\]|\[[0-9]+?:[0-9]+?\])/]
+          end
+            @machine.ui.warn(I18n.t("vagrant.provisioners.ansible.ansible_host_pattern_detected"))
+          end
+
           config.groups.each_pair do |gname, gmembers|
             if gname.is_a?(Symbol)
               gname = gname.to_s
@@ -134,6 +141,12 @@ module VagrantPlugins
               defined_groups << gname
               inventory_groups += "\n[#{gname}]\n"
               gmembers.each do |gm|
+              # TODO : Expand and validate host range patterns
+              # against @inventory_machines list before adding them
+              # otherwise abort with an error message
+                if gm[/(?:\[[a-z]:[a-z]\]|\[[0-9]+?:[0-9]+?\])/]
+                  inventory_groups += "#{gm}\n"
+                end
                 inventory_groups += "#{gm}\n" if @inventory_machines.include?(gm.to_sym)
               end
             end
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 2720e9cf4..6fbd4ee79 100755
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -2065,6 +2065,12 @@ en:
         interactive_not_elevated: "To be interactive, it must also be privileged."
 
       ansible:
+        ansible_host_pattern_detected: |-
+          Vagrant has detected a host range pattern in the ansible.groups option.
+          Vagrant doesn't fully check the validity of these parameters!
+
+          Please check http://docs.ansible.com/ansible/intro_inventory.html#hosts-and-groups
+          for more information.
         cannot_detect: |-
           Vagrant does not support detecting whether Ansible is installed
           for the guest OS running in the machine. Vagrant will assume it is
diff --git a/website/docs/source/v2/provisioning/ansible_intro.html.md b/website/docs/source/v2/provisioning/ansible_intro.html.md
index daa21aeb4..6871030d3 100644
--- a/website/docs/source/v2/provisioning/ansible_intro.html.md
+++ b/website/docs/source/v2/provisioning/ansible_intro.html.md
@@ -156,6 +156,8 @@ Vagrant.configure(2) do |config|
     ansible.groups = {
       "group1" => ["machine1"],
       "group2" => ["machine2"],
+      "group3" => ["machine[01:50]"],
+      "group4" => ["machine-[a:d]"],
       "all_groups:children" => ["group1", "group2"],
       "group1:vars" => {"variable1" => 9,
                         "variable2" => "example"}
@@ -171,6 +173,14 @@ Vagrant would generate an inventory file that might look like:
 
 machine1 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2200 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine1/virtualbox/private_key'
 machine2 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2222 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine2/virtualbox/private_key'
+machine01 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2223 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine01/virtualbox/private_key'
+machine02 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2224 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine02/virtualbox/private_key'
+machine03 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2225 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine03/virtualbox/private_key'
+machine04 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2226 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine04/virtualbox/private_key'
+machine-a ansible_ssh_host=127.0.0.1 ansible_ssh_port=2227 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine-a/virtualbox/private_key'
+machine-b ansible_ssh_host=127.0.0.1 ansible_ssh_port=2228 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine-b/virtualbox/private_key'
+machine-c ansible_ssh_host=127.0.0.1 ansible_ssh_port=2229 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine-c/virtualbox/private_key'
+machine-d ansible_ssh_host=127.0.0.1 ansible_ssh_port=2230 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine-d/virtualbox/private_key'
 
 [group1]
 machine1
@@ -178,6 +188,12 @@ machine1
 [group2]
 machine2
 
+[group3]
+machine[01:50]
+
+[group4]
+machine-[a:d]
+
 [all_groups:children]
 group1
 group2
@@ -192,14 +208,17 @@ variable2=example
   - Prior to Vagrant 1.7.3, the `ansible_ssh_private_key_file` variable was not set in generated inventory, but passed as command line argument to `ansible-playbook` command.
   - The generation of group variables blocks (e.g. `[group1:vars]`) is only possible since Vagrant 1.8.0. Note however that setting variables directly in the inventory is not the [preferred practice in Ansible](http://docs.ansible.com/intro_inventory.html#splitting-out-host-and-group-specific-data). If possible, group (or host) variables should be set in `YAML` files stored in the `group_vars/` or `host_vars/` directories in the playbook (or inventory) directory instead.
   - Unmanaged machines and undefined groups are not added to the inventory, to avoid useless Ansible errors (e.g. *unreachable host* or *undefined child group*)
+  - [Host range patterns (numeric and alphabetic ranges)](http://docs.ansible.com/ansible/intro_inventory.html#hosts-and-groups) will not be validated by vagrant. Hosts will be added as group members to the inventory anyway, this might lead to errors in Ansible (e.q *unreachable host*).
 
-For example, `machine3` and `group3` in the example below would not be added to the generated inventory file:
+For example, `machine3`, `group3` and `group1:vars` in the example below would not be added to the generated inventory file,
+`machine-[a:d]` and `machine[01:50]` would be (even thought there are no hosts named machine50):
 
 ```
 ansible.groups = {
-  "group1" => ["machine1"],
-  "group2" => ["machine2", "machine3"],
-  "all_groups:children" => ["group1", "group2", "group3"]
+  "group1" => ["machine1","machine[01:50]"],
+  "group2" => ["machine2", "machine3", "machine-[a:d]"],
+  "all_groups:children" => ["group1", "group2", "group3"],
+  "group1:vars" => { "variable1" => 9, "variable2" => "example" }
 }
 ```
 

From af6a80472efd56d8146d44b8ea4d204513fba929 Mon Sep 17 00:00:00 2001
From: Kamjar Gerami <kami.gerami@gmail.com>
Date: Thu, 3 Dec 2015 21:07:05 +0100
Subject: [PATCH 325/354] #3539 - Can't use alphanumeric patterns for box names
 in ansible.groups: added unit test for host range patterns

---
 .../unit/plugins/provisioners/ansible/provisioner_test.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index 9a8188f0f..663afeb83 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -287,7 +287,7 @@ VF
           "group1:children" => 'bar group3',
           "group2" => [iso_env.machine_names[1]],
           "group3" => ["unknown", "#{machine.name}"],
-          group4: [machine.name],
+          "group4" => ["machine[1:2]", "machine[a:f]"],
           "bar" => ["#{machine.name}", "group3"],
           "bar:children" => ["group1", "group2", "group3", "group5"],
         }
@@ -308,6 +308,10 @@ VF
           # Accept Symbol datatype for group names
           expect(inventory_content).to include("[group4]\n#{machine.name}\n\n")
 
+          # Accept host range patterns
+          expect(inventory_content).to match(/(?:\[[a-z]:[a-z]\]|\[[0-9]+?:[0-9]+?\])/)
+          expect(inventory_content).to include("[group4]\nmachine[1:2]\nmachine[a:f]\n")
+
           # Don't mix group names and host names
           expect(inventory_content).to include("[bar]\n#{machine.name}\n\n")
 
@@ -338,7 +342,7 @@ VF
 
           # Single string syntax
           expect(inventory_content).to include("[group3:vars]\nstringvar1=stringvalue1\nstringvar2=stringvalue2\n")
-        }
+       }
       end
     end
 

From 5cbbbb5e288951d7b12d3ecb9559a3875cc72cd3 Mon Sep 17 00:00:00 2001
From: Kamjar Gerami <kami.gerami@gmail.com>
Date: Thu, 3 Dec 2015 22:25:58 +0100
Subject: [PATCH 326/354] #3539 - Can't use alphanumeric patterns for box names
 in ansible.groups: Changed iteration logic for warning message and fixed
 regex typo

---
 plugins/provisioners/ansible/provisioner/base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/provisioners/ansible/provisioner/base.rb b/plugins/provisioners/ansible/provisioner/base.rb
index b61426037..cf88266f6 100644
--- a/plugins/provisioners/ansible/provisioner/base.rb
+++ b/plugins/provisioners/ansible/provisioner/base.rb
@@ -114,7 +114,7 @@ module VagrantPlugins
 
           # Verify if host range patterns exist and warn
           if config.groups.any? do |gm|
-            gm.to_s[/(?:\[[a-z]:[a-z]\]|\[[0-9]+?:[0-9]+?\])/]
+             gm.to_s[/(?:\[[a-z]:[a-z]\]|\[[0-9]+?:[0-9]+?\])/]
           end
             @machine.ui.warn(I18n.t("vagrant.provisioners.ansible.ansible_host_pattern_detected"))
           end

From f5f568b66b2a574cb3c493203e7bed8d749f678e Mon Sep 17 00:00:00 2001
From: Kamjar Gerami <kami.gerami@gmail.com>
Date: Fri, 4 Dec 2015 02:16:01 +0100
Subject: [PATCH 327/354] Added plain Symbol group name for unit test

---
 test/unit/plugins/provisioners/ansible/provisioner_test.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index 663afeb83..1fec0faff 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -288,6 +288,7 @@ VF
           "group2" => [iso_env.machine_names[1]],
           "group3" => ["unknown", "#{machine.name}"],
           "group4" => ["machine[1:2]", "machine[a:f]"],
+          "group6" => [machine.name],
           "bar" => ["#{machine.name}", "group3"],
           "bar:children" => ["group1", "group2", "group3", "group5"],
         }
@@ -306,7 +307,7 @@ VF
           expect(inventory_content).to include("[group3]\n#{machine.name}\n\n")
 
           # Accept Symbol datatype for group names
-          expect(inventory_content).to include("[group4]\n#{machine.name}\n\n")
+          expect(inventory_content).to include("[group6]\n#{machine.name}\n\n")
 
           # Accept host range patterns
           expect(inventory_content).to match(/(?:\[[a-z]:[a-z]\]|\[[0-9]+?:[0-9]+?\])/)

From b7e9437a77ea0f1c31fb0d5e8bbcede859bdbe5a Mon Sep 17 00:00:00 2001
From: Kamjar Gerami <kami.gerami@gmail.com>
Date: Fri, 4 Dec 2015 10:05:07 +0100
Subject: [PATCH 328/354] #3539 - Fixed syntax, language and logic according to
 comments made by reviewer in PR #6639

---
 .../provisioners/ansible/provisioner/base.rb  | 14 ++++++-------
 templates/locales/en.yml                      |  2 +-
 .../provisioners/ansible/provisioner_test.rb  |  3 +--
 .../v2/provisioning/ansible_intro.html.md     | 21 ++++++-------------
 4 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/plugins/provisioners/ansible/provisioner/base.rb b/plugins/provisioners/ansible/provisioner/base.rb
index cf88266f6..291df8213 100644
--- a/plugins/provisioners/ansible/provisioner/base.rb
+++ b/plugins/provisioners/ansible/provisioner/base.rb
@@ -12,6 +12,8 @@ module VagrantPlugins
 
       class Base < Vagrant.plugin("2", :provisioner)
 
+        RANGE_PATTERN = %r{(?:\[[a-z]:[a-z]\]|\[[0-9]+?:[0-9]+?\])}.freeze
+
         protected
 
         def initialize(machine, config)
@@ -113,9 +115,7 @@ module VagrantPlugins
           inventory_groups = ""
 
           # Verify if host range patterns exist and warn
-          if config.groups.any? do |gm|
-             gm.to_s[/(?:\[[a-z]:[a-z]\]|\[[0-9]+?:[0-9]+?\])/]
-          end
+          if config.groups.any? { |gm| gm.to_s[RANGE_PATTERN] }
             @machine.ui.warn(I18n.t("vagrant.provisioners.ansible.ansible_host_pattern_detected"))
           end
 
@@ -141,10 +141,10 @@ module VagrantPlugins
               defined_groups << gname
               inventory_groups += "\n[#{gname}]\n"
               gmembers.each do |gm|
-              # TODO : Expand and validate host range patterns
-              # against @inventory_machines list before adding them
-              # otherwise abort with an error message
-                if gm[/(?:\[[a-z]:[a-z]\]|\[[0-9]+?:[0-9]+?\])/]
+                # TODO : Expand and validate host range patterns
+                # against @inventory_machines list before adding them
+                # otherwise abort with an error message
+                if gm[RANGE_PATTERN]
                   inventory_groups += "#{gm}\n"
                 end
                 inventory_groups += "#{gm}\n" if @inventory_machines.include?(gm.to_sym)
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 6fbd4ee79..e3382002d 100755
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -2066,7 +2066,7 @@ en:
 
       ansible:
         ansible_host_pattern_detected: |-
-          Vagrant has detected a host range pattern in the ansible.groups option.
+          Vagrant has detected a host range pattern in the groups option.
           Vagrant doesn't fully check the validity of these parameters!
 
           Please check http://docs.ansible.com/ansible/intro_inventory.html#hosts-and-groups
diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index 1fec0faff..c97cdb5ed 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -310,7 +310,6 @@ VF
           expect(inventory_content).to include("[group6]\n#{machine.name}\n\n")
 
           # Accept host range patterns
-          expect(inventory_content).to match(/(?:\[[a-z]:[a-z]\]|\[[0-9]+?:[0-9]+?\])/)
           expect(inventory_content).to include("[group4]\nmachine[1:2]\nmachine[a:f]\n")
 
           # Don't mix group names and host names
@@ -343,7 +342,7 @@ VF
 
           # Single string syntax
           expect(inventory_content).to include("[group3:vars]\nstringvar1=stringvalue1\nstringvar2=stringvalue2\n")
-       }
+        }
       end
     end
 
diff --git a/website/docs/source/v2/provisioning/ansible_intro.html.md b/website/docs/source/v2/provisioning/ansible_intro.html.md
index 6871030d3..1db717912 100644
--- a/website/docs/source/v2/provisioning/ansible_intro.html.md
+++ b/website/docs/source/v2/provisioning/ansible_intro.html.md
@@ -156,8 +156,8 @@ Vagrant.configure(2) do |config|
     ansible.groups = {
       "group1" => ["machine1"],
       "group2" => ["machine2"],
-      "group3" => ["machine[01:50]"],
-      "group4" => ["machine-[a:d]"],
+      "group3" => ["machine[1:2]"],
+      "group4" => ["other_node-[a:d]"],
       "all_groups:children" => ["group1", "group2"],
       "group1:vars" => {"variable1" => 9,
                         "variable2" => "example"}
@@ -173,14 +173,6 @@ Vagrant would generate an inventory file that might look like:
 
 machine1 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2200 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine1/virtualbox/private_key'
 machine2 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2222 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine2/virtualbox/private_key'
-machine01 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2223 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine01/virtualbox/private_key'
-machine02 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2224 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine02/virtualbox/private_key'
-machine03 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2225 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine03/virtualbox/private_key'
-machine04 ansible_ssh_host=127.0.0.1 ansible_ssh_port=2226 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine04/virtualbox/private_key'
-machine-a ansible_ssh_host=127.0.0.1 ansible_ssh_port=2227 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine-a/virtualbox/private_key'
-machine-b ansible_ssh_host=127.0.0.1 ansible_ssh_port=2228 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine-b/virtualbox/private_key'
-machine-c ansible_ssh_host=127.0.0.1 ansible_ssh_port=2229 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine-c/virtualbox/private_key'
-machine-d ansible_ssh_host=127.0.0.1 ansible_ssh_port=2230 ansible_ssh_user='vagrant' ansible_ssh_private_key_file='/home/.../.vagrant/machines/machine-d/virtualbox/private_key'
 
 [group1]
 machine1
@@ -189,10 +181,10 @@ machine1
 machine2
 
 [group3]
-machine[01:50]
+machine[1:2]
 
 [group4]
-machine-[a:d]
+other_node-[a:d]
 
 [all_groups:children]
 group1
@@ -208,10 +200,9 @@ variable2=example
   - Prior to Vagrant 1.7.3, the `ansible_ssh_private_key_file` variable was not set in generated inventory, but passed as command line argument to `ansible-playbook` command.
   - The generation of group variables blocks (e.g. `[group1:vars]`) is only possible since Vagrant 1.8.0. Note however that setting variables directly in the inventory is not the [preferred practice in Ansible](http://docs.ansible.com/intro_inventory.html#splitting-out-host-and-group-specific-data). If possible, group (or host) variables should be set in `YAML` files stored in the `group_vars/` or `host_vars/` directories in the playbook (or inventory) directory instead.
   - Unmanaged machines and undefined groups are not added to the inventory, to avoid useless Ansible errors (e.g. *unreachable host* or *undefined child group*)
-  - [Host range patterns (numeric and alphabetic ranges)](http://docs.ansible.com/ansible/intro_inventory.html#hosts-and-groups) will not be validated by vagrant. Hosts will be added as group members to the inventory anyway, this might lead to errors in Ansible (e.q *unreachable host*).
+  - [Host range patterns (numeric and alphabetic ranges)](http://docs.ansible.com/ansible/intro_inventory.html#hosts-and-groups) will not be validated by Vagrant. Hosts will be added as group members to the inventory anyway, this might lead to errors in Ansible (e.g *unreachable host*).
 
-For example, `machine3`, `group3` and `group1:vars` in the example below would not be added to the generated inventory file,
-`machine-[a:d]` and `machine[01:50]` would be (even thought there are no hosts named machine50):
+For example, `machine3` and `group3` in the example below would not be added to the generated inventory file:
 
 ```
 ansible.groups = {

From c901e81e37bad6e0c9045d9321612a60e746025d Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Sat, 5 Dec 2015 06:59:29 +0100
Subject: [PATCH 329/354] docs (ansible): update and fixes for [GH-3539]

- clearly mention that this feature is available since Vagrant 1.8.0
- reorganize the special notes
- update the examples to be more focused, and mention that a host range
  is not coherent with `Vagrantfile` machine definitions.
---
 .../v2/provisioning/ansible_intro.html.md     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/website/docs/source/v2/provisioning/ansible_intro.html.md b/website/docs/source/v2/provisioning/ansible_intro.html.md
index 1db717912..cf8d4d01e 100644
--- a/website/docs/source/v2/provisioning/ansible_intro.html.md
+++ b/website/docs/source/v2/provisioning/ansible_intro.html.md
@@ -139,7 +139,8 @@ host2 ansible_ssh_host=... http_port=303 maxRequestsPerChild=909
 **How to generate Inventory Groups:**
 
 The [`groups`](/v2/provisioning/ansible_common.html) option can be used to pass a hash of group names and group members to be included in the generated inventory file.
-As of Vagrant 1.8.0, it is also possible to specify [group variables](http://docs.ansible.com/ansible/intro_inventory.html#group-variables).
+
+As of Vagrant 1.8.0, it is also possible to specify [group variables](http://docs.ansible.com/ansible/intro_inventory.html#group-variables), and group members as [host ranges (with numeric or alphabetic patterns)](http://docs.ansible.com/ansible/intro_inventory.html#hosts-and-groups).
 
 With this configuration example:
 
@@ -157,7 +158,7 @@ Vagrant.configure(2) do |config|
       "group1" => ["machine1"],
       "group2" => ["machine2"],
       "group3" => ["machine[1:2]"],
-      "group4" => ["other_node-[a:d]"],
+      "group4" => ["other_node-[a:d]"], # silly group definition
       "all_groups:children" => ["group1", "group2"],
       "group1:vars" => {"variable1" => 9,
                         "variable2" => "example"}
@@ -200,18 +201,17 @@ variable2=example
   - Prior to Vagrant 1.7.3, the `ansible_ssh_private_key_file` variable was not set in generated inventory, but passed as command line argument to `ansible-playbook` command.
   - The generation of group variables blocks (e.g. `[group1:vars]`) is only possible since Vagrant 1.8.0. Note however that setting variables directly in the inventory is not the [preferred practice in Ansible](http://docs.ansible.com/intro_inventory.html#splitting-out-host-and-group-specific-data). If possible, group (or host) variables should be set in `YAML` files stored in the `group_vars/` or `host_vars/` directories in the playbook (or inventory) directory instead.
   - Unmanaged machines and undefined groups are not added to the inventory, to avoid useless Ansible errors (e.g. *unreachable host* or *undefined child group*)
-  - [Host range patterns (numeric and alphabetic ranges)](http://docs.ansible.com/ansible/intro_inventory.html#hosts-and-groups) will not be validated by Vagrant. Hosts will be added as group members to the inventory anyway, this might lead to errors in Ansible (e.g *unreachable host*).
 
-For example, `machine3` and `group3` in the example below would not be added to the generated inventory file:
+  For example, `machine3` and `group3` in the example below would not be added to the generated inventory file:
 
-```
-ansible.groups = {
-  "group1" => ["machine1","machine[01:50]"],
-  "group2" => ["machine2", "machine3", "machine-[a:d]"],
-  "all_groups:children" => ["group1", "group2", "group3"],
-  "group1:vars" => { "variable1" => 9, "variable2" => "example" }
-}
-```
+  ```ruby
+  ansible.groups = {
+    "group1" => ["machine1"],
+    "group2" => ["machine2", "machine3"],
+    "all_groups:children" => ["group1", "group2", "group3"]
+  }
+  ```
+  - [Host range patterns (numeric and alphabetic ranges)](http://docs.ansible.com/ansible/intro_inventory.html#hosts-and-groups) will not be validated by Vagrant. As of Vagrant 1.8.0, host range patterns will be added as group members to the inventory anyway, this might lead to errors in Ansible (e.g *unreachable host*).
 
 ### Static Inventory
 

From 3a793a272158d8c3ad9c94205f0835ffb76bc483 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Sat, 5 Dec 2015 07:10:11 +0100
Subject: [PATCH 330/354] provisioners/ansible(both): minor tweak in en.yml

Related to #3539.
---
 templates/locales/en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index e3382002d..43b1f45d4 100755
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -2066,10 +2066,10 @@ en:
 
       ansible:
         ansible_host_pattern_detected: |-
-          Vagrant has detected a host range pattern in the groups option.
+          Vagrant has detected a host range pattern in the `groups` option.
           Vagrant doesn't fully check the validity of these parameters!
 
-          Please check http://docs.ansible.com/ansible/intro_inventory.html#hosts-and-groups
+          Please check https://docs.ansible.com/ansible/intro_inventory.html#hosts-and-groups
           for more information.
         cannot_detect: |-
           Vagrant does not support detecting whether Ansible is installed

From c20e1bb594d6c05b97644333cafc994071906ef2 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Sat, 5 Dec 2015 07:11:27 +0100
Subject: [PATCH 331/354] provisioners/ansible: support host pattern ranges

Introduction of "unsafe" numeric or alphabetic patterns in the generated inventory

Close #3539
---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 249891a71..87ee2a46c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,8 @@ IMPROVEMENTS:
   - provisioners/ansible+ansible_local: add support for ansible-galaxy [GH-2718]
   - provisioners/ansible+ansible_local: add support for group and host variables
       in the generated inventory [GH-6619]
+  - provisioners/ansible+ansible_local: add support for alphanumeric patterns
+      for groups in the generated inventory [GH-3539]
   - provisioners/ansible: add support for WinRM settings [GH-5086]
   - provisioners/ansible: add new `force_remote_user` option to control whether
     `ansible_ssh_user` parameter should be applied or not [GH-6348]

From 546649fb9e78fe55b3856ee0ad4621d4bdc58fdc Mon Sep 17 00:00:00 2001
From: Michael Kuzmin <michael.kuzmin@jetbrains.com>
Date: Sat, 5 Dec 2015 17:24:58 +0300
Subject: [PATCH 332/354] Fix `uninitialized constant` error in `vagrant
 powershell` command

---
 plugins/commands/powershell/command.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/commands/powershell/command.rb b/plugins/commands/powershell/command.rb
index 9c25bd641..836c22a02 100644
--- a/plugins/commands/powershell/command.rb
+++ b/plugins/commands/powershell/command.rb
@@ -1,5 +1,6 @@
 require "optparse"
 
+require "vagrant/util/powershell"
 require_relative "../../communicators/winrm/helper"
 
 module VagrantPlugins

From 9f3ebef810aca0ae87483e38fc40f04ae39f7708 Mon Sep 17 00:00:00 2001
From: Rickard von Essen <rickard.von.essen@gmail.com>
Date: Mon, 7 Dec 2015 15:44:20 +0100
Subject: [PATCH 333/354] Support ansible install on RedHat derivates and
 Fedora.

Fixes #6636
---
 .../ansible/cap/guest/epel/ansible_install.rb | 39 -------------------
 .../cap/guest/fedora/ansible_install.rb       | 25 ++++++++++++
 .../cap/guest/redhat/ansible_install.rb       | 29 ++++++++++++++
 plugins/provisioners/ansible/plugin.rb        |  9 ++++-
 4 files changed, 61 insertions(+), 41 deletions(-)
 delete mode 100644 plugins/provisioners/ansible/cap/guest/epel/ansible_install.rb
 create mode 100644 plugins/provisioners/ansible/cap/guest/fedora/ansible_install.rb
 create mode 100644 plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb

diff --git a/plugins/provisioners/ansible/cap/guest/epel/ansible_install.rb b/plugins/provisioners/ansible/cap/guest/epel/ansible_install.rb
deleted file mode 100644
index 6ae10b091..000000000
--- a/plugins/provisioners/ansible/cap/guest/epel/ansible_install.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-
-module VagrantPlugins
-  module Ansible
-    module Cap
-      module Guest
-        module EPEL # Extra Packages for Enterprise Linux (for RedHat-family distributions)
-          module AnsibleInstall
-
-            # This should work on recent Fedora releases, and any other members of the
-            # RedHat family which supports YUM and http://fedoraproject.org/wiki/EPEL
-            def self.ansible_install(machine)
-
-              configure_epel = <<INLINE_CRIPT
-cat <<EOM >/etc/yum.repos.d/epel-bootstrap.repo
-[epel]
-name=Bootstrap EPEL
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-\$releasever&arch=\$basearch
-failovermethod=priority
-enabled=0
-gpgcheck=0
-EOM
-
-yum --assumeyes --quiet --enablerepo=epel install epel-release
-rm -f /etc/yum.repos.d/epel-bootstrap.repo
-INLINE_CRIPT
-
-              ansible_is_installable = machine.communicate.execute("yum info ansible", :error_check => false)
-              if ansible_is_installable != 0
-                machine.communicate.sudo(configure_epel)
-              end
-              machine.communicate.sudo("yum --assumeyes --quiet --enablerepo=epel install ansible")
-            end
-
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/plugins/provisioners/ansible/cap/guest/fedora/ansible_install.rb b/plugins/provisioners/ansible/cap/guest/fedora/ansible_install.rb
new file mode 100644
index 000000000..badaace03
--- /dev/null
+++ b/plugins/provisioners/ansible/cap/guest/fedora/ansible_install.rb
@@ -0,0 +1,25 @@
+
+module VagrantPlugins
+  module Ansible
+    module Cap
+      module Guest
+        module Fedora
+          module AnsibleInstall
+
+            def self.ansible_install(machine)
+              if dnf?(machine)
+                machine.communicate.sudo("dnf -y install ansible")
+              else
+                machine.communicate.sudo("yum -y install ansible")
+              end
+            end
+
+            def self.dnf?(machine)
+              machine.communicate.test("/usr/bin/which -s dnf")
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb b/plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb
new file mode 100644
index 000000000..8e17908e4
--- /dev/null
+++ b/plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb
@@ -0,0 +1,29 @@
+
+module VagrantPlugins
+  module Ansible
+    module Cap
+      module Guest
+        module RedHat
+          module AnsibleInstall
+
+            # This should work on recent Fedora releases, and any other members of the
+            # RedHat family which supports YUM and http://fedoraproject.org/wiki/EPEL
+            def self.ansible_install(machine)
+
+              epel = machine.communicate.execute("#{yum_dnf(machine)} repolist epel | grep -q epel", :error_check => false)
+              if epel != 0
+                machine.communicate.sudo('sudo rpm -i https://dl.fedoraproject.org/pub/epel/epel-release-latest-`rpm -E %dist | sed -n \'s/.*el\([0-9]\).*/\1/p\'`.noarch.rpm')
+              end
+
+              machine.communicate.sudo("#{yum_dnf(machine)} -y --enablerepo=epel install ansible")
+            end
+
+            def self.yum_dnf(machine)
+              machine.communicate.test("/usr/bin/which -s dnf") ? "dnf" : "yum"
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/provisioners/ansible/plugin.rb b/plugins/provisioners/ansible/plugin.rb
index 3be60f8ad..b0e0aa0ed 100644
--- a/plugins/provisioners/ansible/plugin.rb
+++ b/plugins/provisioners/ansible/plugin.rb
@@ -55,9 +55,14 @@ module VagrantPlugins
         Cap::Guest::Ubuntu::AnsibleInstall
       end
 
+      guest_capability(:fedora, :ansible_install) do
+        require_relative "cap/guest/fedora/ansible_install"
+        Cap::Guest::Fedora::AnsibleInstall
+      end
+
       guest_capability(:redhat, :ansible_install) do
-        require_relative "cap/guest/epel/ansible_install"
-        Cap::Guest::EPEL::AnsibleInstall
+        require_relative "cap/guest/redhat/ansible_install"
+        Cap::Guest::RedHat::AnsibleInstall
       end
 
       guest_capability(:suse, :ansible_install) do

From 4e21dd78e4e9d50e56059cf00610c2201201bb4c Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 7 Dec 2015 10:30:44 -0500
Subject: [PATCH 334/354] Ignore case when comparing checksums

Fixes GH-6648
---
 lib/vagrant/action/builtin/box_add.rb         |  2 +-
 .../vagrant/action/builtin/box_add_test.rb    | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/lib/vagrant/action/builtin/box_add.rb b/lib/vagrant/action/builtin/box_add.rb
index fbc6bd51f..b87bf46b6 100644
--- a/lib/vagrant/action/builtin/box_add.rb
+++ b/lib/vagrant/action/builtin/box_add.rb
@@ -522,7 +522,7 @@ module Vagrant
           @logger.info("Expected checksum: #{checksum}")
 
           actual = FileChecksum.new(path, checksum_klass).checksum
-          if actual != checksum
+          if actual.casecmp(checksum) != 0
             raise Errors::BoxChecksumMismatch,
               actual: actual,
               expected: checksum
diff --git a/test/unit/vagrant/action/builtin/box_add_test.rb b/test/unit/vagrant/action/builtin/box_add_test.rb
index d881fad0b..db3c7044f 100644
--- a/test/unit/vagrant/action/builtin/box_add_test.rb
+++ b/test/unit/vagrant/action/builtin/box_add_test.rb
@@ -207,6 +207,28 @@ describe Vagrant::Action::Builtin::BoxAdd, :skip_windows do
         to raise_error(Vagrant::Errors::BoxChecksumMismatch)
     end
 
+    it "does not raise an error if the checksum has different case" do
+      box_path = iso_env.box2_file(:virtualbox)
+
+      box = double(
+        name: "foo",
+        version: "1.2.3",
+        provider: "virtualbox",
+      )
+
+      env[:box_name] = box.name
+      env[:box_url] = box_path.to_s
+      env[:box_checksum] = checksum(box_path)
+      env[:box_checksum_type] = "sha1"
+
+      # Convert to a different case
+      env[:box_checksum].upcase!
+
+      expect(box_collection).to receive(:add).and_return(box)
+
+      expect { subject.call(env) }.to_not raise_error
+    end
+
     it "raises an error if the box path doesn't exist" do
       box_path = iso_env.box2_file(:virtualbox)
 

From 5c09e94f1a5c122b845ea38dc8d449ea8fa0a8a3 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 7 Dec 2015 10:57:26 -0500
Subject: [PATCH 335/354] Clarify that support might be in a later Vagrant
 version

---
 templates/locales/en.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 43b1f45d4..efdc98d58 100755
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1315,10 +1315,14 @@ en:
         This is an internal error that should be reported as a bug.
       virtualbox_invalid_version: |-
         Vagrant has detected that you have a version of VirtualBox installed
-        that is not supported. Please install one of the supported versions
-        listed below to use Vagrant:
+        that is not supported by this version of Vagrant. Please install one of
+        the supported versions listed below to use Vagrant:
 
         %{supported_versions}
+
+        A Vagrant update may also be available that adds support for the version
+        you specified. Please check www.vagrantup.com/downloads.html to download
+        the latest version.
       virtualbox_kernel_module_not_loaded: |-
         VirtualBox is complaining that the kernel module is not loaded. Please
         run `VBoxManage --version` or open the VirtualBox GUI to see the error

From c60a71861f75135a7111985b289b93770fc496d5 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 7 Dec 2015 10:58:46 -0500
Subject: [PATCH 336/354] Update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87ee2a46c..fa5153c87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -85,6 +85,8 @@ BUG FIXES:
   - core: catch errors setting env vars on Windows [GH-6017]
   - core: remove cached synced folders when they're removed from the
       Vagrantfile [GH-6567]
+  - core: use case-insensitive comparison for box checksum validations
+    [GH-6648, GH-6650]
   - commands/box: add command with `~` paths on Windows works [GH-5747]
   - commands/box: the update command supports CA settings [GH-4473]
   - commands/box: removing all versions and providers of a box will properly

From 850716b2207ec43d2367ec6c74e85b6a08e51ba4 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Mon, 7 Dec 2015 22:28:23 +0100
Subject: [PATCH 337/354] provisioners/ansible: remove erroneous comment

[ci skip]
---
 .../provisioners/ansible/cap/guest/redhat/ansible_install.rb    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb b/plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb
index 8e17908e4..b2f1a7070 100644
--- a/plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb
+++ b/plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb
@@ -6,8 +6,6 @@ module VagrantPlugins
         module RedHat
           module AnsibleInstall
 
-            # This should work on recent Fedora releases, and any other members of the
-            # RedHat family which supports YUM and http://fedoraproject.org/wiki/EPEL
             def self.ansible_install(machine)
 
               epel = machine.communicate.execute("#{yum_dnf(machine)} repolist epel | grep -q epel", :error_check => false)

From a0980aa8bef1dd494ac264e335c386a989ae3790 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Mon, 7 Dec 2015 22:30:13 +0100
Subject: [PATCH 338/354] provisioners/ansible: minor code formatting change

[ci skip]
---
 .../provisioners/ansible/cap/guest/fedora/ansible_install.rb    | 1 +
 .../provisioners/ansible/cap/guest/redhat/ansible_install.rb    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/provisioners/ansible/cap/guest/fedora/ansible_install.rb b/plugins/provisioners/ansible/cap/guest/fedora/ansible_install.rb
index badaace03..12c8866b5 100644
--- a/plugins/provisioners/ansible/cap/guest/fedora/ansible_install.rb
+++ b/plugins/provisioners/ansible/cap/guest/fedora/ansible_install.rb
@@ -17,6 +17,7 @@ module VagrantPlugins
             def self.dnf?(machine)
               machine.communicate.test("/usr/bin/which -s dnf")
             end
+
           end
         end
       end
diff --git a/plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb b/plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb
index b2f1a7070..eb26e2de3 100644
--- a/plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb
+++ b/plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb
@@ -7,7 +7,6 @@ module VagrantPlugins
           module AnsibleInstall
 
             def self.ansible_install(machine)
-
               epel = machine.communicate.execute("#{yum_dnf(machine)} repolist epel | grep -q epel", :error_check => false)
               if epel != 0
                 machine.communicate.sudo('sudo rpm -i https://dl.fedoraproject.org/pub/epel/epel-release-latest-`rpm -E %dist | sed -n \'s/.*el\([0-9]\).*/\1/p\'`.noarch.rpm')
@@ -19,6 +18,7 @@ module VagrantPlugins
             def self.yum_dnf(machine)
               machine.communicate.test("/usr/bin/which -s dnf") ? "dnf" : "yum"
             end
+
           end
         end
       end

From bcf61d001bcaee59adb41551969df2967ac4efc3 Mon Sep 17 00:00:00 2001
From: Timur Alperovich <timuralp@swiftstack.com>
Date: Mon, 23 Nov 2015 14:58:32 -0800
Subject: [PATCH 339/354] Only consider the VM interfaces in the IPv6 fixup.

Vagrant should only consider the host-only interfaces used by the
virtual machine in the IPv6 fixup code. There may be other interfaces
present on the system with IPv6 addresses that for various reasons
would fail the routing check (for example, an interface with no
machines attached).

The patch changes the behavior to not scan all of the host-only
interfaces and adds a unit test for the behavior (that the correct IP
is validated).

Lastly, there is a small fix here that may not be an issue for most
people where the IPv6 prefix was asummed to be a multiple of 16 for
the purposes of constructing the UDP probe datagram. This assumption
has been removed.

Fixes #6586
---
 .../virtualbox/action/network_fix_ipv6.rb     |  21 +--
 .../action/network_fix_ipv6_test.rb           | 134 +++++++++++++++++-
 2 files changed, 144 insertions(+), 11 deletions(-)

diff --git a/plugins/providers/virtualbox/action/network_fix_ipv6.rb b/plugins/providers/virtualbox/action/network_fix_ipv6.rb
index b8b12be58..dcfa2632e 100644
--- a/plugins/providers/virtualbox/action/network_fix_ipv6.rb
+++ b/plugins/providers/virtualbox/action/network_fix_ipv6.rb
@@ -41,21 +41,22 @@ module VagrantPlugins
           # If we have no IPv6, forget it
           return if !has_v6
 
-          # We do, so fix them if we must
-          env[:machine].provider.driver.read_host_only_interfaces.each do |interface|
-            # Ignore interfaces without an IPv6 address
-            next if interface[:ipv6] == ""
-
-            # Make the test IP. This is just the highest value IP
-            ip = IPAddr.new(interface[:ipv6])
-            ip |= IPAddr.new(":#{":FFFF" * (interface[:ipv6_prefix].to_i / 16)}")
-
+          ifaces = env[:machine].provider.driver.read_network_interfaces
+          ifaces.select! { |id, iface| iface[:type] == :hostonly }
+          iface_names = ifaces.values.map { |iface| iface[:hostonly] }
+          networks = env[:machine].provider.driver.read_host_only_interfaces
+          networks.select! { |network| iface_names.include?(network[:name]) }
+          networks.each do |network|
+            next if network[:ipv6] == ""
+            next if network[:status] != 'Up'
+            ip = IPAddr.new(network[:ipv6]) |
+              ('1' * (128 - network[:ipv6_prefix].to_i)).to_i(2)
             @logger.info("testing IPv6: #{ip}")
             begin
               UDPSocket.new(Socket::AF_INET6).connect(ip.to_s, 80)
             rescue Errno::EHOSTUNREACH
               @logger.info("IPv6 host unreachable. Fixing: #{ip}")
-              env[:machine].provider.driver.reconfig_host_only(interface)
+              env[:machine].provider.driver.reconfig_host_only(network)
             end
           end
         end
diff --git a/test/unit/plugins/providers/virtualbox/action/network_fix_ipv6_test.rb b/test/unit/plugins/providers/virtualbox/action/network_fix_ipv6_test.rb
index d4b985a63..2f99b954b 100644
--- a/test/unit/plugins/providers/virtualbox/action/network_fix_ipv6_test.rb
+++ b/test/unit/plugins/providers/virtualbox/action/network_fix_ipv6_test.rb
@@ -1,4 +1,5 @@
 require_relative "../base"
+require 'socket'
 
 describe VagrantPlugins::ProviderVirtualBox::Action::NetworkFixIPv6 do
   include_context "unit"
@@ -11,11 +12,14 @@ describe VagrantPlugins::ProviderVirtualBox::Action::NetworkFixIPv6 do
   end
 
   let(:machine) do
-    iso_env.machine(iso_env.machine_names[0], :dummy)
+    iso_env.machine(iso_env.machine_names[0], :dummy).tap do |m|
+      m.provider.stub(driver: driver)
+    end
   end
 
   let(:env) {{ machine: machine }}
   let(:app) { lambda { |*args| }}
+  let(:driver) { double("driver") }
 
   subject { described_class.new(app, env) }
 
@@ -30,4 +34,132 @@ describe VagrantPlugins::ProviderVirtualBox::Action::NetworkFixIPv6 do
       .and_return(private_network: { ip: "" })
     expect { subject.call(env) }.to_not raise_error
   end
+
+  context "with IPv6 interfaces" do
+    let(:socket) { double("socket") }
+
+    before do
+      # This address is only used to trigger the fixup code. It doesn't matter
+      # what it is.
+      allow(machine.config.vm).to receive(:networks)
+        .and_return(private_network: { ip: 'fe:80::' })
+      allow(UDPSocket).to receive(:new).with(Socket::AF_INET6)
+        .and_return(socket)
+      socket.stub(:connect)
+    end
+
+    it "only checks the interfaces associated with the VM" do
+      all_networks = [{name: "vboxnet0",
+                       ipv6: "dead:beef::",
+                       ipv6_prefix: 64,
+                       status: 'Up'
+                      },
+                      {name: "vboxnet1",
+                       ipv6: "badd:badd::",
+                       ipv6_prefix: 64,
+                       status: 'Up'
+                      }
+                     ]
+      ifaces = { 1 => {type: :hostonly, hostonly: "vboxnet0"}
+               }
+      allow(machine.provider.driver).to receive(:read_network_interfaces)
+        .and_return(ifaces)
+      allow(machine.provider.driver).to receive(:read_host_only_interfaces)
+        .and_return(all_networks)
+      subject.call(env)
+      expect(socket).to have_received(:connect)
+        .with(all_networks[0][:ipv6] + (['ffff']*4).join(':'), 80)
+    end
+
+    it "correctly uses the netmask to figure out the probe address" do
+      all_networks = [{name: "vboxnet0",
+                       ipv6: "dead:beef::",
+                       ipv6_prefix: 113,
+                       status: 'Up'
+                      }
+                     ]
+      ifaces = { 1 => {type: :hostonly, hostonly: "vboxnet0"}
+               }
+      allow(machine.provider.driver).to receive(:read_network_interfaces)
+        .and_return(ifaces)
+      allow(machine.provider.driver).to receive(:read_host_only_interfaces)
+        .and_return(all_networks)
+      subject.call(env)
+      expect(socket).to have_received(:connect)
+        .with(all_networks[0][:ipv6] + '7fff', 80)
+    end
+
+    it "should ignore interfaces that are down" do
+      all_networks = [{name: "vboxnet0",
+                       ipv6: "dead:beef::",
+                       ipv6_prefix: 64,
+                       status: 'Down'
+                      }
+                     ]
+      ifaces = { 1 => {type: :hostonly, hostonly: "vboxnet0"}
+               }
+      allow(machine.provider.driver).to receive(:read_network_interfaces)
+        .and_return(ifaces)
+      allow(machine.provider.driver).to receive(:read_host_only_interfaces)
+        .and_return(all_networks)
+      subject.call(env)
+      expect(socket).to_not have_received(:connect)
+    end
+
+    it "should ignore interfaces without an IPv6 address" do
+      all_networks = [{name: "vboxnet0",
+                       ipv6: "",
+                       ipv6_prefix: 0,
+                       status: 'Up'
+                      }
+                     ]
+      ifaces = { 1 => {type: :hostonly, hostonly: "vboxnet0"}
+               }
+      allow(machine.provider.driver).to receive(:read_network_interfaces)
+        .and_return(ifaces)
+      allow(machine.provider.driver).to receive(:read_host_only_interfaces)
+        .and_return(all_networks)
+      subject.call(env)
+      expect(socket).to_not have_received(:connect)
+    end
+
+    it "should ignore nat interfaces" do
+      all_networks = [{name: "vboxnet0",
+                       ipv6: "",
+                       ipv6_prefix: 0,
+                       status: 'Up'
+                      }
+                     ]
+      ifaces = { 1 => {type: :nat}
+               }
+      allow(machine.provider.driver).to receive(:read_network_interfaces)
+        .and_return(ifaces)
+      allow(machine.provider.driver).to receive(:read_host_only_interfaces)
+        .and_return(all_networks)
+      subject.call(env)
+      expect(socket).to_not have_received(:connect)
+    end
+
+    it "should reconfigure an interface if unreachable" do
+      all_networks = [{name: "vboxnet0",
+                       ipv6: "dead:beef::",
+                       ipv6_prefix: 64,
+                       status: 'Up'
+                      }
+                     ]
+      ifaces = { 1 => {type: :hostonly, hostonly: "vboxnet0"}
+               }
+      allow(machine.provider.driver).to receive(:read_network_interfaces)
+        .and_return(ifaces)
+      allow(machine.provider.driver).to receive(:read_host_only_interfaces)
+        .and_return(all_networks)
+      allow(socket).to receive(:connect)
+        .with(all_networks[0][:ipv6] + (['ffff']*4).join(':'), 80)
+        .and_raise Errno::EHOSTUNREACH
+      allow(machine.provider.driver).to receive(:reconfig_host_only)
+      subject.call(env)
+      expect(machine.provider.driver).to have_received(:reconfig_host_only)
+        .with(all_networks[0])
+    end
+  end
 end

From 9ba8cfcd507da14d5d2a975be53f5452a3676ab6 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Tue, 8 Dec 2015 10:52:54 -0500
Subject: [PATCH 340/354] Separate logic into other functions for readability

---
 .../virtualbox/action/network_fix_ipv6.rb     | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/plugins/providers/virtualbox/action/network_fix_ipv6.rb b/plugins/providers/virtualbox/action/network_fix_ipv6.rb
index dcfa2632e..853890441 100644
--- a/plugins/providers/virtualbox/action/network_fix_ipv6.rb
+++ b/plugins/providers/virtualbox/action/network_fix_ipv6.rb
@@ -3,6 +3,7 @@ require "socket"
 
 require "log4r"
 
+require "vagrant/util/presence"
 require "vagrant/util/scoped_hash_override"
 
 module VagrantPlugins
@@ -12,6 +13,7 @@ module VagrantPlugins
       # a VM with an IPv6 host-only network will someties lose the
       # route to that machine.
       class NetworkFixIPv6
+        include Vagrant::Util::Presence
         include Vagrant::Util::ScopedHashOverride
 
         def initialize(app, env)
@@ -41,17 +43,15 @@ module VagrantPlugins
           # If we have no IPv6, forget it
           return if !has_v6
 
-          ifaces = env[:machine].provider.driver.read_network_interfaces
-          ifaces.select! { |id, iface| iface[:type] == :hostonly }
-          iface_names = ifaces.values.map { |iface| iface[:hostonly] }
-          networks = env[:machine].provider.driver.read_host_only_interfaces
-          networks.select! { |network| iface_names.include?(network[:name]) }
-          networks.each do |network|
-            next if network[:ipv6] == ""
-            next if network[:status] != 'Up'
-            ip = IPAddr.new(network[:ipv6]) |
-              ('1' * (128 - network[:ipv6_prefix].to_i)).to_i(2)
+          networks(env).each do |network|
+            next if !present?(network[:ipv6])
+            next if network[:status] != "Up"
+
+            ip = IPAddr.new(network[:ipv6])
+            ip |= ("1" * (128 - network[:ipv6_prefix].to_i)).to_i(2)
+
             @logger.info("testing IPv6: #{ip}")
+
             begin
               UDPSocket.new(Socket::AF_INET6).connect(ip.to_s, 80)
             rescue Errno::EHOSTUNREACH
@@ -60,6 +60,21 @@ module VagrantPlugins
             end
           end
         end
+
+        # The list of interface names for host-only adapters.
+        # @return [Array<String>]
+        def host_only_interface_names(env)
+          env[:machine].provider.driver.read_network_interfaces
+            .map { |_, i| i[:hostonly] if i[:type] == :hostonly }.compact
+        end
+
+        # The list of networks that are tied to a host-only adapter.
+        # @return [Array]
+        def networks(env)
+          iface_names = self.host_only_interface_names(env)
+          env[:machine].provider.driver.read_host_only_interfaces
+            .select { |network| iface_names.include?(network[:name]) }
+        end
       end
     end
   end

From aca1e041f6d12f6e157474d4e56f2145d7565a2b Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Tue, 8 Dec 2015 11:05:13 -0500
Subject: [PATCH 341/354] Rename network to interface

---
 .../virtualbox/action/network_fix_ipv6.rb      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/providers/virtualbox/action/network_fix_ipv6.rb b/plugins/providers/virtualbox/action/network_fix_ipv6.rb
index 853890441..7aec8d110 100644
--- a/plugins/providers/virtualbox/action/network_fix_ipv6.rb
+++ b/plugins/providers/virtualbox/action/network_fix_ipv6.rb
@@ -43,12 +43,12 @@ module VagrantPlugins
           # If we have no IPv6, forget it
           return if !has_v6
 
-          networks(env).each do |network|
-            next if !present?(network[:ipv6])
-            next if network[:status] != "Up"
+          host_only_interfaces(env).each do |interface|
+            next if !present?(interface[:ipv6])
+            next if interface[:status] != "Up"
 
-            ip = IPAddr.new(network[:ipv6])
-            ip |= ("1" * (128 - network[:ipv6_prefix].to_i)).to_i(2)
+            ip = IPAddr.new(interface[:ipv6])
+            ip |= ("1" * (128 - interface[:ipv6_prefix].to_i)).to_i(2)
 
             @logger.info("testing IPv6: #{ip}")
 
@@ -56,7 +56,7 @@ module VagrantPlugins
               UDPSocket.new(Socket::AF_INET6).connect(ip.to_s, 80)
             rescue Errno::EHOSTUNREACH
               @logger.info("IPv6 host unreachable. Fixing: #{ip}")
-              env[:machine].provider.driver.reconfig_host_only(network)
+              env[:machine].provider.driver.reconfig_host_only(interface)
             end
           end
         end
@@ -68,12 +68,12 @@ module VagrantPlugins
             .map { |_, i| i[:hostonly] if i[:type] == :hostonly }.compact
         end
 
-        # The list of networks that are tied to a host-only adapter.
+        # The list of host_only_interfaces that are tied to a host-only adapter.
         # @return [Array]
-        def networks(env)
+        def host_only_interfaces(env)
           iface_names = self.host_only_interface_names(env)
           env[:machine].provider.driver.read_host_only_interfaces
-            .select { |network| iface_names.include?(network[:name]) }
+            .select { |interface| iface_names.include?(interface[:name]) }
         end
       end
     end

From af509e0a2b9b8be325f4102d9de52546097291b3 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Tue, 8 Dec 2015 11:17:11 -0500
Subject: [PATCH 342/354] Update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa5153c87..c54a4c7ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -120,6 +120,8 @@ BUG FIXES:
   - providers/hyper-v: support generation 2 VMs [GH-6372]
   - providers/hyper-v: support VMs with more than one NIC [GH-4346]
   - providers/virtualbox: ignore "Unknown" status bridge interfaces [GH-6061]
+  - providers/virtualbox: only fix ipv6 interfaces that are in use
+      [GH-6586, GH-6552]
   - provisioners/ansible: use quotes for the `ansible_ssh_private_key_file`
     value in the generated inventory [GH-6209]
   - provisioners/ansible: don't show the `ansible-playbook` command when verbose

From e5c5dfbacd42c2f17c719d53f14101d006ba57a8 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Tue, 8 Dec 2015 22:11:30 +0100
Subject: [PATCH 343/354] Update CHANGELOG

- Fix reference to relevant pull request #6288
- See also #6649

[ci skip]
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c54a4c7ab..fc89a717e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -112,7 +112,7 @@ BUG FIXES:
   - guests/darwin: advanced networking works with more NICs [GH-6386]
   - guests/debian: graceful shutdown works properly with newer releases [GH-5986]
   - guests/fedora: Preserve `localhost` entry when changing hostname [GH-6203]
-  - guests/fedora: Use dnf if it is available [GH-6301]
+  - guests/fedora: Use dnf if it is available [GH-6288]
   - guests/linux: when replacing a public SSH key, use POSIX-compliant
       sed flags [GH-6565]
   - guests/suse: DHCP network interfaces properly configured [GH-6502]

From 25ff027b08582978981ed28754a3fed21953a90e Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Tue, 8 Dec 2015 22:59:02 +0100
Subject: [PATCH 344/354] provisioners/ansible_local: use the inventory
 directory

Like in the (remote) `ansible` provisioner, it is preferred to pass the
directory that contains the generated inventory file. This way, advanced
inventory usages can be achieved by adding more inventory files into the
same directory.

Related to #2103 and #6500

[ci skip]
---
 plugins/provisioners/ansible/provisioner/guest.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/provisioners/ansible/provisioner/guest.rb b/plugins/provisioners/ansible/provisioner/guest.rb
index 6f0b43f95..833fbfc8b 100644
--- a/plugins/provisioners/ansible/provisioner/guest.rb
+++ b/plugins/provisioners/ansible/provisioner/guest.rb
@@ -113,7 +113,7 @@ module VagrantPlugins
             comm.upload(temp_inventory.path, inventory_path)
           end
 
-          return inventory_path
+          return inventory_basedir
         end
 
         def generate_inventory_machines

From a56e118b16901f58b5bc0843e1174bde65afec82 Mon Sep 17 00:00:00 2001
From: Timur Alperovich <timuralp@swiftstack.com>
Date: Wed, 9 Dec 2015 17:22:02 -0800
Subject: [PATCH 345/354] Use <prefix>::1 as the IPv6 adapter IP.

Set the IPv6 adapter IP to be <prefix>::1. Otherwise, guest to host
communication over IPv6 is not routed correctly. This means that
consumers should not specify <prefix>::1 IP addresses to VirtualBox,
which should be a reasonable restriction.

Fixes #6658
---
 .../providers/virtualbox/action/network.rb    |  4 +--
 .../virtualbox/action/network_test.rb         | 28 +++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/plugins/providers/virtualbox/action/network.rb b/plugins/providers/virtualbox/action/network.rb
index be15c1c47..9618567ca 100644
--- a/plugins/providers/virtualbox/action/network.rb
+++ b/plugins/providers/virtualbox/action/network.rb
@@ -290,8 +290,8 @@ module VagrantPlugins
             # Default subnet prefix length
             options[:netmask] ||= 64
 
-            # IPv6 we just mask the address and use that as the adapter
-            options[:adapter_ip] ||= ip.mask(options[:netmask].to_i).to_s
+            # Set adapter IP to <prefix>::1
+            options[:adapter_ip] ||= (ip.mask(options[:netmask].to_i) | 1).to_s
 
             # Append a 6 to the end of the type
             options[:type] = "#{options[:type]}6".to_sym
diff --git a/test/unit/plugins/providers/virtualbox/action/network_test.rb b/test/unit/plugins/providers/virtualbox/action/network_test.rb
index e9986492d..0d1f262e2 100644
--- a/test/unit/plugins/providers/virtualbox/action/network_test.rb
+++ b/test/unit/plugins/providers/virtualbox/action/network_test.rb
@@ -42,6 +42,34 @@ describe VagrantPlugins::ProviderVirtualBox::Action::Network do
     expect(called).to eq(true)
   end
 
+  it "creates a host-only interface with an IPv6 address <prefix>:1" do
+    guest = double("guest")
+    machine.config.vm.network 'private_network', { type: :static, ip: 'dead:beef::100' }
+    #allow(driver).to receive(:read_bridged_interfaces) { [] }
+    allow(driver).to receive(:read_host_only_interfaces) { [] }
+    #allow(driver).to receive(:read_dhcp_servers) { [] }
+    allow(machine).to receive(:guest) { guest }
+    allow(driver).to receive(:create_host_only_network) {{ name: 'vboxnet0' }}
+    allow(guest).to receive(:capability)
+    interface_ip = 'dead:beef::1'
+
+    subject.call(env)
+
+    expect(driver).to have_received(:create_host_only_network).with({
+      adapter_ip: interface_ip,
+      netmask: 64,
+    })
+
+    expect(guest).to have_received(:capability).with(:configure_networks, [{
+      type: :static6,
+      adapter_ip: 'dead:beef::1',
+      ip: 'dead:beef::100',
+      netmask: 64,
+      auto_config: true,
+      interface: nil
+    }])
+  end
+
   context "with a dhcp private network" do
     let(:bridgedifs)  { [] }
     let(:hostonlyifs) { [] }

From 77031a79b7409e7b4758d94eb2666c1737c583cb Mon Sep 17 00:00:00 2001
From: Hasyimi Bahrudin <hasyimi@terato.com>
Date: Thu, 10 Dec 2015 15:58:02 +0800
Subject: [PATCH 346/354] pushes/local-exec: add args config

---
 plugins/pushes/local-exec/config.rb           | 29 +++++++
 plugins/pushes/local-exec/locales/en.yml      |  1 +
 plugins/pushes/local-exec/push.rb             | 25 ++++--
 .../plugins/pushes/local-exec/config_test.rb  | 79 +++++++++++++++++++
 .../plugins/pushes/local-exec/push_test.rb    | 29 +++++--
 .../docs/source/v2/push/local-exec.html.md    |  9 +++
 6 files changed, 159 insertions(+), 13 deletions(-)

diff --git a/plugins/pushes/local-exec/config.rb b/plugins/pushes/local-exec/config.rb
index 747ff8925..d62dfa8fa 100644
--- a/plugins/pushes/local-exec/config.rb
+++ b/plugins/pushes/local-exec/config.rb
@@ -10,14 +10,24 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :inline
 
+      # The arguments to provide when executing the script.
+      # @return [Array<String>]
+      attr_accessor :args
+
       def initialize
         @script = UNSET_VALUE
         @inline = UNSET_VALUE
+        @args   = UNSET_VALUE
       end
 
       def finalize!
         @script = nil if @script == UNSET_VALUE
         @inline = nil if @inline == UNSET_VALUE
+        @args   = nil if @args == UNSET_VALUE
+
+        if @args && args_valid?
+          @args = @args.is_a?(Array) ? @args.map { |a| a.to_s } : @args.to_s
+        end
       end
 
       def validate(machine)
@@ -33,6 +43,10 @@ module VagrantPlugins
           errors << I18n.t("local_exec_push.errors.cannot_specify_script_and_inline")
         end
 
+        if !args_valid?
+          errors << I18n.t("local_exec_push.errors.args_bad_type")
+        end
+
         { "Local Exec push" => errors }
       end
 
@@ -43,6 +57,21 @@ module VagrantPlugins
       def missing?(obj)
         obj.to_s.strip.empty?
       end
+
+      # Args are optional, but if they're provided we only support them as a
+      # string or as an array.
+      def args_valid?
+        return true if !args
+        return true if args.is_a?(String)
+        return true if args.is_a?(Fixnum)
+        if args.is_a?(Array)
+          args.each do |a|
+            return false if !a.kind_of?(String) && !a.kind_of?(Fixnum)
+          end
+
+          return true
+        end
+      end
     end
   end
 end
diff --git a/plugins/pushes/local-exec/locales/en.yml b/plugins/pushes/local-exec/locales/en.yml
index 08808a879..3ae196d9c 100644
--- a/plugins/pushes/local-exec/locales/en.yml
+++ b/plugins/pushes/local-exec/locales/en.yml
@@ -20,3 +20,4 @@ en:
             config.push.define "local-exec" do |push|
               push.%{attribute} = "..."
             end
+      args_bad_type: "Local-exec push `args` must be a string or array."
\ No newline at end of file
diff --git a/plugins/pushes/local-exec/push.rb b/plugins/pushes/local-exec/push.rb
index d4bc75176..503957c9e 100644
--- a/plugins/pushes/local-exec/push.rb
+++ b/plugins/pushes/local-exec/push.rb
@@ -9,20 +9,20 @@ module VagrantPlugins
     class Push < Vagrant.plugin("2", :push)
       def push
         if config.inline
-          execute_inline!(config.inline)
+          execute_inline!(config.inline, config.args)
         else
-          execute_script!(config.script)
+          execute_script!(config.script, config.args)
         end
       end
 
       # Execute the inline script by writing it to a tempfile and executing.
-      def execute_inline!(inline)
+      def execute_inline!(inline, args)
         script = Tempfile.new(["vagrant-local-exec-script", ".sh"])
         script.write(inline)
         script.rewind
         script.close
 
-        execute_script!(script.path)
+        execute_script!(script.path, args)
       ensure
         if script
           script.close
@@ -31,10 +31,18 @@ module VagrantPlugins
       end
 
       # Execute the script, expanding the path relative to the current env root.
-      def execute_script!(path)
+      def execute_script!(path, args)
         path = File.expand_path(path, env.root_path)
         FileUtils.chmod("+x", path)
-        execute!(path)
+
+        if args.is_a?(String)
+          args = " #{args.to_s}"
+        elsif args.is_a?(Array)
+          args = args.map { |a| quote_and_escape(a) }
+          args = " #{args.join(" ")}"
+        end
+
+        execute!("#{path}#{args}")
       end
 
       # Execute the script, raising an exception if it fails.
@@ -48,6 +56,11 @@ module VagrantPlugins
 
       private
 
+      # Quote and escape strings for shell execution, thanks to Capistrano.
+      def quote_and_escape(text, quote = '"')
+        "#{quote}#{text.gsub(/#{quote}/) { |m| "#{m}\\#{m}#{m}" }}#{quote}"
+      end
+
       # Run the command as exec (unix).
       def execute_exec!(*cmd)
         Vagrant::Util::SafeExec.exec(cmd[0], *cmd[1..-1])
diff --git a/test/unit/plugins/pushes/local-exec/config_test.rb b/test/unit/plugins/pushes/local-exec/config_test.rb
index 045872d2f..1bde10d98 100644
--- a/test/unit/plugins/pushes/local-exec/config_test.rb
+++ b/test/unit/plugins/pushes/local-exec/config_test.rb
@@ -26,6 +26,13 @@ describe VagrantPlugins::LocalExecPush::Config do
     end
   end
 
+  describe "#args" do
+    it "defaults to nil" do
+      subject.finalize!
+      expect(subject.args).to be(nil)
+    end
+  end
+
   describe "#validate" do
     before do
       allow(machine).to receive(:env)
@@ -57,6 +64,42 @@ describe VagrantPlugins::LocalExecPush::Config do
         it "does not return an error" do
           expect(errors).to be_empty
         end
+
+        it "passes with string args" do
+          subject.args = "a string"
+          expect(errors).to be_empty
+        end
+
+        it "passes with fixnum args" do
+          subject.args = 1
+          expect(errors).to be_empty
+        end
+
+        it "passes with array args" do
+          subject.args = ["an", "array"]
+          expect(errors).to be_empty
+        end
+
+        it "returns an error if args is neither a string nor an array" do
+          neither_array_nor_string = Object.new
+
+          subject.args = neither_array_nor_string
+          expect(errors).to include(
+            I18n.t("local_exec_push.errors.args_bad_type")
+          )
+        end
+
+        it "handles scalar array args" do
+          subject.args = ["string", 1, 2]
+          expect(errors).to be_empty
+        end
+
+        it "returns an error if args is an array with non-scalar types" do
+          subject.args = [[1]]
+          expect(errors).to include(
+            I18n.t("local_exec_push.errors.args_bad_type")
+          )
+        end
       end
     end
 
@@ -69,6 +112,42 @@ describe VagrantPlugins::LocalExecPush::Config do
         it "does not return an error" do
           expect(errors).to be_empty
         end
+
+        it "passes with string args" do
+          subject.args = "a string"
+          expect(errors).to be_empty
+        end
+
+        it "passes with fixnum args" do
+          subject.args = 1
+          expect(errors).to be_empty
+        end
+
+        it "passes with array args" do
+          subject.args = ["an", "array"]
+          expect(errors).to be_empty
+        end
+
+        it "returns an error if args is neither a string nor an array" do
+          neither_array_nor_string = Object.new
+
+          subject.args = neither_array_nor_string
+          expect(errors).to include(
+            I18n.t("local_exec_push.errors.args_bad_type")
+          )
+        end
+
+        it "handles scalar array args" do
+          subject.args = ["string", 1, 2]
+          expect(errors).to be_empty
+        end
+
+        it "returns an error if args is an array with non-scalar types" do
+          subject.args = [[1]]
+          expect(errors).to include(
+            I18n.t("local_exec_push.errors.args_bad_type")
+          )
+        end
       end
 
       context "when inline is not present" do
diff --git a/test/unit/plugins/pushes/local-exec/push_test.rb b/test/unit/plugins/pushes/local-exec/push_test.rb
index e7c04060d..00db78777 100644
--- a/test/unit/plugins/pushes/local-exec/push_test.rb
+++ b/test/unit/plugins/pushes/local-exec/push_test.rb
@@ -15,6 +15,7 @@ describe VagrantPlugins::LocalExecPush::Push do
     double("config",
       script: nil,
       inline: nil,
+      args: "some args",
     )
   end
 
@@ -37,7 +38,7 @@ describe VagrantPlugins::LocalExecPush::Push do
 
       it "executes the inline script" do
         expect(subject).to receive(:execute_inline!)
-          .with(config.inline)
+          .with(config.inline, config.args)
         subject.push
       end
     end
@@ -47,7 +48,7 @@ describe VagrantPlugins::LocalExecPush::Push do
 
       it "executes the script" do
         expect(subject).to receive(:execute_script!)
-          .with(config.script)
+          .with(config.script, config.args)
         subject.push
       end
     end
@@ -58,12 +59,12 @@ describe VagrantPlugins::LocalExecPush::Push do
 
     it "writes the script to a tempfile" do
       expect(Tempfile).to receive(:new).and_call_original
-      subject.execute_inline!("echo")
+      subject.execute_inline!("echo", config.args)
     end
 
     it "executes the script" do
       expect(subject).to receive(:execute_script!)
-      subject.execute_inline!("echo")
+      subject.execute_inline!("echo", config.args)
     end
   end
 
@@ -76,19 +77,33 @@ describe VagrantPlugins::LocalExecPush::Push do
     it "expands the path relative to the machine root" do
       expect(subject).to receive(:execute!)
         .with(File.expand_path("foo.sh", env.root_path))
-      subject.execute_script!("./foo.sh")
+      subject.execute_script!("./foo.sh", nil)
     end
 
     it "makes the file executable" do
       expect(FileUtils).to receive(:chmod)
         .with("+x", File.expand_path("foo.sh", env.root_path))
-      subject.execute_script!("./foo.sh")
+      subject.execute_script!("./foo.sh", config.args)
     end
 
     it "calls execute!" do
       expect(subject).to receive(:execute!)
         .with(File.expand_path("foo.sh", env.root_path))
-      subject.execute_script!("./foo.sh")
+      subject.execute_script!("./foo.sh", nil)
+    end
+
+    context "when args is given" do
+      it "passes string args to execute!" do
+        expect(subject).to receive(:execute!)
+          .with(File.expand_path("foo.sh", env.root_path) + " " + config.args)
+        subject.execute_script!("./foo.sh", config.args)
+      end
+
+      it "passes array args as string to execute!" do
+        expect(subject).to receive(:execute!)
+          .with(File.expand_path("foo.sh", env.root_path) + " \"one\" \"two\" \"three\"")
+        subject.execute_script!("./foo.sh", ["one", "two", "three"])
+      end
     end
   end
 
diff --git a/website/docs/source/v2/push/local-exec.html.md b/website/docs/source/v2/push/local-exec.html.md
index 11ba906c8..2d267c4c2 100644
--- a/website/docs/source/v2/push/local-exec.html.md
+++ b/website/docs/source/v2/push/local-exec.html.md
@@ -27,6 +27,11 @@ options:
   execute. Vagrant will attempt to convert this script to an executable, but an
   exception will be raised if that fails.
 - `inline` - The inline script to execute (as a string).
+- `args` (string or array) - Optional arguments to pass to the shell script when executing it
+  as a single string. These arguments must be written as if they were typed
+  directly on the command line, so be sure to escape characters, quote,
+  etc. as needed. You may also pass the arguments in using an array. In this
+  case, Vagrant will handle quoting for you.
 
 Please note - only one of the `script` and `inline` options may be specified in
 a single push definition.
@@ -70,3 +75,7 @@ And then invoke the push with Vagrant:
 ```shell
 $ vagrant push
 ```
+
+### Script Arguments
+
+Refer to [Shell Provisioner](/v2/provisioning/shell.html).

From 57187c9f88e8c4f249c6763010da0a73bef6c0eb Mon Sep 17 00:00:00 2001
From: Luke Bakken <luke@bakken.io>
Date: Thu, 10 Dec 2015 07:04:39 -0800
Subject: [PATCH 347/354] Add method to detect if a Windows user is a member of
 the "Hyper-V Administrators" group.

Modify Hyper-V provider to require a user to either be an Administrator or a member of "Hyper-V Administrators"
---
 lib/vagrant/util/platform.rb                  | 19 +++++++++++++++++
 plugins/providers/hyperv/provider.rb          |  5 +++--
 .../plugins/providers/hyperv/provider_test.rb | 21 +++++++++++++++++--
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/lib/vagrant/util/platform.rb b/lib/vagrant/util/platform.rb
index e2762bca6..017a6e558 100644
--- a/lib/vagrant/util/platform.rb
+++ b/lib/vagrant/util/platform.rb
@@ -61,6 +61,25 @@ module Vagrant
           (`reg query HKU\\S-1-5-19 2>&1` =~ /ERROR/).nil?
         end
 
+        # Checks if the user running Vagrant on Windows is a member of the
+        # "Hyper-V Administrators" group.
+        #
+        # From: https://support.microsoft.com/en-us/kb/243330
+        # SID: S-1-5-32-578 
+        # Name: BUILTIN\Hyper-V Administrators
+        #
+        # @return [Boolean]
+        def windows_hyperv_admin?
+            begin
+              username = ENV["USERNAME"]
+              process = Subprocess.execute("net", "localgroup", "Hyper-V Administrators")
+              output = process.stdout.chomp 
+              return output.include?(username)
+            rescue Errors::CommandUnavailableWindows
+              return false
+            end
+        end
+
         # This takes any path and converts it from a Windows path to a
         # Cygwin or msys style path.
         #
diff --git a/plugins/providers/hyperv/provider.rb b/plugins/providers/hyperv/provider.rb
index d8fee52e7..5db9c880d 100644
--- a/plugins/providers/hyperv/provider.rb
+++ b/plugins/providers/hyperv/provider.rb
@@ -16,8 +16,9 @@ module VagrantPlugins
           raise Errors::WindowsRequired
         end
 
-        if !Vagrant::Util::Platform.windows_admin?
-          raise Errors::AdminRequired
+        if !Vagrant::Util::Platform.windows_admin? and
+           !Vagrant::Util::Platform.windows_hyperv_admin?
+            raise Errors::AdminRequired
         end
 
         if !Vagrant::Util::PowerShell.available?
diff --git a/test/unit/plugins/providers/hyperv/provider_test.rb b/test/unit/plugins/providers/hyperv/provider_test.rb
index 0613751d1..2a895706d 100644
--- a/test/unit/plugins/providers/hyperv/provider_test.rb
+++ b/test/unit/plugins/providers/hyperv/provider_test.rb
@@ -15,6 +15,7 @@ describe VagrantPlugins::HyperV::Provider do
     machine.stub(id: "foo")
     platform.stub(windows?: true)
     platform.stub(windows_admin?: true)
+    platform.stub(windows_hyperv_admin?: true)
     powershell.stub(available?: true)
   end
 
@@ -26,11 +27,18 @@ describe VagrantPlugins::HyperV::Provider do
       expect(subject).to_not be_usable
     end
 
-    it "returns false if not an admin" do
+    it "returns false if neither an admin nor a hyper-v admin" do
       platform.stub(windows_admin?: false)
+      platform.stub(windows_hyperv_admin?: false)
       expect(subject).to_not be_usable
     end
 
+    it "returns true if not an admin but is a hyper-v admin" do
+      platform.stub(windows_admin?: false)
+      platform.stub(windows_hyperv_admin?: true)
+      expect(subject).to be_usable
+    end
+
     it "returns false if powershell is not available" do
       powershell.stub(available?: false)
       expect(subject).to_not be_usable
@@ -43,8 +51,17 @@ describe VagrantPlugins::HyperV::Provider do
         to raise_error(VagrantPlugins::HyperV::Errors::WindowsRequired)
     end
 
-    it "raises an exception if not an admin" do
+    it "raises an exception if neither an admin nor a hyper-v admin" do
       platform.stub(windows_admin?: false)
+      platform.stub(windows_hyperv_admin?: false)
+
+      expect { subject.usable?(true) }.
+        to raise_error(VagrantPlugins::HyperV::Errors::AdminRequired)
+    end
+
+    it "raises an exception if neither an admin nor a hyper-v admin" do
+      platform.stub(windows_admin?: false)
+      platform.stub(windows_hyperv_admin?: false)
 
       expect { subject.usable?(true) }.
         to raise_error(VagrantPlugins::HyperV::Errors::AdminRequired)

From fa2db94b7d8ecec325d42a76140d24439334648e Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 10 Dec 2015 11:26:57 -0500
Subject: [PATCH 348/354] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc89a717e..454e49e7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@ IMPROVEMENTS:
   - provisioners/ansible: add new `force_remote_user` option to control whether
     `ansible_ssh_user` parameter should be applied or not [GH-6348]
   - provisioners/ansible: show a warning when running from a Windows Host [GH-5292]
+  - pushes/local-exec: add support for specifying script args [GH-6661, GH-6660]
   - guests/slackware: add support for networking [GH-6514]
 
 BUG FIXES:

From c5f684c6da64cd773bc29eaea23b7412f50cdf83 Mon Sep 17 00:00:00 2001
From: James Wen <jrw2175@columbia.edu>
Date: Thu, 10 Dec 2015 12:48:13 -0500
Subject: [PATCH 349/354] Clarify package documentation regarding providers

---
 website/docs/source/v2/cli/package.html.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/website/docs/source/v2/cli/package.html.md b/website/docs/source/v2/cli/package.html.md
index 0409cbeb1..76b6a081b 100644
--- a/website/docs/source/v2/cli/package.html.md
+++ b/website/docs/source/v2/cli/package.html.md
@@ -8,9 +8,10 @@ sidebar_current: "cli-package"
 **Command: `vagrant package`**
 
 This packages a currently running _VirtualBox_ environment into a
-re-usable [box](/v2/boxes.html). This command cannot be used with
-any other [provider](/v2/providers/index.html). A future version of Vagrant
-will address packaging boxes for other providers. Until then, they must
+re-usable [box](/v2/boxes.html). This command can only be used with
+other [providers](/v2/providers/index.html) based on the provider implementation
+and if the provider supports it. A future version of Vagrant will
+address packaging boxes for other providers. Until then, they must
 be made by hand.
 
 ## Options

From 6a9d25e384e5eb03e5c1cccbe022c36c12cd94c6 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Mon, 14 Dec 2015 15:47:58 -0800
Subject: [PATCH 350/354] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 454e49e7e..eb93385f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,8 @@ IMPROVEMENTS:
   - core: prune entries from global status on non-existent cwd [GH-6535]
   - core: networking: allow specifying a DHCP IP [GH-6325]
   - core: run provisioner cleanup tasks before powering off the VM [GH-6553]
+  - core: only run provisioner cleanup tasks if they're implemented [GH-6603]
+      This improves UX, but wasn't a bug before.
   - command/plugin: Add `--plugin-clean-sources` flag to reset plugin install
       sources, primarily for corp firewalls. [GH-4738]
   - command/rsync-auto: SSH connection is cached for faster sync times [GH-6399]

From ac3b24d93eef8a5fffd880e4e9d06f26a930e7f0 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <xmitchx@gmail.com>
Date: Mon, 14 Dec 2015 16:03:07 -0800
Subject: [PATCH 351/354] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb93385f6..49b5e6a1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -122,6 +122,8 @@ BUG FIXES:
   - hosts/slackware: Better detection of NFS [GH-6367]
   - providers/hyper-v: support generation 2 VMs [GH-6372]
   - providers/hyper-v: support VMs with more than one NIC [GH-4346]
+  - providers/hyper-v: check if user is in the Hyper-V admin group if 
+      they're not a Windows admin [GH-6662]
   - providers/virtualbox: ignore "Unknown" status bridge interfaces [GH-6061]
   - providers/virtualbox: only fix ipv6 interfaces that are in use
       [GH-6586, GH-6552]

From cd93721f8f5b831694114b21178859fca35e03b8 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Wed, 16 Dec 2015 09:54:53 +0100
Subject: [PATCH 352/354] provisioners/ansible: use quotes for the IdentityFile
 OpenSSH command line arguments

Surprisingly (to me at least), a simple quote enclosure was not enough
to fix the problem.

Caveat: the stringified ansible-playbook command logged in verbose mode
is wrongly formatted (no quotes are escaped).

Fix #6671
---
 CHANGELOG.md                                               | 2 ++
 plugins/provisioners/ansible/provisioner/host.rb           | 4 +++-
 test/unit/plugins/provisioners/ansible/provisioner_test.rb | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49b5e6a1c..aa2ca48aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -129,6 +129,8 @@ BUG FIXES:
       [GH-6586, GH-6552]
   - provisioners/ansible: use quotes for the `ansible_ssh_private_key_file`
     value in the generated inventory [GH-6209]
+  - provisioners/ansible: use quotes for the IdentityFile OpenSSH command line
+    arguments [GH-6671]
   - provisioners/ansible: don't show the `ansible-playbook` command when verbose
     option is an empty string
   - provisioners/chef: fix `nodes_path` for Chef Zero [GH-6025, GH-6049]
diff --git a/plugins/provisioners/ansible/provisioner/host.rb b/plugins/provisioners/ansible/provisioner/host.rb
index dcce98fb8..ed212edf4 100644
--- a/plugins/provisioners/ansible/provisioner/host.rb
+++ b/plugins/provisioners/ansible/provisioner/host.rb
@@ -229,7 +229,9 @@ module VagrantPlugins
           # Multiple Private Keys
           unless !config.inventory_path && @ssh_info[:private_key_path].size == 1
             @ssh_info[:private_key_path].each do |key|
-              ssh_options << "-o IdentityFile=#{key}"
+              # The outer single quotes are required to protect the inner
+              # double quotes to be stripped by the ssh/shell execution.
+              ssh_options << "-o IdentityFile='\"#{key}\"'"
             end
           end
 
diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index c97cdb5ed..be46bfee1 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -604,8 +604,8 @@ VF
       it "passes additional Identity Files via ANSIBLE_SSH_ARGS" do
         expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
           cmd_opts = args.last
-          expect(cmd_opts[:env]['ANSIBLE_SSH_ARGS']).to include("-o IdentityFile=/an/other/identity")
-          expect(cmd_opts[:env]['ANSIBLE_SSH_ARGS']).to include("-o IdentityFile=/yet/an/other/key")
+          expect(cmd_opts[:env]['ANSIBLE_SSH_ARGS']).to include("-o IdentityFile='\"/an/other/identity\"'")
+          expect(cmd_opts[:env]['ANSIBLE_SSH_ARGS']).to include("-o IdentityFile='\"/yet/an/other/key\"'")
         }
       end
     end
@@ -786,7 +786,7 @@ VF
 
       it "shows the ansible-playbook command, with additional quotes when required" do
         expect(machine.env.ui).to receive(:detail).with { |full_command|
-          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=true ANSIBLE_SSH_ARGS='-o IdentitiesOnly=yes -o IdentityFile=/my/key1 -o IdentityFile=/my/key2 -o ForwardAgent=yes -o ControlMaster=no -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --connection=ssh --timeout=30 --ask-sudo-pass --ask-vault-pass --limit='machine*:&vagrant:!that_one' --inventory-file=#{generated_inventory_dir} --extra-vars=@#{File.expand_path(__FILE__)} --sudo --sudo-user=deployer -vvv --vault-password-file=#{File.expand_path(__FILE__)} --tags=db,www --skip-tags=foo,bar --start-at-task='an awesome task' --why-not --su-user=foot --ask-su-pass --limit='all' --private-key=./myself.key playbook.yml")
+          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=true ANSIBLE_SSH_ARGS='-o IdentitiesOnly=yes -o IdentityFile='\"/my/key1\"' -o IdentityFile='\"/my/key2\"' -o ForwardAgent=yes -o ControlMaster=no -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --connection=ssh --timeout=30 --ask-sudo-pass --ask-vault-pass --limit='machine*:&vagrant:!that_one' --inventory-file=#{generated_inventory_dir} --extra-vars=@#{File.expand_path(__FILE__)} --sudo --sudo-user=deployer -vvv --vault-password-file=#{File.expand_path(__FILE__)} --tags=db,www --skip-tags=foo,bar --start-at-task='an awesome task' --why-not --su-user=foot --ask-su-pass --limit='all' --private-key=./myself.key playbook.yml")
         }
       end
     end

From ddbd2a4cfcf84db855b2db80089f8568fb976c70 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Wed, 16 Dec 2015 10:19:38 +0100
Subject: [PATCH 353/354] provisioners/ansible: prefer ssh '-i' argument

In cd93721, I relied on a suprising combination of quotes to protect ssh
execution to strip the quoted path to the private key file.
Since any ssh command line argument can be passed via
`ANSIBLE_SSH_ARGS`, it is quite more readable and easy to rely on the
`-i` argument, which is not affected like `-o IdentityFile=...` and also
supports multiple occurences.

See also http://sourceforge.net/p/fuse/mailman/message/30498048/

Finally fix #6671

Note that I decided to not squash both commits for better
documentation and traceability.
---
 CHANGELOG.md                                               | 4 ++--
 plugins/provisioners/ansible/provisioner/host.rb           | 4 +---
 test/unit/plugins/provisioners/ansible/provisioner_test.rb | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa2ca48aa..892499cad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -129,8 +129,8 @@ BUG FIXES:
       [GH-6586, GH-6552]
   - provisioners/ansible: use quotes for the `ansible_ssh_private_key_file`
     value in the generated inventory [GH-6209]
-  - provisioners/ansible: use quotes for the IdentityFile OpenSSH command line
-    arguments [GH-6671]
+  - provisioners/ansible: use quotes when passing the private key files via
+      OpenSSH `-i` command line arguments [GH-6671]
   - provisioners/ansible: don't show the `ansible-playbook` command when verbose
     option is an empty string
   - provisioners/chef: fix `nodes_path` for Chef Zero [GH-6025, GH-6049]
diff --git a/plugins/provisioners/ansible/provisioner/host.rb b/plugins/provisioners/ansible/provisioner/host.rb
index ed212edf4..245a00499 100644
--- a/plugins/provisioners/ansible/provisioner/host.rb
+++ b/plugins/provisioners/ansible/provisioner/host.rb
@@ -229,9 +229,7 @@ module VagrantPlugins
           # Multiple Private Keys
           unless !config.inventory_path && @ssh_info[:private_key_path].size == 1
             @ssh_info[:private_key_path].each do |key|
-              # The outer single quotes are required to protect the inner
-              # double quotes to be stripped by the ssh/shell execution.
-              ssh_options << "-o IdentityFile='\"#{key}\"'"
+              ssh_options << "-i '#{key}'"
             end
           end
 
diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index be46bfee1..31354a79c 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -604,8 +604,8 @@ VF
       it "passes additional Identity Files via ANSIBLE_SSH_ARGS" do
         expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
           cmd_opts = args.last
-          expect(cmd_opts[:env]['ANSIBLE_SSH_ARGS']).to include("-o IdentityFile='\"/an/other/identity\"'")
-          expect(cmd_opts[:env]['ANSIBLE_SSH_ARGS']).to include("-o IdentityFile='\"/yet/an/other/key\"'")
+          expect(cmd_opts[:env]['ANSIBLE_SSH_ARGS']).to include("-i '/an/other/identity'")
+          expect(cmd_opts[:env]['ANSIBLE_SSH_ARGS']).to include("-i '/yet/an/other/key'")
         }
       end
     end
@@ -786,7 +786,7 @@ VF
 
       it "shows the ansible-playbook command, with additional quotes when required" do
         expect(machine.env.ui).to receive(:detail).with { |full_command|
-          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=true ANSIBLE_SSH_ARGS='-o IdentitiesOnly=yes -o IdentityFile='\"/my/key1\"' -o IdentityFile='\"/my/key2\"' -o ForwardAgent=yes -o ControlMaster=no -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --connection=ssh --timeout=30 --ask-sudo-pass --ask-vault-pass --limit='machine*:&vagrant:!that_one' --inventory-file=#{generated_inventory_dir} --extra-vars=@#{File.expand_path(__FILE__)} --sudo --sudo-user=deployer -vvv --vault-password-file=#{File.expand_path(__FILE__)} --tags=db,www --skip-tags=foo,bar --start-at-task='an awesome task' --why-not --su-user=foot --ask-su-pass --limit='all' --private-key=./myself.key playbook.yml")
+          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=true ANSIBLE_SSH_ARGS='-o IdentitiesOnly=yes -i '/my/key1' -i '/my/key2' -o ForwardAgent=yes -o ControlMaster=no -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --connection=ssh --timeout=30 --ask-sudo-pass --ask-vault-pass --limit='machine*:&vagrant:!that_one' --inventory-file=#{generated_inventory_dir} --extra-vars=@#{File.expand_path(__FILE__)} --sudo --sudo-user=deployer -vvv --vault-password-file=#{File.expand_path(__FILE__)} --tags=db,www --skip-tags=foo,bar --start-at-task='an awesome task' --why-not --su-user=foot --ask-su-pass --limit='all' --private-key=./myself.key playbook.yml")
         }
       end
     end

From 37d72398037c5ff0c19a0b61046e244633206ee0 Mon Sep 17 00:00:00 2001
From: michaa76 <michaa76@gmail.com>
Date: Wed, 16 Dec 2015 14:25:23 +0100
Subject: [PATCH 354/354] #6674 CFEngine Provisioner Broken on Debian (http >
 https)

---
 .../provisioners/cfengine/cap/debian/cfengine_install.rb    | 4 +++-
 plugins/provisioners/cfengine/config.rb                     | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/provisioners/cfengine/cap/debian/cfengine_install.rb b/plugins/provisioners/cfengine/cap/debian/cfengine_install.rb
index 57c235654..8d82d5b12 100644
--- a/plugins/provisioners/cfengine/cap/debian/cfengine_install.rb
+++ b/plugins/provisioners/cfengine/cap/debian/cfengine_install.rb
@@ -7,7 +7,9 @@ module VagrantPlugins
             machine.communicate.tap do |comm|
               comm.sudo("mkdir -p #{File.dirname(config.deb_repo_file)} && /bin/echo #{config.deb_repo_line} > #{config.deb_repo_file}")
               comm.sudo("GPGFILE=`tempfile`; wget -O $GPGFILE #{config.repo_gpg_key_url} && apt-key add $GPGFILE; rm -f $GPGFILE")
-
+              
+              comm.sudo("apt-get install -y --force-yes apt-transport-https");
+              
               comm.sudo("apt-get update")
               comm.sudo("apt-get install -y #{config.package_name}")
             end
diff --git a/plugins/provisioners/cfengine/config.rb b/plugins/provisioners/cfengine/config.rb
index 19d0e7583..5d2ebbef9 100644
--- a/plugins/provisioners/cfengine/config.rb
+++ b/plugins/provisioners/cfengine/config.rb
@@ -51,7 +51,7 @@ module VagrantPlugins
         end
 
         if @deb_repo_line == UNSET_VALUE
-          @deb_repo_line = "deb http://cfengine.com/pub/apt/packages stable main"
+          @deb_repo_line = "deb https://cfengine.com/pub/apt/packages stable main"
         end
 
         @extra_agent_args = nil if @extra_agent_args == UNSET_VALUE
@@ -71,7 +71,7 @@ module VagrantPlugins
         @policy_server_address = nil if @policy_server_address == UNSET_VALUE
 
         if @repo_gpg_key_url == UNSET_VALUE
-          @repo_gpg_key_url = "http://cfengine.com/pub/gpg.key"
+          @repo_gpg_key_url = "https://cfengine.com/pub/gpg.key"
         end
 
         @upload_path = "/tmp/vagrant-cfengine-file" if @upload_path == UNSET_VALUE
@@ -81,7 +81,7 @@ module VagrantPlugins
         end
 
         if @yum_repo_url == UNSET_VALUE
-          @yum_repo_url = "http://cfengine.com/pub/yum/$basearch"
+          @yum_repo_url = "https://cfengine.com/pub/yum/$basearch"
         end
 
         if @package_name == UNSET_VALUE