multiple fixes

2022-10-14 16:32:39 +02:00 · 2022-10-14 16:32:39 +02:00 · f852023321
--- a/Edition/LabConfig.ps1
+++ b/Edition/LabConfig.ps1
@ -1,9 +1,9 @@
 $LabConfig=@{AllowedVLANs="1-10,711-719" ; DomainAdminName='LabAdmin'; AdminPassword='LS1setup!' ; DCEdition='4'; Internet=$true ; TelemetryLevel='Full' ; TelemetryNickname='' ; AdditionalNetworksConfig=@(); VMs=@()}

 #Azure Stack HCI 21H2
-1..4 | ForEach-Object {$LABConfig.VMs += @{ VMName = "AzSHCI$_" ; Configuration = 'S2D' ; ParentVHD = 'AzSHCI22H2_G2.vhdx' ; HDDNumber = 4 ; HDDSize= 2TB ; MemoryStartupBytes= 1GB; VMProcessorCount="4" ; vTPM=$true}}
+1..4 | ForEach-Object {$LABConfig.VMs += @{ VMName = "AzSHCI$_" ; Configuration = 'S2D' ; ParentVHD = 'AzSHCI22H2_G2.vhdx' ; HDDNumber = 4 ; HDDSize= 2TB ; MemoryStartupBytes= 1GB; VMProcessorCount=4 ; vTPM=$true}}
 #Or with nested virtualization enabled
-#1..4 | ForEach-Object {$LABConfig.VMs += @{ VMName = "AzSHCI$_" ; Configuration = 'S2D' ; ParentVHD = 'AzSHCI22H2_G2.vhdx' ; HDDNumber = 10 ; HDDSize= 10TB ; MemoryStartupBytes= 4GB; VMProcessorCount="4" ; vTPM=$true ; NestedVirt=$true}}
+#1..4 | ForEach-Object {$LABonfig.VMs += @{ VMName = "AzSHCI$_" ; ConfiguratioCn = 'S2D' ; ParentVHD = 'AzSHCI22H2_G2.vhdx' ; HDDNumber = 10 ; HDDSize= 10TB ; MemoryStartupBytes= 4GB; VMProcessorCount="4" ; vTPM=$true ; NestedVirt=$true}}

 #Optional Windows Admin Center in GW mode
 $LabConfig.VMs += @{ VMName = 'WACGW' ; ParentVHD = 'Win2022Core_G2.vhdx'; MGMTNICs=1}
--- a/Edition/Scenario.ps1
+++ b/Edition/Scenario.ps1
@ -8,7 +8,7 @@
    $ClusterName="AzSHCI-Cluster"

    #Cluster-Aware-Updating role name
-    $CAURoleName="" #if empty, CAU will not be installed
+    $CAURoleName="AzSHCI-Cl-CAU" #if empty, CAU will not be installed

    #Cluster IP
    $ClusterIP="" #If blank (you can write just $ClusterIP="", DHCP will be used). If $DistributedManagementPoint is true, then IP is not used
@ -16,8 +16,8 @@
    #Distributed Cluster ManagementPoint? (Cluster Name in DNS will have IP of every node - like SOFS). If $ClusterIP is set, then $clusterIP will be ignored).
    $DistributedManagementPoint=$false

-    #Windows Update
-    $WindowsUpdate="Recommended" #or blank, or all (all = including preview)
+    #Perform Windows update? (for more info visit WU Scenario https://github.com/microsoft/WSLab/tree/dev/Scenarios/Windows%20Update)
+    $WindowsUpdate="Recommended" #Can be "All","Recommended" or "None"

    #Dell updates
    $DellUpdates=$true
@ -56,11 +56,8 @@
    }
    $ComputersInfo | Select-Object PSComputerName,CurrentBuildNumber,UBR

-
+    #Update servers
    if ($WindowsUpdate -eq "Recommended"){
-    $CurrentBuildNumber=Invoke-Command -ComputerName $Servers[0] -ScriptBlock {
-        Get-ItemPropertyValue -Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\' -Name CurrentBuildNumber
-    }
        #Create virtual account to be able to run command without credssp
        Invoke-Command -ComputerName $servers -ScriptBlock {
            New-PSSessionConfigurationFile -RunAsVirtualAccount -Path $env:TEMP\VirtualAccount.pssc
@ -172,6 +169,10 @@ if ($WindowsUpdate -eq "Recommended"){
                Get-PhysicalDisk -CanPool $True | Reset-PhysicalDisk
            }
        }
+
+    #Configure max evenlope size to be 4kb to be able to copy files using PSSession (useful for dell drivers update region)
+        Invoke-Command -ComputerName $servers -ScriptBlock {Set-Item -Path WSMan:\localhost\MaxEnvelopeSizekb -Value 4096}
+
 #endregion

 #region configure OS Security
@ -197,8 +198,10 @@ if ($WindowsUpdate -eq "Recommended"){
    }
 #endregion

-#region install Dell drivers
-    if ($DellUpdates){
+#region install Dell drivers https://github.com/microsoft/MSLab/tree/master/Scenarios/AzSHCI%20and%20Dell%20Servers%20Update
+    if ($DellUpdates -and ((Get-CimInstance -ClassName win32_computersystem -CimSession $Servers[0]).Manufacturer -like "*Dell Inc.")){
+        $DSUDownloadFolder="$env:USERPROFILE\Downloads\DSU"
+        $DSUPackageDownloadFolder="$env:USERPROFILE\Downloads\DSUPackage"
        #region prepare DSU binaries
            #Download DSU
                #https://github.com/DellProSupportGse/Tools/blob/main/DART.ps1
@ -265,7 +268,7 @@ if ($WindowsUpdate -eq "Recommended"){
                c
                @'
                Set-Content -Path "$DSUPackageDownloadFolder\answer.txt" -Value $content -NoNewline
-                $content='"C:\Program Files\Dell\DELL EMC System Update\DSU.exe" --catalog-location=ASHCI-Catalog.xml --apply-upgrades <answer.txt'
+                $content='"C:\Program Files\Dell\DELL System Update\DSU.exe" --catalog-location=ASHCI-Catalog.xml --apply-upgrades <answer.txt'
                Set-Content -Path "$DSUPackageDownloadFolder\install.cmd" -Value $content -NoNewline

                #upload DSU package to servers
@ -279,8 +282,8 @@ if ($WindowsUpdate -eq "Recommended"){
        
        #region check if there are any updates needed
            $ScanResult=Invoke-Command -ComputerName $Servers -ScriptBlock {
-                & "C:\Program Files\Dell\DELL EMC System Update\DSU.exe" --catalog-location="$using:DSUPackageDownloadFolder\ASHCI-Catalog.xml" --preview | Out-Null
-                $Result=(Get-content "C:\ProgramData\Dell\DELL EMC System Update\dell_dup\DSU_STATUS.json" | ConvertFrom-JSon).systemupdatestatus.invokerinfo.statusmessage
+                & "C:\Program Files\Dell\DELL System Update\DSU.exe" --catalog-location="$using:DSUPackageDownloadFolder\ASHCI-Catalog.xml" --preview | Out-Null
+                $Result=(Get-content "C:\ProgramData\Dell\DELL System Update\dell_dup\DSU_STATUS.json" | ConvertFrom-JSon).systemupdatestatus.invokerinfo.statusmessage
                if ($Result -like "No Applicable Update*" ){
                    $DellUpdateRequired=$false
                }else{
@ -288,8 +291,12 @@ if ($WindowsUpdate -eq "Recommended"){
                }
            
                #scan for microsoft updates
+                $SearchCriteriaAllUpdates = "IsInstalled=0 and DeploymentAction='Installation' or
+                IsPresent=1 and DeploymentAction='Uninstallation' or
+                IsInstalled=1 and DeploymentAction='Installation' and RebootRequired=1 or
+                IsInstalled=0 and DeploymentAction='Uninstallation' and RebootRequired=1"
                $Searcher = New-Object -ComObject Microsoft.Update.Searcher
-                $SearchResult = $Searcher.Search($using:SearchCriteriaAllUpdates).Updates
+                $SearchResult = $Searcher.Search($SearchCriteriaAllUpdates).Updates
                if ($SearchResult.Count -gt 0){
                    $MicrosoftUpdateRequired=$True
                }else{
@ -322,7 +329,7 @@ if ($WindowsUpdate -eq "Recommended"){
                        #install DSU updates
                        Start-Process -FilePath "install.cmd" -Wait -WorkingDirectory $using:DSUPackageDownloadFolder
                        #display result
-                        Get-Content "C:\ProgramData\Dell\DELL EMC System Update\dell_dup\DSU_STATUS.json"
+                        Get-Content "C:\ProgramData\Dell\DELL System Update\dell_dup\DSU_STATUS.json"
                    }
                }else{
                    Write-Output "$($Server): Dell System Updates not required"
@ -404,6 +411,8 @@ if ($WindowsUpdate -eq "Recommended"){
    #add role
        Add-CauClusterRole -ClusterName $ClusterName -MaxFailedNodes 0 -RequireAllNodesOnline -EnableFirewallRules -VirtualComputerObjectName $CAURoleName -Force -CauPluginName Microsoft.WindowsUpdatePlugin -MaxRetriesPerNode 3 -CauPluginArguments @{ 'IncludeRecommendedUpdates' = 'False' } -StartDate "3/2/2017 3:00:00 AM" -DaysOfWeek 4 -WeeksOfMonth @(3) -verbose
    }
+    #disable self-updating
+    Disable-CauClusterRole -ClusterName $ClusterName -Force
 #endregion

 #region Configure networking with NetATC https://techcommunity.microsoft.com/t5/networking-blog/network-atc-what-s-coming-in-azure-stack-hci-22h2/ba-p/3598442
@ -425,7 +434,7 @@ if ($WindowsUpdate -eq "Recommended"){
            #virtual environment (skipping RDMA config)
            $AdapterOverride = New-NetIntentAdapterPropertyOverrides
            $AdapterOverride.NetworkDirect = 0
-            Add-NetIntent -Name ConvergedIntent -Management -Compute -Storage -AdapterName "Ethernet","Ethernet 2" -AdapterPropertyOverrides $AdapterOverride -Verbose
+            Add-NetIntent -ClusterName $ClusterName -Name ConvergedIntent -Management -Compute -Storage -AdapterName "Ethernet","Ethernet 2" -AdapterPropertyOverrides $AdapterOverride -Verbose
        }else{
            #real hardware
            #grab fastest adapters names (assuming that we are deploying converged intent with just Mellanox or Intel E810)
@ -452,18 +461,27 @@ if ($WindowsUpdate -eq "Recommended"){
            Remove-NetIntent -Name $intent.IntentName -ClusterName $clustername
        }
        #>
+
+    #if deploying in VMs, some nodes might fail (quarantined state) and even CNO can go to offline ... go to cluadmin and fix
+        #Get-ClusterNode -Cluster $ClusterName| Where-Object State -eq down | Start-ClusterNode -ClearQuarantine
 #endregion

-#region configure what was not configured with NetATC
+#region configure what was not configured with NetATC (I need to research bit more, there few bits missing for netATC)
    #disable unused adapters
        Get-Netadapter -CimSession $Servers | Where-Object Status -ne "Up" | Disable-NetAdapter -Confirm:0

    #rename cluster networks (assuming default 711-719 VLANs are used) - BUG (should be done automatically)
        1..9 | ForEach-Object {
-            (Get-ClusterNetwork -Cluster $clustername | Where-Object Address -like "10.71.$_.0" -ErrorAction Ignore).Name="SMB0$_"
+            $network=Get-ClusterNetwork -Cluster $clustername | Where-Object Address -like "10.71.$_.0" -ErrorAction Ignore
+            if ($network){
+                $Network.Name="SMB0$_"
+            }
        }
        0..9  | ForEach-Object {
-            (Get-ClusterNetwork -Cluster $clustername | Where-Object Address -like "10.72.$_.0"  -ErrorAction Ignore).Name="SMB1$_"
+            $network=Get-ClusterNetwork -Cluster $clustername | Where-Object Address -like "10.72.$_.0"  -ErrorAction Ignore
+            if ($network){
+                $Network.Name="SMB0$_"
+            }
        }
        #Rename Management Network
        (Get-ClusterNetwork -Cluster $clustername | Where-Object Role -eq "ClusterAndClient").Name="Management"