Skip to content
This repository was archived by the owner on Nov 15, 2024. It is now read-only.

Commit e3f184f

Browse files
jdhitsolutionsjdhitsolutions
committed
4.20.0
1 parent 5f5aa1c commit e3f184f

34 files changed

+660
-921
lines changed

‎Configurations/Implement-Windows-Server-DHCP-2016/Instructions.md‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ This lab is specifically designed for the Implementing Windows Server 2016 DHCP
1515
MemoryGB : 1
1616

1717
Computername : Cli1
18-
Description : Windows 10 64bit Enterprise 1903 English Evaluation
18+
Description : Windows 10 64bit Enterprise 2009 English Evaluation (20H2)
1919
Role : {domainJoin, RSAT, RDP}
2020
IPAddress : 192.168.3.100
2121
MemoryGB : 2
2222

2323
Computername : Cli2
24-
Description : Windows 10 64bit Enterprise 1903 English Evaluation
24+
Description : Windows 10 64bit Enterprise 2009 English Evaluation (20H2)
2525
Role : {domainJoin, RDP}
2626
IPAddress : 192.168.3.101
2727
MemoryGB : 2
@@ -74,3 +74,12 @@ This lab is specifically designed for the Implementing Windows Server 2016 DHCP
7474
You will be prompted for each virtual machine. Or you can force the removal and suppress the prompts:
7575

7676
PS> Wipe-Lab -force
77+
78+
## Troubleshooting
79+
80+
If you encounter errors like `Invalid MOF definition for node 'DC1': Exception calling "ValidateInstanceText" with "1" argument(s): "Undefined
81+
property IsSingleInstance` you might have an older version of a DSCResource module installed.
82+
83+
Run `Get-Module xdhcpserver -list` and remove anything older than version 3.0.0.
84+
85+
uninstall-module xdhcpserver -RequiredVersion 2.0.0.0

‎Configurations/Implement-Windows-Server-DHCP-2016/VMConfiguration.ps1‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Import-DSCResource -modulename "xPSDesiredStateConfiguration" -ModuleVersion "9
2525
Import-DSCResource -modulename "xActiveDirectory" -ModuleVersion "3.0.0.0"
2626
Import-DSCResource -modulename "xComputerManagement" -ModuleVersion "4.1.0.0"
2727
Import-DSCResource -modulename "xNetworking" -ModuleVersion "5.7.0.0"
28-
Import-DSCResource -modulename "xDhcpServer" -ModuleVersion "2.0.0.0"
28+
Import-DSCResource -modulename "xDhcpServer" -ModuleVersion "3.0.0"
2929
Import-DSCResource -modulename 'xWindowsUpdate' -ModuleVersion '2.8.0.0'
3030
Import-DSCResource -modulename 'xPendingReboot' -ModuleVersion '0.4.0.0'
3131
Import-DSCResource -modulename 'xADCSDeployment' -ModuleVersion '1.4.0.0'
@@ -47,7 +47,7 @@ Import-DSCResource -modulename 'xADCSDeployment' -ModuleVersion '1.4.0.0'
4747

4848
registry TLS {
4949
Ensure = "present"
50-
Key = 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\.NetFramework\v4.0.30319'
50+
Key = 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\.NetFramework\v4.0.30319'
5151
ValueName = 'SchUseStrongCrypto'
5252
ValueData = '1'
5353
ValueType = 'DWord'
@@ -251,7 +251,8 @@ $LabData = Import-PowerShellDataFile -Path $psscriptroot\*.psd1
251251
} #End foreach
252252

253253
xDhcpServerAuthorization 'DhcpServerAuthorization' {
254-
Ensure = 'Present';
254+
Ensure = 'Present'
255+
IsSingleInstance = 'yes'
255256
DependsOn = '[WindowsFeature]DHCP'
256257
}
257258

@@ -267,13 +268,16 @@ $LabData = Import-PowerShellDataFile -Path $psscriptroot\*.psd1
267268
DependsOn = '[WindowsFeature]DHCP'
268269
}
269270

271+
<#
272+
Deprecated
270273
xDhcpServerOption 'DhcpOption' {
271274
ScopeID = $Node.DHCPScopeID
272275
DnsServerIPAddress = $Node.DHCPDnsServerIPAddress
273276
Router = $node.DHCPRouter
274277
AddressFamily = $Node.DHCPAddressFamily
275278
DependsOn = '[xDhcpServerScope]DhcpScope'
276279
}
280+
#>
277281

278282
} #end DHCP Config
279283
#endregion

‎Configurations/Implement-Windows-Server-DHCP-2016/VMConfigurationData.psd1‎

Lines changed: 41 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -82,46 +82,43 @@ This example code is provided without copyright and AS IS. It is free for you t
8282
Lability_MinimumMemory = 1GB
8383
SecureBoot = $false
8484
Lability_Media = '2016_x64_Standard_Core_EN_Eval'
85-
<#
86-
87-
Id Description
88-
-- -----------
89-
2019_x64_Standard_EN_Eval Windows Server 2019 Standard 64bit English Evaluation with Desktop Experience
90-
2019_x64_Standard_EN_Core_Eval Windows Server 2019 Standard 64bit English Evaluation
91-
2019_x64_Datacenter_EN_Eval Windows Server 2019 Datacenter 64bit English Evaluation with Desktop Experience
92-
2019_x64_Datacenter_EN_Core_Eval Windows Server 2019 Datacenter Evaluation in Core mode
93-
2016_x64_Standard_EN_Eval Windows Server 2016 Standard 64bit English Evaluation
94-
2016_x64_Standard_Core_EN_Eval Windows Server 2016 Standard Core 64bit English Evaluation
95-
2016_x64_Datacenter_EN_Eval Windows Server 2016 Datacenter 64bit English Evaluation
96-
2016_x64_Datacenter_Core_EN_Eval Windows Server 2016 Datacenter Core 64bit English Evaluation
97-
2016_x64_Standard_Nano_EN_Eval Windows Server 2016 Standard Nano 64bit English Evaluation
98-
2016_x64_Datacenter_Nano_EN_Eval Windows Server 2016 Datacenter Nano 64bit English Evaluation
99-
2012R2_x64_Standard_EN_Eval Windows Server 2012 R2 Standard 64bit English Evaluation
100-
2012R2_x64_Standard_EN_V5_Eval Windows Server 2012 R2 Standard 64bit English Evaluation with WMF 5
101-
2012R2_x64_Standard_EN_V5_1_Eval Windows Server 2012 R2 Standard 64bit English Evaluation with WMF 5.1
102-
2012R2_x64_Standard_Core_EN_Eval Windows Server 2012 R2 Standard Core 64bit English Evaluation
103-
2012R2_x64_Standard_Core_EN_V5_Eval Windows Server 2012 R2 Standard Core 64bit English Evaluation with WMF 5
104-
2012R2_x64_Standard_Core_EN_V5_1_Eval Windows Server 2012 R2 Standard Core 64bit English Evaluation with WMF 5.1
105-
2012R2_x64_Datacenter_EN_Eval Windows Server 2012 R2 Datacenter 64bit English Evaluation
106-
2012R2_x64_Datacenter_EN_V5_Eval Windows Server 2012 R2 Datacenter 64bit English Evaluation with WMF 5
107-
2012R2_x64_Datacenter_EN_V5_1_Eval Windows Server 2012 R2 Datacenter 64bit English Evaluation with WMF 5.1
108-
2012R2_x64_Datacenter_Core_EN_Eval Windows Server 2012 R2 Datacenter Core 64bit English Evaluation
109-
2012R2_x64_Datacenter_Core_EN_V5_Eval Windows Server 2012 R2 Datacenter Core 64bit English Evaluation with WMF 5
110-
2012R2_x64_Datacenter_Core_EN_V5_1_Eval Windows Server 2012 R2 Datacenter Core 64bit English Evaluation with WMF 5.1
111-
WIN81_x64_Enterprise_EN_Eval Windows 8.1 64bit Enterprise English Evaluation
112-
WIN81_x64_Enterprise_EN_V5_Eval Windows 8.1 64bit Enterprise English Evaluation with WMF 5
113-
WIN81_x64_Enterprise_EN_V5_1_Eval Windows 8.1 64bit Enterprise English Evaluation with WMF 5.1
114-
WIN81_x86_Enterprise_EN_Eval Windows 8.1 32bit Enterprise English Evaluation
115-
WIN81_x86_Enterprise_EN_V5_Eval Windows 8.1 32bit Enterprise English Evaluation with WMF 5
116-
WIN81_x86_Enterprise_EN_V5_1_Eval Windows 8.1 32bit Enterprise English Evaluation with WMF 5.1
117-
WIN10_x64_Enterprise_EN_Eval Windows 10 64bit Enterprise 1903 English Evaluation
118-
WIN10_x86_Enterprise_EN_Eval Windows 10 32bit Enterprise 1903 English Evaluation
119-
WIN10_x64_Enterprise_LTSC_EN_Eval Windows 10 64bit Enterprise LTSC 2019 English Evaluation
120-
WIN10_x86_Enterprise_LTSC_EN_Eval Windows 10 32bit Enterprise LTSC 2019 English Evaluation
121-
122-
123-
124-
#>
85+
86+
<#
87+
Id Arch Media Description
88+
-- ---- ----- -----------
89+
2019_x64_Standard_EN_Eval x64 ISO Windows Server 2019 Standard 64bit English Evaluation with Desktop Experience
90+
2019_x64_Standard_EN_Core_Eval x64 ISO Windows Server 2019 Standard 64bit English Evaluation
91+
2019_x64_Datacenter_EN_Eval x64 ISO Windows Server 2019 Datacenter 64bit English Evaluation with Desktop Experience
92+
2019_x64_Datacenter_EN_Core_Eval x64 ISO Windows Server 2019 Datacenter Evaluation in Core mode
93+
2016_x64_Standard_EN_Eval x64 ISO Windows Server 2016 Standard 64bit English Evaluation
94+
2016_x64_Standard_Core_EN_Eval x64 ISO Windows Server 2016 Standard Core 64bit English Evaluation
95+
2016_x64_Datacenter_EN_Eval x64 ISO Windows Server 2016 Datacenter 64bit English Evaluation
96+
2016_x64_Datacenter_Core_EN_Eval x64 ISO Windows Server 2016 Datacenter Core 64bit English Evaluation
97+
2016_x64_Standard_Nano_EN_Eval x64 ISO Windows Server 2016 Standard Nano 64bit English Evaluation
98+
2016_x64_Datacenter_Nano_EN_Eval x64 ISO Windows Server 2016 Datacenter Nano 64bit English Evaluation
99+
2012R2_x64_Standard_EN_Eval x64 ISO Windows Server 2012 R2 Standard 64bit English Evaluation
100+
2012R2_x64_Standard_EN_V5_Eval x64 ISO Windows Server 2012 R2 Standard 64bit English Evaluation with WMF 5
101+
2012R2_x64_Standard_EN_V5_1_Eval x64 ISO Windows Server 2012 R2 Standard 64bit English Evaluation with WMF 5.1
102+
2012R2_x64_Standard_Core_EN_Eval x64 ISO Windows Server 2012 R2 Standard Core 64bit English Evaluation
103+
2012R2_x64_Standard_Core_EN_V5_Eval x64 ISO Windows Server 2012 R2 Standard Core 64bit English Evaluation with WMF 5
104+
2012R2_x64_Standard_Core_EN_V5_1_Eval x64 ISO Windows Server 2012 R2 Standard Core 64bit English Evaluation with WMF 5.1
105+
2012R2_x64_Datacenter_EN_Eval x64 ISO Windows Server 2012 R2 Datacenter 64bit English Evaluation
106+
2012R2_x64_Datacenter_EN_V5_Eval x64 ISO Windows Server 2012 R2 Datacenter 64bit English Evaluation with WMF 5
107+
2012R2_x64_Datacenter_EN_V5_1_Eval x64 ISO Windows Server 2012 R2 Datacenter 64bit English Evaluation with WMF 5.1
108+
2012R2_x64_Datacenter_Core_EN_Eval x64 ISO Windows Server 2012 R2 Datacenter Core 64bit English Evaluation
109+
2012R2_x64_Datacenter_Core_EN_V5_Eval x64 ISO Windows Server 2012 R2 Datacenter Core 64bit English Evaluation with WMF 5
110+
2012R2_x64_Datacenter_Core_EN_V5_1_Eval x64 ISO Windows Server 2012 R2 Datacenter Core 64bit English Evaluation with WMF 5.1
111+
WIN81_x64_Enterprise_EN_Eval x64 ISO Windows 8.1 64bit Enterprise English Evaluation
112+
WIN81_x64_Enterprise_EN_V5_Eval x64 ISO Windows 8.1 64bit Enterprise English Evaluation with WMF 5
113+
WIN81_x64_Enterprise_EN_V5_1_Eval x64 ISO Windows 8.1 64bit Enterprise English Evaluation with WMF 5.1
114+
WIN81_x86_Enterprise_EN_Eval x86 ISO Windows 8.1 32bit Enterprise English Evaluation
115+
WIN81_x86_Enterprise_EN_V5_Eval x86 ISO Windows 8.1 32bit Enterprise English Evaluation with WMF 5
116+
WIN81_x86_Enterprise_EN_V5_1_Eval x86 ISO Windows 8.1 32bit Enterprise English Evaluation with WMF 5.1
117+
WIN10_x64_Enterprise_20H2_EN_Eval x64 ISO Windows 10 64bit Enterprise 2009 English Evaluation
118+
WIN10_x86_Enterprise_20H2_EN_Eval x86 ISO Windows 10 32bit Enterprise 2009 English Evaluation
119+
WIN10_x64_Enterprise_LTSC_EN_Eval x64 ISO Windows 10 64bit Enterprise LTSC 2019 English Evaluation
120+
WIN10_x86_Enterprise_LTSC_EN_Eval x86 ISO Windows 10 32bit Enterprise LTSC 2019 English Evaluation
121+
#>
125122

126123
}
127124

@@ -168,10 +165,10 @@ WIN10_x86_Enterprise_LTSC_EN_Eval Windows 10 32bit Enterprise LTSC 2019 En
168165
Role = @('domainJoin', 'RSAT', 'RDP')
169166
Lability_ProcessorCount = 2
170167
Lability_MinimumMemory = 2GB
171-
Lability_Media = 'WIN10_x64_Enterprise_EN_Eval'
168+
Lability_Media = 'WIN10_x64_Enterprise_20H2_EN_Eval'
172169
Lability_BootOrder = 20
173170
Lability_timeZone = 'US Mountain Standard Time' #[System.TimeZoneInfo]::GetSystemTimeZones()
174-
Lability_Resource = @('Win10RSAT')
171+
Lability_Resource = @()
175172
CustomBootStrap = ''
176173
}
177174
@{
@@ -180,7 +177,7 @@ WIN10_x86_Enterprise_LTSC_EN_Eval Windows 10 32bit Enterprise LTSC 2019 En
180177
Role = @('domainJoin', 'RDP') #Removed RSAT
181178
Lability_ProcessorCount = 2
182179
Lability_MinimumMemory = 2GB
183-
Lability_Media = 'WIN10_x64_Enterprise_EN_Eval'
180+
Lability_Media = 'WIN10_x64_Enterprise_20H2_EN_Eval'
184181
Lability_BootOrder = 20
185182
Lability_timeZone = 'US Mountain Standard Time' #[System.TimeZoneInfo]::GetSystemTimeZones()
186183
CustomBootStrap = ''
@@ -206,20 +203,14 @@ WIN10_x86_Enterprise_LTSC_EN_Eval Windows 10 32bit Enterprise LTSC 2019 En
206203
@{ Name = 'xActiveDirectory'; RequiredVersion = "3.0.0.0"; Provider = 'PSGallery' },
207204
@{ Name = 'xComputerManagement'; RequiredVersion = '4.1.0.0'; Provider = 'PSGallery' },
208205
@{ Name = 'xNetworking'; RequiredVersion = '5.7.0.0'; Provider = 'PSGallery' },
209-
@{ Name = 'xDhcpServer'; RequiredVersion = '2.0.0.0'; Provider = 'PSGallery' },
206+
@{ Name = 'xDhcpServer'; RequiredVersion = '3.0.0'; Provider = 'PSGallery' },
210207
@{ Name = 'xWindowsUpdate' ; RequiredVersion = '2.8.0.0'; Provider = 'PSGallery' },
211208
@{ Name = 'xPSDesiredStateConfiguration'; RequiredVersion = '9.1.0'; Provider = 'PSGallery' },
212209
@{ Name = 'xPendingReboot'; RequiredVersion = '0.4.0.0'; Provider = 'PSGallery' },
213210
@{ Name = 'xADCSDeployment'; RequiredVersion = '1.4.0.0'; Provider = 'PSGallery' }
214211
)
215212
Resource = @(
216213
@{
217-
218-
Id = 'Win10RSAT'
219-
Filename = 'WindowsTH-RSAT_WS2016-x64.msu'
220-
Uri = 'https://download.microsoft.com/download/1/D/8/1D8B5022-5477-4B9A-8104-6A71FF9D98AB/WindowsTH-RSAT_WS2016-x64.msu'
221-
Expand = $false
222-
#DestinationPath = '\software' # Default is resources folder
223214
}
224215
)
225216
}

‎Configurations/Jason-DSC-Env/Instructions.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This lab builds the following:
2727
MemoryGB : 1
2828

2929
Computername : Cli1
30-
Description : Windows 10 64bit Enterprise 1903 English Evaluation
30+
Description : Windows 10 64bit Enterprise 2009 English Evaluation (20H2)
3131
Role : {domainJoin, RSAT, RDP}
3232
IPAddress : 192.168.3.100
3333
MemoryGB : 2
@@ -80,3 +80,12 @@ This lab builds the following:
8080
You will be prompted for each virtual machine. Or you can force the removal and suppress the prompts:
8181

8282
PS> Wipe-Lab -force
83+
84+
## Troubleshooting
85+
86+
If you encounter errors like `Invalid MOF definition for node 'DC1': Exception calling "ValidateInstanceText" with "1" argument(s): "Undefined
87+
property IsSingleInstance` you might have an older version of a DSCResource module installed.
88+
89+
Run `Get-Module xdhcpserver -list` and remove anything older than version 3.0.0.
90+
91+
uninstall-module xdhcpserver -RequiredVersion 2.0.0.0

‎Configurations/Jason-DSC-Env/VMConfiguration.ps1‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Configuration AutoLab {
2323
Import-DSCResource -ModuleName 'xActiveDirectory' -ModuleVersion '3.0.0.0'
2424
Import-DSCResource -ModuleName 'xComputerManagement' -ModuleVersion '4.1.0.0'
2525
Import-DSCResource -ModuleName 'xNetworking' -ModuleVersion '5.7.0.0'
26-
Import-DSCResource -ModuleName 'xDhcpServer' -ModuleVersion '2.0.0.0'
26+
Import-DSCResource -ModuleName 'xDhcpServer' -ModuleVersion '3.0.0'
2727
Import-DSCResource -ModuleName 'xWindowsUpdate' -ModuleVersion '2.8.0.0'
2828
Import-DSCResource -ModuleName 'xPSDesiredStateConfiguration' -ModuleVersion '9.1.0'
2929
Import-DSCResource -ModuleName 'xPendingReboot' -ModuleVersion '0.4.0.0'
@@ -48,7 +48,7 @@ Configuration AutoLab {
4848

4949
registry TLS {
5050
Ensure = "present"
51-
Key = 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\.NetFramework\v4.0.30319'
51+
Key = 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\.NetFramework\v4.0.30319'
5252
ValueName = 'SchUseStrongCrypto'
5353
ValueData = '1'
5454
ValueType = 'DWord'
@@ -247,7 +247,8 @@ Configuration AutoLab {
247247
} #End foreach
248248

249249
xDhcpServerAuthorization 'DhcpServerAuthorization' {
250-
Ensure = 'Present';
250+
Ensure = 'Present'
251+
IsSingleInstance = 'yes'
251252
DependsOn = '[WindowsFeature]DHCP'
252253
}
253254

@@ -263,13 +264,16 @@ Configuration AutoLab {
263264
DependsOn = '[WindowsFeature]DHCP'
264265
}
265266

267+
<#
268+
Deprecated
266269
xDhcpServerOption 'DhcpOption' {
267270
ScopeID = $Node.DHCPScopeID
268271
DnsServerIPAddress = $Node.DHCPDnsServerIPAddress
269272
Router = $node.DHCPRouter
270273
AddressFamily = $Node.DHCPAddressFamily
271274
DependsOn = '[xDhcpServerScope]DhcpScope'
272275
}
276+
#>
273277

274278
} #end DHCP Config
275279
#endregion

0 commit comments

Comments
 (0)