.

codykonior · Jul 19, 2024 · 87bdc8f · 87bdc8f
1 parent d19d802
commit 87bdc8f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 19 deletions.
diff --git a/OftenOn/Configuration/OftenOn.psd1 b/OftenOn/Configuration/OftenOn.psd1
@@ -35,7 +35,16 @@
             Lability_Resource = @(
                 'NlaSvcFix',
                 'TriggerDsc',
+                'SQL Server 2012',
+                'SQL Server 2014',
+                'SQL Server 2016',
                 'SQL Server 2019',
+                'SQL Server 2022',
+                'SQL Server Management Studio 16.5.3',
+                'SQL Server Management Studio 17.9.1',
+                'SQL Server Management Studio 18.12.1',
+                'SQL Server Management Studio 19.3',
+                'SQL Server Management Studio 20.2',
                 'NET Framework 4.5.1',
                 'NET Framework 4.5.2',
                 'NET Framework 4.6',

diff --git a/OftenOn/Public/Set-OftenOnLab.ps1 b/OftenOn/Public/Set-OftenOnLab.ps1
@@ -22,7 +22,9 @@ function Set-OftenOnLab {
         [hashtable] $Cluster2,
 
         [ValidateSet("10.0", "192.168", "172.16")]
-        $Subnet = "10.0"
+        $Subnet = "10.0",
+
+        [switch] $KeepMedia
     )
 
     if ($PSCmdlet.ParameterSetName -eq 'Default') {
@@ -102,11 +104,12 @@ function Set-OftenOnLab {
             Write-Error "$ModulePath does not exist"
         }
         $configurationData.NonNodeData.Lability.Resource += @{ Id = 'ModulePath'; IsLocal = $true; Filename = $ModulePath; DestinationPath = '\Program Files\WindowsPowerShell'; }
-        $node = $configurationData.AllNodes | Where-Object { $_.NodeName -eq 'CHDBA01' }
-        if (!$node.psobject.Properties["Lability_Resource"]) {
-            $node.Lability_Resource = ($configurationData.AllNodes | Where-Object { $_.NodeName -eq '*' }).Lability_Resource
+        foreach ($node in ($configurationData.AllNodes | Where-Object { $_.NodeName -like 'CHDBA*' })) {
+            if (!$node.psobject.Properties["Lability_Resource"]) {
+                $node.Lability_Resource = ($configurationData.AllNodes | Where-Object { $_.NodeName -eq '*' }).Lability_Resource
+            }
+            $node.Lability_Resource += 'ModulePath'    
         }
-        $node.Lability_Resource += 'ModulePath'
     }
 
     if ($Cluster1) {
@@ -118,7 +121,6 @@ function Set-OftenOnLab {
         foreach ($node in $configurationData.AllNodes | Where-Object { $_.Role.Contains("SqlServer") -and $_.Role.Cluster.Name -eq "C1" }) {
             $node.Role.SqlServer.SourcePath = $sql
         }
-
         if (!$Cluster1.AvailabilityGroup) {
             foreach ($node in $configurationData.AllNodes | Where-Object { $_.Role.Contains("AvailabilityGroup") -and $_.Role.Cluster.Name -eq "C1" }) {
                 $node.Role.Remove("AvailabilityGroup")
@@ -135,7 +137,6 @@ function Set-OftenOnLab {
         foreach ($node in $configurationData.AllNodes | Where-Object { $_.Role.Contains("SqlServer") -and $_.Role.Cluster.Name -eq "C2" }) {
             $node.Role.SqlServer.SourcePath = $sql
         }
-
         if (!$Cluster2.AvailabilityGroup) {
             foreach ($node in $configurationData.AllNodes | Where-Object { $_.Role.Contains("AvailabilityGroup") -and $_.Role.Cluster.Name -eq "C2" }) {
                 $node.Role.Remove("AvailabilityGroup")
@@ -145,18 +146,19 @@ function Set-OftenOnLab {
         $configurationData.AllNodes = $configurationData.AllNodes | Where-Object { -not $_.Role.Contains("Cluster") -or $_.Role.Cluster.Name -ne "C2" }
     }
 
-    # Strip out unnecessary SQL installation media;
-    # this is because some may not be available right now.
-    foreach ($node in $configurationData.AllNodes) {
-        if ($node.ContainsKey("Lability_Resource")) {
-            $node.Lability_Resource = $node.Lability_Resource | ForEach-Object {
-                if ($_ -notlike "SQL Server *") {
-                    $_
-                } elseif ($Cluster1 -and $Cluster1.SQL -and $_ -eq "SQL Server $($Cluster1.SQL)") {
-                    $_
-                }  elseif ($Cluster2 -and $Cluster2.SQL -and $_ -eq "SQL Server $($Cluster2.SQL)") {
-                    $_
-                }       
+    # Strip out unnecessary SQL installation media
+    if (-not $KeepMedia) {
+        foreach ($node in $configurationData.AllNodes) {
+            if ($node.ContainsKey("Lability_Resource")) {
+                $node.Lability_Resource = $node.Lability_Resource | ForEach-Object {
+                    if ($_ -notlike "SQL Server 2*") {
+                        $_
+                    } elseif ($Cluster1 -and $Cluster1.SQL -and $_ -eq "SQL Server $($Cluster1.SQL)") {
+                        $_
+                    }  elseif ($Cluster2 -and $Cluster2.SQL -and $_ -eq "SQL Server $($Cluster2.SQL)") {
+                        $_
+                    }       
+                }
             }
         }
     }