Merge pull request #569 from microsoft/dev

Dev
microsoft · Nov 15, 2023 · bfeab65 · bfeab65
2 parents e358d0c + decd67f
commit bfeab65
Show file tree

Hide file tree

Showing 7 changed files with 9,556 additions and 7,589 deletions.
diff --git a/.../AzSHCI and Deployment tool/LabConfig.ps1 → ... and Cloud Based Deployment/LabConfig.ps1 b/.../AzSHCI and Deployment tool/LabConfig.ps1 → ... and Cloud Based Deployment/LabConfig.ps1
@@ -1,10 +1,10 @@
 $LabConfig=@{AllowedVLANs="1-10,711-719" ; DomainAdminName='LabAdmin'; AdminPassword='LS1setup!' ; DCEdition='4'; Internet=$true; TelemetryLevel='Full' ; TelemetryNickname='' ; AdditionalNetworksConfig=@(); VMs=@()}
 
-#Azure Stack HCI 22H2
+#Azure Stack HCI 23H2
 #labconfig will not domain join VMs, will add "Tools disk" and will also execute powershell command to make this tools disk online.
-1..4 | ForEach-Object {$LABConfig.VMs += @{ VMName = "ASNode$_" ; Configuration = 'S2D' ; ParentVHD = 'AzSHCI23H2_G2.vhdx' ; HDDNumber = 4 ; HDDSize= 2TB ; MemoryStartupBytes= 1GB; VMProcessorCount=4 ; vTPM=$true ; Unattend="NoDjoin" }}
-#labconfig for nested virtualization (eith enough RAM to create ARC RB). You can decrease number of nodes to two - or even 1.
-#1..4 | ForEach-Object {$LABConfig.VMs += @{ VMName = "ASNode$_" ; Configuration = 'S2D' ; ParentVHD = 'AzSHCI23H2_G2.vhdx' ; HDDNumber = 4 ; HDDSize= 2TB ; MemoryStartupBytes= 20GB; VMProcessorCount=4 ; vTPM=$true ; Unattend="NoDjoin" ; NestedVirt=$true }}
+1..2 | ForEach-Object {$LABConfig.VMs += @{ VMName = "ASNode$_" ; Configuration = 'S2D' ; ParentVHD = 'AzSHCI23H2_G2.vhdx' ; HDDNumber = 4 ; HDDSize= 2TB ; MemoryStartupBytes= 1GB; VMProcessorCount=4 ; vTPM=$true ; Unattend="NoDjoin" }}
+#labconfig for nested virtualization (eith enough RAM to create ARC RB).
+#1..2 | ForEach-Object {$LABConfig.VMs += @{ VMName = "ASNode$_" ; Configuration = 'S2D' ; ParentVHD = 'AzSHCI23H2_G2.vhdx' ; HDDNumber = 4 ; HDDSize= 2TB ; MemoryStartupBytes= 20GB; VMProcessorCount=16 ; vTPM=$true ; Unattend="NoDjoin" ; NestedVirt=$true }}
 
 #Windows Admin Center in GW mode
 $LabConfig.VMs += @{ VMName = 'WACGW' ; ParentVHD = 'Win2022Core_G2.vhdx'; MGMTNICs=1}

diff --git a/Scenarios/AzSHCI and Cloud Based Deployment/Scenario.ps1 b/Scenarios/AzSHCI and Cloud Based Deployment/Scenario.ps1
diff --git a/...rios/AzSHCI and Deployment tool/readme.md → ...SHCI and Cloud Based Deployment/readme.md b/...rios/AzSHCI and Deployment tool/readme.md → ...SHCI and Cloud Based Deployment/readme.md
@@ -1,4 +1,4 @@
-Following lab is based on new Azure Stack HCI deployment tool: https://learn.microsoft.com/en-us/azure-stack/hci/deploy/deployment-tool-powershell
+Following lab is based on new Azure Stack HCI Cloud Based Deployment: https://learn.microsoft.com/en-us/azure-stack/hci/whats-new#cloud-based-deployment
 
 Notes: 
 * You can also notice in Labconfig, that nodes are not domain joined

diff --git a/Scenarios/AzSHCI and Deployment tool/Scenario.ps1 b/Scenarios/AzSHCI and Deployment tool/Scenario.ps1