Skip to content

Commit 34d658b

Browse files
committed
update the Vagrantfiles
1 parent 093a002 commit 34d658b

File tree

2 files changed

+27
-10
lines changed

2 files changed

+27
-10
lines changed

boxes/win10x64-vagrant/Vagrantfile

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,20 @@ Vagrant.configure("2") do |config|
2626
config.vm.synced_folder "puppet/modules", "/ProgramData/PuppetLabs/code/environments/production/modules"
2727

2828
# These install chocolatey, ruby, and puppet. Also runs librarian-puppet.
29-
config.vm.provision :shell, :path => "../shared/shell/PrepareWindows.ps1"
30-
config.vm.provision :shell, :path => "../shared/shell/InstallChocolatey.ps1"
31-
config.vm.provision :shell, :path => "../shared/shell/InstallPuppetFromMSI.ps1"
32-
#config.vm.provision :shell, :path => "../shared/shell/PreparePuppetProvisioner.ps1"
33-
config.vm.provision :shell, :path => "../shared/shell/NotifyGuiAppsOfEnvironmentChanges.ps1"
29+
if Vagrant::VERSION < '1.8.0'
30+
config.vm.provision :shell, :path => "../shared/shell/PrepareWindows.ps1"
31+
config.vm.provision :shell, :path => "../shared/shell/InstallChocolatey.ps1"
32+
config.vm.provision :shell, :path => "../shared/shell/InstallPuppetFromMSI.ps1"
33+
#config.vm.provision :shell, :path => "../shared/shell/PreparePuppetProvisioner.ps1"
34+
config.vm.provision :shell, :path => "../shared/shell/NotifyGuiAppsOfEnvironmentChanges.ps1"
35+
else
36+
config.vm.provision :shell, :path => "../shared/shell/PrepareWindows.ps1", :powershell_elevated_interactive => true
37+
config.vm.provision :shell, :path => "../shared/shell/InstallChocolatey.ps1", :powershell_elevated_interactive => true
38+
config.vm.provision :shell, :path => "../shared/shell/InstallPuppetFromMSI.ps1", :powershell_elevated_interactive => true
39+
#config.vm.provision :shell, :path => "../shared/shell/PreparePuppetProvisioner.ps1", :powershell_elevated_interactive => true
40+
config.vm.provision :shell, :path => "../shared/shell/NotifyGuiAppsOfEnvironmentChanges.ps1", :powershell_elevated_interactive => true
41+
end
42+
3443

3544
# Enable provisioning with Puppet stand alone. Puppet manifests
3645
# are contained in a directory path relative to this Vagrantfile.

boxes/win2012r2x64-vagrant/Vagrantfile

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,19 @@ Vagrant.configure("2") do |config|
2626
config.vm.synced_folder "puppet/modules", "/ProgramData/PuppetLabs/code/environments/production/modules"
2727

2828
# These install chocolatey, ruby, and puppet. Also runs librarian-puppet.
29-
config.vm.provision :shell, :path => "../shared/shell/PrepareWindows.ps1"
30-
config.vm.provision :shell, :path => "../shared/shell/InstallChocolatey.ps1"
31-
config.vm.provision :shell, :path => "../shared/shell/InstallPuppetFromMSI.ps1"
32-
#config.vm.provision :shell, :path => "../shared/shell/PreparePuppetProvisioner.ps1"
33-
config.vm.provision :shell, :path => "../shared/shell/NotifyGuiAppsOfEnvironmentChanges.ps1"
29+
if Vagrant::VERSION < '1.8.0'
30+
config.vm.provision :shell, :path => "../shared/shell/PrepareWindows.ps1"
31+
config.vm.provision :shell, :path => "../shared/shell/InstallChocolatey.ps1"
32+
config.vm.provision :shell, :path => "../shared/shell/InstallPuppetFromMSI.ps1"
33+
#config.vm.provision :shell, :path => "../shared/shell/PreparePuppetProvisioner.ps1"
34+
config.vm.provision :shell, :path => "../shared/shell/NotifyGuiAppsOfEnvironmentChanges.ps1"
35+
else
36+
config.vm.provision :shell, :path => "../shared/shell/PrepareWindows.ps1", :powershell_elevated_interactive => true
37+
config.vm.provision :shell, :path => "../shared/shell/InstallChocolatey.ps1", :powershell_elevated_interactive => true
38+
config.vm.provision :shell, :path => "../shared/shell/InstallPuppetFromMSI.ps1", :powershell_elevated_interactive => true
39+
#config.vm.provision :shell, :path => "../shared/shell/PreparePuppetProvisioner.ps1", :powershell_elevated_interactive => true
40+
config.vm.provision :shell, :path => "../shared/shell/NotifyGuiAppsOfEnvironmentChanges.ps1", :powershell_elevated_interactive => true
41+
end
3442

3543
# Enable provisioning with Puppet stand alone. Puppet manifests
3644
# are contained in a directory path relative to this Vagrantfile.

0 commit comments

Comments
 (0)