vagrant-unbundled 2.0.0.1 → 2.0.1.0

data/plugins/provisioners/salt/bootstrap-salt.ps1

@@ -1,5 +1,6 @@
 Param(
   [string]$version,
+  [string]$pythonVersion = "2",
   [string]$runservice,
   [string]$minion,
   [string]$master
@@ -11,7 +12,12 @@ $startupType = "Manual"
 
 # Version to install - default to latest if there is an issue
 If ($version -notmatch "2\d{3}\.\d{1,2}\.\d+(\-\d{1})?"){
-  $version = '2016.11.3'
+  $version = '2017.7.1'
+}
+
+If ($pythonVersion -notmatch "\d+") {
+  $pythonVersion = "2"
+  Write-Host "Defaulting to minion Python version $pythonVersion"
 }
 
 If ($runservice.ToLower() -eq "true"){
@@ -49,9 +55,15 @@ If ([IntPtr]::Size -eq 4) {
 }
 
 # Download minion setup file
-Write-Host "Downloading Salt minion installer Salt-Minion-$version-$arch-Setup.exe"
+$minionFilename = "Salt-Minion-$version-$arch-Setup.exe"
+$versionYear = [regex]::Match($version, "\d+").Value
+If ([convert]::ToInt32($versionYear) -ge 2017)
+{
+  $minionFilename = "Salt-Minion-$version-Py$pythonVersion-$arch-Setup.exe"
+}
+Write-Host "Downloading Salt minion installer $minionFilename"
 $webclient = New-Object System.Net.WebClient
-$url = "https://repo.saltstack.com/windows/Salt-Minion-$version-$arch-Setup.exe"
+$url = "https://repo.saltstack.com/windows/$minionFilename"
 $file = "C:\tmp\salt.exe"
 $webclient.DownloadFile($url, $file)
 

data/plugins/provisioners/salt/bootstrap-salt.sh

@@ -5,6 +5,8 @@ if [ -x /usr/bin/fetch ]; then
     /usr/bin/fetch -o bootstrap-salt.sh https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh
 elif [ -x /usr/bin/curl ]; then
     /usr/bin/curl -L -O https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh
+elif [ -x /usr/bin/wget ]; then
+    /usr/bin/wget -O bootstrap-salt.sh https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh
 else
     python -c 'import urllib; urllib.urlretrieve("https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh", "bootstrap-salt.sh")'
 fi

data/plugins/provisioners/salt/config.rb

@@ -36,6 +36,7 @@ module VagrantPlugins
       attr_accessor :no_minion
       attr_accessor :bootstrap_options
       attr_accessor :version
+      attr_accessor :python_version
       attr_accessor :run_service
       attr_accessor :master_id
 
@@ -66,6 +67,7 @@ module VagrantPlugins
         @masterless = UNSET_VALUE
         @minion_id = UNSET_VALUE
         @version = UNSET_VALUE
+        @python_version = UNSET_VALUE
         @run_service = UNSET_VALUE
         @master_id = UNSET_VALUE
         @salt_call_args = UNSET_VALUE
@@ -93,6 +95,7 @@ module VagrantPlugins
         @masterless         = false if @masterless == UNSET_VALUE
         @minion_id          = nil if @minion_id == UNSET_VALUE
         @version            = nil if @version == UNSET_VALUE
+        @python_version     = nil if @python_version == UNSET_VALUE
         @run_service        = nil if @run_service == UNSET_VALUE
         @master_id          = nil if @master_id == UNSET_VALUE
         @salt_call_args     = nil if @salt_call_args == UNSET_VALUE
@@ -160,6 +163,14 @@ module VagrantPlugins
           errors << I18n.t("vagrant.provisioners.salt.args_array")
         end
 
+        if @python_version && @python_version.is_a?(String) && !@python_version.scan(/\D/).empty?
+          errors << I18n.t("vagrant.provisioners.salt.python_version")
+        end
+
+        if @python_version && !(@python_version.is_a?(Integer) || @python_version.is_a?(String))
+          errors << I18n.t("vagrant.provisioners.salt.python_version")
+        end
+
         return {"salt provisioner" => errors}
       end
     end

data/plugins/provisioners/salt/provisioner.rb

@@ -121,7 +121,7 @@ module VagrantPlugins
           options = "%s -F -c %s" % [options, config_dir]
         end
 
-        if @config.seed_master && @config.install_master
+        if @config.seed_master && @config.install_master && @machine.config.vm.communicator != :winrm
           seed_dir = "/tmp/minion-seed-keys"
           @machine.communicate.sudo("mkdir -p -m777 #{seed_dir}")
           @config.seed_master.each do |name, keyfile|
@@ -132,27 +132,27 @@ module VagrantPlugins
           options = "#{options} -k #{seed_dir}"
         end
 
-        if configure && !install
+        if configure && !install && @machine.config.vm.communicator != :winrm
           options = "%s -C" % options
         end
 
-        if @config.install_master
+        if @config.install_master && @machine.config.vm.communicator != :winrm
           options = "%s -M" % options
         end
 
-        if @config.install_syndic
+        if @config.install_syndic && @machine.config.vm.communicator != :winrm
           options = "%s -S" % options
         end
 
-        if @config.no_minion
+        if @config.no_minion && @machine.config.vm.communicator != :winrm
           options = "%s -N" % options
         end
 
-        if @config.install_type
+        if @config.install_type && @machine.config.vm.communicator != :winrm
           options = "%s %s" % [options, @config.install_type]
         end
 
-        if @config.install_args
+        if @config.install_args && @machine.config.vm.communicator != :winrm
           options = "%s %s" % [options, @config.install_args]
         end
 
@@ -277,6 +277,9 @@ module VagrantPlugins
             if @config.version
               options += " -version %s" % @config.version
             end
+            if @config.python_version
+              options += " -pythonVersion %s" % @config.python_version
+            end
             if @config.run_service
               @machine.env.ui.info "Salt minion will be stopped after installing."
               options += " -runservice %s" % @config.run_service

data/plugins/provisioners/shell/provisioner.rb

@@ -43,7 +43,7 @@ module VagrantPlugins
           options = {}
           options[:color] = color if !config.keep_color
 
-          @machine.ui.info(data.chomp, options)
+          @machine.ui.detail(data.chomp, options)
         end
       end
 

data/templates/locales/en.yml

@@ -1697,6 +1697,9 @@ en:
         will_not_destroy: |-
           The VM '%{name}' will not be destroyed, since the confirmation
           was declined.
+        warning: |-
+          Destroying guests with `--parallel` automatically enables `--force`.
+          Press ctrl-c to cancel.
       init:
         success: |-
           A `Vagrantfile` has been placed in this directory. You are now
@@ -2444,6 +2447,8 @@ en:
           You must accept keys when running highstate with master!
         args_array: |-
           You must set this value as an array.
+        python_version: |-
+          You must set this as an integer or string that represents an integer.
 
     pushes:
       file:

data/test/unit/base.rb

@@ -33,6 +33,8 @@ VAGRANT_TEST_CWD = Dir.mktmpdir("vagrant-test-cwd")
 
 # Configure RSpec
 RSpec.configure do |c|
+  c.formatter = :documentation
+
   if Vagrant::Util::Platform.windows?
     c.filter_run_excluding :skip_windows
   else

data/test/unit/plugins/commands/destroy/command_test.rb

@@ -0,0 +1,155 @@
+require File.expand_path("../../../../base", __FILE__)
+
+require Vagrant.source_root.join("plugins/commands/destroy/command")
+
+describe VagrantPlugins::CommandDestroy::Command do
+  include_context "unit"
+
+  let(:entry_klass) { Vagrant::MachineIndex::Entry }
+  let(:argv)     { [] }
+  let(:vagrantfile_content){ "" }
+  let(:iso_env) do
+    env = isolated_environment
+    env.vagrantfile(vagrantfile_content)
+    env.create_vagrant_env
+  end
+
+  subject { described_class.new(argv, iso_env) }
+
+  let(:action_runner) { double("action_runner") }
+
+  def new_entry(name)
+    entry_klass.new.tap do |e|
+      e.name = name
+      e.vagrantfile_path = "/bar"
+    end
+  end
+
+  before do
+    allow(iso_env).to receive(:action_runner).and_return(action_runner)
+  end
+
+  context "with no argument" do
+    before { @state_var = :running }
+    let(:vagrantfile_content){ "Vagrant.configure(2){|config| config.vm.box = 'dummy'}" }
+    let(:state) { double("state", id: :running) }
+    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
+
+    before do
+      allow(subject).to receive(:with_target_vms) { |&block| block.call machine }
+    end
+
+    it "should destroy the default box" do
+      allow_any_instance_of(Vagrant::BatchAction).to receive(:action) .with(machine, :destroy, anything)
+
+      expect(machine.state).to receive(:id).and_return(:running)
+      expect(machine.state).to receive(:id).and_return(:dead)
+      expect(subject.execute).to eq(0)
+    end
+
+    it "exits 1 if a vms destroy was declined" do
+      allow_any_instance_of(Vagrant::BatchAction).to receive(:action) .with(machine, :destroy, anything)
+
+      expect(machine.state).to receive(:id).and_return(:running)
+      expect(machine.state).to receive(:id).and_return(:running)
+      expect(subject.execute).to eq(1)
+    end
+
+    context "with VAGRANT_DEFAULT_PROVIDER set" do
+      before do
+        if ENV["VAGRANT_DEFAULT_PROVIDER"]
+          @original_default = ENV["VAGRANT_DEFAULT_PROVIDER"]
+        end
+        ENV["VAGRANT_DEFAULT_PROVIDER"] = "unknown"
+      end
+      after do
+        if @original_default
+          ENV["VAGRANT_DEFAULT_PROVIDER"] = @original_default
+        else
+          ENV.delete("VAGRANT_DEFAULT_PROVIDER")
+        end
+      end
+
+      it "should attempt to use dummy provider" do
+        expect{ subject.execute }.to raise_error(Vagrant::Errors::UnimplementedProviderAction)
+      end
+    end
+  end
+
+  context "with --parallel set" do
+    let(:argv){ ["--parallel", "--force"] }
+
+    it "passes in true to batch" do
+      batch = double("environment_batch")
+      expect(iso_env).to receive(:batch).with(true).and_yield(batch)
+      expect(batch).to receive(:action).with(anything, :destroy, anything) do |machine,action,args|
+        expect(machine).to be_kind_of(Vagrant::Machine)
+        expect(action).to eq(:destroy)
+      end
+      subject.execute
+    end
+  end
+
+  context "with a global machine" do
+    let(:argv){ ["1234"] }
+
+    it "destroys a vm with an id" do
+
+      global_env = isolated_environment
+      global_env.vagrantfile("Vagrant.configure(2){|config| config.vm.box = 'dummy'}")
+      global_venv = global_env.create_vagrant_env
+      global_machine = global_venv.machine(global_venv.machine_names[0], :dummy)
+      global_machine.id = "1234"
+      global = new_entry(global_machine.name)
+      global.provider = "dummy"
+      global.vagrantfile_path = global_env.workdir
+      locked = iso_env.machine_index.set(global)
+      iso_env.machine_index.release(locked)
+
+      allow(subject).to receive(:with_target_vms) { |&block| block.call global_machine }
+
+
+      batch = double("environment_batch")
+      expect(iso_env).to receive(:batch).and_yield(batch)
+      expect(batch).to receive(:action).with(global_machine, :destroy, anything) do |machine,action,args|
+        expect(machine).to be_kind_of(Vagrant::Machine)
+        expect(action).to eq(:destroy)
+      end
+      subject.execute
+    end
+  end
+
+  context "with an argument" do
+    let(:vagrantfile_content) do
+        <<-VF
+        Vagrant.configure("2") do |config|
+          config.vm.define "app"
+          config.vm.define "db"
+        end
+        VF
+    end
+    let(:argv){ ["app"] }
+    let(:machine) { iso_env.machine(iso_env.machine_names[0], :dummy) }
+
+    it "destroys a vm" do
+      batch = double("environment_batch")
+      expect(iso_env).to receive(:batch).and_yield(batch)
+      expect(batch).to receive(:action).with(machine, :destroy, anything) do |machine,action,args|
+        expect(machine).to be_kind_of(Vagrant::Machine)
+        expect(action).to eq(:destroy)
+      end
+      subject.execute
+    end
+
+    context "with an invalid argument" do
+      let(:argv){ ["notweb"] }
+      it "raises an exception" do
+        expect { subject.execute }.to raise_error(Vagrant::Errors::MachineNotFound)
+      end
+    end
+  end
+end

data/test/unit/plugins/communicators/winrm/helper_test.rb

@@ -48,6 +48,12 @@ describe VagrantPlugins::CommunicatorWinRM::Helper do
       expect { subject.winrm_address(machine) }.
         to raise_error(VagrantPlugins::CommunicatorWinRM::Errors::WinRMNotReady)
     end
+
+    it "raise an exception if it detects an APIPA" do
+      allow(machine).to receive(:ssh_info).and_return({ host: "169.254.123.123" })
+      expect { subject.winrm_address(machine) }.
+        to raise_error(VagrantPlugins::CommunicatorWinRM::Errors::WinRMNotReady)
+    end
   end
 
   describe ".winrm_info" do
@@ -142,4 +148,31 @@ describe VagrantPlugins::CommunicatorWinRM::Helper do
       expect(subject.winrm_port(machine)).to eq(2456)
     end
   end
+
+  describe ".winrm_info_invalid?" do
+    it "returns true if it can't detect a host" do
+      allow(machine).to receive(:ssh_info).and_return(nil)
+      expect(subject).to be_winrm_info_invalid(machine.ssh_info)
+    end
+
+    it "returns true if it detects an empty host ip" do
+      allow(machine).to receive(:ssh_info).and_return({ host: "" })
+      expect(subject).to be_winrm_info_invalid(machine.ssh_info)
+    end
+
+    it "returns true if it detects an unset host ip" do
+      allow(machine).to receive(:ssh_info).and_return({ host: nil })
+      expect(subject).to be_winrm_info_invalid(machine.ssh_info)
+    end
+
+    it "returns true if it detects an APIPA" do
+      allow(machine).to receive(:ssh_info).and_return({ host: "169.254.123.123" })
+      expect(subject).to be_winrm_info_invalid(machine.ssh_info)
+    end
+
+    it "returns false if the IP is valid" do
+      allow(machine).to receive(:ssh_info).and_return({ host: "192.168.123.123" })
+      expect(subject).not_to be_winrm_info_invalid(machine.ssh_info)
+    end
+  end
 end

data/test/unit/plugins/guests/solaris11/cap/change_host_name_test.rb

@@ -0,0 +1,36 @@
+require_relative "../../../../base"
+
+describe "VagrantPlugins::GuestSolaris11::Cap::ChangeHostName" do
+  let(:caps) do
+    VagrantPlugins::GuestSolaris11::Plugin
+      .components
+      .guest_capabilities[:solaris11]
+  end
+
+  let(:machine) { double("machine", config: double("config", solaris11: double("solaris11", suexec_cmd: 'sudo'))) }
+  let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+
+  before do
+    allow(machine).to receive(:communicate).and_return(comm)
+  end
+
+  after do
+    comm.verify_expectations!
+  end
+
+  describe ".change_host_name" do
+    let(:cap) { caps.get(:change_host_name) }
+    let(:name) { "solaris11.domain.com" }
+
+    it "changes the hostname" do
+      allow(machine.communicate).to receive(:test).and_return(false)
+      allow(machine.communicate).to receive(:execute)
+
+      expect(machine.communicate).to receive(:execute).with("sudo /usr/sbin/svccfg -s system/identity:node setprop config/nodename=\"#{name}\"")
+      expect(machine.communicate).to receive(:execute).with("sudo /usr/sbin/svccfg -s system/identity:node setprop config/loopback=\"#{name}\"")
+      expect(machine.communicate).to receive(:execute).with("sudo /usr/sbin/svccfg -s system/identity:node refresh ")
+      expect(machine.communicate).to receive(:execute).with("sudo /usr/sbin/svcadm restart system/identity:node ")
+      cap.change_host_name(machine, name)
+    end
+  end
+end

data/test/unit/plugins/guests/solaris11/cap/configure_networks_test.rb

@@ -0,0 +1,56 @@
+require_relative "../../../../base"
+
+describe "VagrantPlugins::GuestSolaris11::Cap::ConfigureNetworks" do
+  let(:caps) do
+    VagrantPlugins::GuestSolaris11::Plugin
+      .components
+      .guest_capabilities[:solaris11]
+  end
+
+  let(:machine) { double("machine", config: double("config", solaris11: double("solaris11", suexec_cmd: 'sudo', device: 'net'))) }
+  let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+
+  before do
+    allow(machine).to receive(:communicate).and_return(comm)
+  end
+
+  after do
+    comm.verify_expectations!
+  end
+
+  describe ".configufre_networks" do
+    let(:cap) { caps.get(:configure_networks) }
+    let(:network_1) do
+      {
+        interface: 0,
+        type: "dhcp",
+      }
+    end
+
+    let(:network_2) do
+      {
+        interface: 1,
+        type: "static",
+        ip: "33.33.33.10",
+        netmask: "255.255.0.0",
+        gateway: "33.33.0.1",
+      }
+    end
+
+    let(:networks) { [network_1, network_2] }
+
+    it "configures the guests network if static" do
+      allow(machine.communicate).to receive(:test).and_return(true)
+
+      cap.configure_networks(machine, networks)
+      expect(comm.received_commands[1]).to eq("sudo ipadm delete-addr net1/v4")
+      expect(comm.received_commands[2]).to eq("sudo ipadm create-addr -T static -a 33.33.33.10/16 net1/v4")
+    end
+
+    it "configures the guests network if dhcp" do
+      allow(machine.communicate).to receive(:test).and_return(true)
+      cap.configure_networks(machine, networks)
+      expect(comm.received_commands[0]).to eq("sudo ipadm create-addr -T addrconf net0/v4")
+    end
+  end
+end