vagrant-windows-domain 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7ca45395aaca2ded1ec48f1c4ac8f0c5a577e166
-  data.tar.gz: 20eff48bf7961347cee813cd7e03dc7127cd7eee
+SHA256:
+  metadata.gz: cc9e56200816c6d1f4aa73806bedc10976d0471c643102f54e82c44bdb78432e
+  data.tar.gz: 4186ece3f5539020fe90cdb3bb961f825101fd23167349bc7eee834b49f56005
 SHA512:
-  metadata.gz: dbeac21163ba804ac4a05b094f5c869d8a8d4d653efe749de0bdcdce888e758cfc50214a7162189782fc6a62fc077b6b8e8ceffd824f015679bbd566a4c0ef1d
-  data.tar.gz: 18890a8525ae17704d313550da571325676ffa394db908008b9b954b63d3356de31e0f40500cd4f181cdb49f17e402b8c726440028318279185846c342f9915d
+  metadata.gz: 95f644aef3a5df4fbd5b5262cf30c5b6ed4e2aa266c99055b093d0978cda1055ff38cfea14cc6bb351f7107b0e2ba827a82843cc97bc2a7dc354271126da2855
+  data.tar.gz: 7733d4aa00ff3e45779f1c66c3901e3fd7b431ae81e807701a3ce098db8e725f8ce88fcd4d1993dc05379326723277a5868a5fcb787fadff04fd8a301104a945

data/.travis.yml

@@ -1,12 +1,9 @@
 language: ruby
 before_install:
-- rvm @global do gem uninstall bundler --all --executables
-- gem uninstall bundler --all --executables
-- gem install bundler --version 1.12.5
-- gem install bundler --version 1.12.5
+- gem install bundler
 rvm:
-- 2.2.3
-- 2.3.0
+- 2.5.1
+- 2.4.4
 - ruby-head
 matrix:
   allow_failures:
@@ -14,7 +11,7 @@ matrix:
   fast_finish: true
 env:
   matrix:
-  - VAGRANT_VERSION=v1.8.0
+  - VAGRANT_VERSION=v2.1.5
   global:
     secure: bs4ezY+1Wksy8hH3nymPJ3AL99mpXULVc/AIh16JetEYw1850QkX7r4gQukMlcyByKUhxucjDLid0Y+KDH5kGMM16QjrVQGhAnUQzMoLD2qPbAaxDCUqpCJtFEEQKYxJvFvEK8a5SQzAsTVG4sgABQ/MllsIIH0FjkWgFtH6050=
-script: bundle _1.12.5_ exec rake test:unit
+script: bundle exec rake test:unit

data/Gemfile

@@ -7,6 +7,3 @@ group :development do
   gem "vagrant", git: "https://github.com/mitchellh/vagrant.git"
 end
 
-group :plugins do
-  gem "vagrant-windows-domain", path: "."
-end

data/README.md

@@ -47,6 +47,18 @@ config.vm.provision :windows_domain do |domain|
     # If not supplied the plugin will prompt the user during provisioning to provide one.
     domain.password = "iprobablyshouldntusethisfield"
 
+    # IP address of primary DNS server
+    #
+    # Specifies the IP address you want assigned as the primary DNS server for the primary nic.
+    # If not supplied, the nic's primary dns server will be assigned dynamically.
+    domain.primary_dns = "8.8.8.8"
+    
+    #IP address of the secondary DNS server
+    #
+    # Specifies the IP address you want assigned as the secondary DNS server for the primary nic
+    # If not supplied, the nic's secondary dns server will be assigned dynamically.
+	domain.secondary_dns = "8.8.4.4"
+
     # The set of Advanced options to pass when joining the Domain.
     #
     # See (https://technet.microsoft.com/en-us/library/hh849798.aspx) for detail, these are generally not required.

data/development/Vagrantfile

@@ -13,7 +13,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "mfellows/windows2012r2"
   config.vm.guest = :windows
   config.vm.communicator = "winrm"
-  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
+  #ALlows for vagrant to successfully connect to destination machine with winrm 
+  config.vm.network :forwarded_port, guest: 5985, host: 55985 #, id: "winrm", auto_correct: true
 
   config.vm.provider "virtualbox" do |v| 
     v.gui = true 

data/lib/vagrant-windows-domain/config.rb

@@ -40,6 +40,16 @@ module VagrantPlugins
       # The default value is the default OU for machine objects in the domain.
       attr_accessor :ou_path
 
+      # IP address of primary DNS server
+      #
+      # Specifies the IP address you want assigned as the primary DNS server for the primary nic
+      attr_accessor :primary_dns
+
+      #IP address of the secondary DNS server
+      #
+      # Specifies the IP address you want assigned as the secondary DNS server for the primary nic
+      attr_accessor :secondary_dns
+
       # Performs an unsecure join to the specified domain.
       #
       # When this option is used username/password are not required
@@ -56,6 +66,8 @@ module VagrantPlugins
         @password          = UNSET_VALUE
         @join_options      = {}
         @ou_path           = UNSET_VALUE
+        @primary_dns       = UNSET_VALUE
+        @secondary_dns     = UNSET_VALUE
         @unsecure          = UNSET_VALUE
         @rename            = UNSET_VALUE
         @logger            = Log4r::Logger.new("vagrant::vagrant_windows_domain")
@@ -75,6 +87,8 @@ module VagrantPlugins
         @password          = nil if @password == UNSET_VALUE || @password == ""
         @join_options      = [] if @join_options == UNSET_VALUE
         @ou_path           = nil if @ou_path == UNSET_VALUE
+        @primary_dns       = nil if @primary_dns == UNSET_VALUE
+        @secondary_dns     = nil if @secondary_dns == UNSET_VALUE
         @unsecure          = false if @unsecure == UNSET_VALUE
         @rename            = true if @rename == UNSET_VALUE
       end

data/lib/vagrant-windows-domain/provisioner.rb

@@ -107,7 +107,7 @@ module VagrantPlugins
             restart_guest
 
             @logger.debug("Need to reboot to join the domain correctly - 2nd reboot")
-            restart_guest
+            #restart_guest
           end
         end
       end
@@ -157,7 +157,7 @@ module VagrantPlugins
             result = leave_domain
             if result
               @logger.debug("Need to reboot to leave the domain correctly")
-              restart_guest
+              #restart_guest
             end
           end
         else
@@ -215,6 +215,8 @@ module VagrantPlugins
             domain: @config.domain,
             computer_name: @config.computer_name,
             ou_path: @config.ou_path,
+            primary_dns: @config.primary_dns,
+            secondary_dns: @config.secondary_dns,
             add_to_domain: add_to_domain,
             unsecure: @config.unsecure,
             rename: @config.rename,
@@ -246,10 +248,6 @@ module VagrantPlugins
             params["-Credential $credentials"] = nil
           end
 
-          if @config.computer_name != nil && @config.computer_name != @old_computer_name
-            params["-NewName"] = "'#{@config.computer_name}'"
-          end
-
           if @config.ou_path
             params["-OUPath"] = "'#{@config.ou_path}'"
           end

data/lib/vagrant-windows-domain/templates/runner.ps1.erb

@@ -17,8 +17,11 @@ function Repair-OpenSSHPasswd(){
 		$passwd | Set-Content $passwdPath -Encoding Ascii
 	}
 }
-
+<% if options[:computer_name] != nil %>
 $computerName='<%= options[:computer_name] %>'
+<% else %>
+$computerName = $env:COMPUTERNAME
+<% end %>
 <% if options[:username] != nil && options[:unsecure] != true %>
 $domain='<%= options[:domain] %>'
 $username='<%= options[:username] %>'
@@ -26,14 +29,45 @@ $password='<%= options[:password] %>'
 $secpasswd = ConvertTo-SecureString $password -AsPlainText -Force
 $credentials = New-Object System.Management.Automation.PSCredential ($username, $secpasswd)
 <% end %>
+
 <% if options[:add_to_domain] === true %>
 if (Test-PartOfDomain -computerName $computerName -domain $domain){
 	throw "$computerName already part of domain $domain"
 } else {
+	#If a value is provided for the Primary_DNS variable in the vagrantfile, powershell will attempt to determine if the string is a valid IP and will statically set the primary dns server of the vm's nic if it is.
+	<% if options[:primary_dns] != nil %>
+		$prim = '<%= options[:primary_dns] %>'
+		If ($prim -match "^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$")
+		{
+			$wmi = Get-WmiObject -ComputerName $env:COMPUTERNAME -Namespace "root\CIMV2" -Class "Win32_NetworkAdapterconfiguration" -Filter 'IPENABLED=TRUE' -Impersonation Impersonate -ErrorAction Stop | Where-Object { $_.DefaultIPGateway }
+			$currdns = $wmi.DNSServerSearchOrder
+			$wmi.SetDNSServerSearchOrder(@($prim, $currdns[1]))
+		}
+		else
+		{
+			throw "Invalid IP address provided"
+		}
+	<% end %>
+
+	#If a value is provided for the Secondary_DNS variable in the vagrantfile, powershell will attempt to determine if the string is a valid IP and will statically set the secondary dns server of the vm's nic if it is.
+	<% if options[:secondary_dns] != nil %>
+		$sec = '<%= options[:secondary_dns] %>'
+		If ($sec -match "^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$")
+		{
+			$wmi = Get-WmiObject -ComputerName $env:COMPUTERNAME -Namespace "root\CIMV2" -Class "Win32_NetworkAdapterconfiguration" -Filter 'IPENABLED=TRUE' -Impersonation Impersonate -ErrorAction Stop | Where-Object { $_.DefaultIPGateway }
+			$currdns = $wmi.DNSServerSearchOrder
+			$wmi.SetDNSServerSearchOrder(@($currdns[0], $sec))
+		}
+		else
+		{
+			throw "Invalid IP address provided"
+		}
+	<% end %>
+	Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory private
 	Add-Computer <%= options[:parameters] %> -Verbose -Force -PassThru
-	
+
 	# Rename computer separately: Fixes GH issue #11
-	<% if options[:rename] === true %>
+	<% if options[:computer_name] != nil %>
 	$completed = $false
 	while ( -not $completed) {
 		try {
@@ -56,10 +90,10 @@ if (Test-PartOfDomain -computerName $computerName -domain $domain){
 
 	# Fix vagrant-windows GH-129, if there's an existing scheduled
 	# reboot cancel it so shutdown succeeds
-	&shutdown /a
+	#&shutdown /a
 
 	# Force shutdown the machine now
-	&shutdown /s /t 15 /c "Vagrant Halt" /f /d p:4:1	
+	#&shutdown /r /t 0 /c "Vagrant Halt" /f /d p:4:1
 }
 <% else %>
 if (!(Test-JoinedToADomain)) {
@@ -67,12 +101,12 @@ if (!(Test-JoinedToADomain)) {
 } else {
 	Remove-Computer <%= options[:parameters] %> -Workgroup 'WORKGROUP' -Verbose -Force -PassThru
 	Repair-OpenSSHPasswd
-
+	#removed the shutdown of the vm when disjoining it from the domain since, as the vm is about to be destroyed anyway, so there is no use for it.
 	# Fix vagrant-windows GH-129, if there's an existing scheduled
 	# reboot cancel it so shutdown succeeds
-	&shutdown /a
+	#&shutdown /a
 
 	# Force shutdown the machine now
-	&shutdown /r /t 15 /c "Vagrant Halt" /f /d p:4:1
+	#&shutdown /r /t 0 /c "Vagrant Halt" /f /d p:4:1
 }
 <% end %>

data/lib/vagrant-windows-domain/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module WindowsDomain
-    VERSION = "1.3.1"
+    VERSION = "1.3.2"
   end
 end

data/spec/provisioner/config_spec.rb

@@ -52,6 +52,7 @@ describe VagrantPlugins::WindowsDomain::Config do
       expect(subject.computer_name).to be_nil
       expect(subject.username).to be_nil
       expect(subject.password).to be_nil
+	  
     end
   end
 

data/spec/provisioner/provisioner_spec.rb

@@ -74,11 +74,11 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
       allow(communicator).to receive(:upload)
       allow(ui).to receive(:info)
       expect(communicator).to receive(:test)
-      expect(vm).to receive(:boot_timeout).twice
+      expect(vm).to receive(:boot_timeout).once
       expect(communicator).to receive(:sudo).with("powershell -ExecutionPolicy Bypass -OutputFormat Text -file c:/tmp/vagrant-windows-domain-runner.ps1", {:elevated=>true, :error_check=>true, :error_key=>nil, :good_exit=>0, :shell=>:powershell})
       expect(communicator).to receive(:sudo).with("del c:/tmp/vagrant-windows-domain-runner.ps1")
-      expect(machine).to receive(:action).with(:reload, {:provision_ignore_sentinel=>false, :lock=>false}).twice
-      expect(communicator).to receive(:ready?).and_return(true).twice
+      expect(machine).to receive(:action).with(:reload, {:provision_ignore_sentinel=>false, :lock=>false}).once
+      expect(communicator).to receive(:ready?).and_return(true).once
       subject.restart_sleep_duration = 0
       subject.provision
       expect(subject.old_computer_name).to eq("myoldcomputername")
@@ -88,11 +88,11 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
       allow(communicator).to receive(:upload)
       allow(ui).to receive(:info)
       expect(communicator).to receive(:test)
-      expect(vm).to receive(:boot_timeout).twice
+      expect(vm).to receive(:boot_timeout).once
       expect(communicator).to receive(:sudo).with("powershell -ExecutionPolicy Bypass -OutputFormat Text -file c:/tmp/vagrant-windows-domain-runner.ps1", {:elevated=>true, :error_check=>true, :error_key=>nil, :good_exit=>0, :shell=>:powershell})
       expect(communicator).to receive(:sudo).with("del c:/tmp/vagrant-windows-domain-runner.ps1")
-      expect(machine).to receive(:action). with(:reload, {:provision_ignore_sentinel=>false, :lock=>false}).twice
-      expect(communicator).to receive(:ready?).and_return(true).twice
+      expect(machine).to receive(:action). with(:reload, {:provision_ignore_sentinel=>false, :lock=>false}).once
+      expect(communicator).to receive(:ready?).and_return(true).once
       subject.restart_sleep_duration = 0
       subject.provision
     end
@@ -190,17 +190,10 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
     it "should leave domain when a `vagrant destroy` is issued" do
       allow(machine).to receive(:communicate).and_return(communicator)
       expect(communicator).to receive(:test).and_return(true)
-      expect(vm).to receive(:boot_timeout)
       expect(communicator).to receive(:upload)
       expect(communicator).to receive(:sudo).with("powershell -ExecutionPolicy Bypass -OutputFormat Text -file c:/tmp/vagrant-windows-domain-runner.ps1", {:elevated=>true, :error_check=>true, :error_key=>nil, :good_exit=>0, :shell=>:powershell}).and_yield(:stdout, "deleted")
       expect(ui).to receive(:info).with("\"Running Windows Domain Provisioner\"")
       expect(ui).to receive(:info).with("deleted", {:color=>:green, :new_line=>false, :prefix=>false})
-      expect(ui).to receive(:say).with(:info, "Restarting computer for updates to take effect.")
-      expect(machine).to receive(:action). with(:reload, {:provision_ignore_sentinel=>false, :lock=>false})
-      expect(ui).to_not receive(:say)
-      expect(ui).to_not receive(:ask)
-      expect(communicator).to receive(:ready?).and_return(true)
-      subject.restart_sleep_duration = 0      
 
       subject.destroy
     end
@@ -220,18 +213,12 @@ describe VagrantPlugins::WindowsDomain::Provisioner do
       allow(machine).to receive(:communicate).and_return(communicator)
       allow(machine).to receive(:env).and_return(env)
 
-      expect(vm).to receive(:boot_timeout)
       expect(communicator).to receive(:test).and_return(true)
       expect(communicator).to receive(:upload)
       expect(communicator).to receive(:sudo).with("powershell -ExecutionPolicy Bypass -OutputFormat Text -file c:/tmp/vagrant-windows-domain-runner.ps1", {:elevated=>true, :error_check=>true, :error_key=>nil, :good_exit=>0, :shell=>:powershell}).and_yield(:stdout, "deleted")
       expect(ui).to receive(:info).with(any_args).twice
       expect(ui).to receive(:ask).with("Please enter your domain password (output will be hidden): ", {:echo=>false}).and_return("myusername")
       expect(ui).to receive(:ask).with("Please enter your domain username: ")
-      expect(ui).to receive(:say).with(:info, "Restarting computer for updates to take effect.")
-      expect(machine).to receive(:action). with(:reload, {:provision_ignore_sentinel=>false, :lock=>false})
-      expect(communicator).to receive(:ready?).and_return(true)
-      subject.restart_sleep_duration = 0
-
       subject.destroy
     end
 

data/vagrant-windows-domain.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "bundler", ">= 1.5.2", "<= 1.12.5"
-  spec.add_development_dependency "coveralls", "~> 0.8.10", '>= 0.8.10'
-  spec.add_development_dependency "rspec-core", '~> 3.4.2', '>= 3.4.2'
-  spec.add_development_dependency "rspec-expectations", '~> 3.4.0', '>= 3.4.0'
-  spec.add_development_dependency "rspec-mocks", '~> 3.4.1', '>= 3.4.1'
-  spec.add_development_dependency "rspec-its", "~> 1.2.0", '>= 1.2.0'
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "rspec-core"
+  spec.add_development_dependency "rspec-expectations"
+  spec.add_development_dependency "rspec-mocks"
+  spec.add_development_dependency "rspec-its"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows-domain
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,120 +30,84 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.10
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.10
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.10
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.10
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 description: Adds and Removes Windows Guests from a Windows Domain, as part of the
   standard machine lifecycle.
 email:
@@ -193,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Windows Domain Provisioner for Vagrant