This commit is contained in:
Zack Meier
2026-05-07 15:37:07 -05:00
parent 2f40375b15
commit 16427a9930
2 changed files with 25 additions and 16 deletions
@@ -57,9 +57,9 @@ function New-ITDWindowsVmAzureStep1 {
[int]
$AvailabilityZone,
[Parameter(ParameterSetName = 'VmSizeOverride')]
[Parameter(ParameterSetName = 'VmSize')]
[string]
$VMSizeOverride,
$VmSize,
[Parameter(ParameterSetName = 'VmSizeDetermine')]
[int]
@@ -247,9 +247,9 @@ function New-ITDWindowsVmAzureStep1 {
$location = "centralus"
switch ($PSCmdLet.ParameterSetName) {
"VmSizeOverride" {
Write-Verbose -Message "ParameterSet is VmSizeOverride"
$VMSize = Get-AzVMSize -Location centralus | Where-Object { $_.Name -eq $VMSizeOverride }
"VmSize" {
Write-Verbose -Message "ParameterSet is VmSize"
$VMSize = Get-AzVMSize -Location centralus | Where-Object { $_.Name -eq $VmSize }
}
"VmSizeDetermine" {
Write-Verbose -Message "ParameterSet is VmSizeDetermine"
@@ -7,10 +7,9 @@ param (
[string]
$FQDN,
[Parameter(ParameterSetName = 'FromSCTask')]
[Parameter(Mandatory = $true, ParameterSetName = 'ManualEntry', HelpMessage = "Example: Standard_D4ds_v5")]
[string]
$VMSizeOverride,
$VmSize,
[Parameter(Mandatory = $true, ParameterSetName = 'ManualEntry')]
[int]
@@ -43,8 +42,9 @@ param (
[string]
$ResourceGroupNameOverride,
[ValidateSet('1', '2', '3')]
[int]
[Parameter(Mandatory = $true, ParameterSetName = 'ManualEntry')]
[ValidateSet('No Zone', 'Zone 1', 'Zone 2', 'Zone 3')]
[string]
$AvailabilityZone
)
@@ -53,7 +53,7 @@ switch ($PSCmdlet.ParameterSetName) {
$NewITDWindowsVmAzureParams = @{
FQDN = $FQDN;
AppName = $AppName;
VMSizeOverride = $VMSizeOverride;
VmSize = $VmSize;
#CPU = $CPU;
#MemoryGB = $MemoryGB;
DiskOsGB = $DiskOsGB;
@@ -84,6 +84,7 @@ switch ($PSCmdlet.ParameterSetName) {
$NewITDWindowsVmAzureParams = @{
FQDN = ( ($Ritm.VariableSet | Where-Object { $_.host_name -eq $FqdnFromSCTaskDescription }).host_name );
VmSize = ( ($Ritm.VariableSet | Where-Object { $_.host_name -eq $FqdnFromSCTaskDescription }).azure_vm_size );
DiskOsGB = ( ($Ritm.VariableSet | Where-Object { $_.host_name -eq $FqdnFromSCTaskDescription }).disk_1_os );
DiskDataGB = ( ($Ritm.VariableSet | Where-Object { $_.host_name -eq $FqdnFromSCTaskDescription }).disk_3 );
Subnet = ( Get-ITDServiceNowRecord -Table 'cmdb_ci_ip_network' -SysId ($Ritm.VariableSet | Where-Object { $_.host_name -eq "$FqdnFromSCTaskDescription" }).cidr_block).name.display_value;
@@ -91,6 +92,14 @@ switch ($PSCmdlet.ParameterSetName) {
VMEnvironment = ( $Ritm.customvariable.environment.value );
AppName = ( Get-ITDServiceNowRecord -Table 'cmdb_ci_service' -SysId ($Ritm.VariableSet | Where-Object { $_.host_name -eq "$FqdnFromSCTaskDescription" }).application_info).name.display_value;
LicensingRestrictions = ( ($Ritm.VariableSet | Where-Object { $_.host_name -eq $FqdnFromSCTaskDescription }).licensing_restrictions );
AvailabilityZone = ( switch( ($Ritm.VariableSet | Where-Object { $_.host_name -eq $FqdnFromSCTaskDescription }).zone ) {
'1' { 'Zone 1' }
'2' { 'Zone 2' }
'3' { 'Zone 3' }
Default { 'No Zone' }
}
)
});
}
switch ($PSBoundParameters.Keys) {
'ResourceGroupNameOverride' {
@@ -101,17 +110,17 @@ switch ($PSCmdlet.ParameterSetName) {
Write-Warning -Message "ResourceGroupNameOverride found $AvailabilityZone"
$NewITDWindowsVMAzureParams += @{ AvailabilityZone = $AvailabilityZone }
}
'VMSizeOverride' {
<# 'VMSizeOverride' {
Write-Warning -Message "VMSizeOverride found $VMSizeOverride"
$NewITDWindowsVMAzureParams += @{ VMSizeOverride = $VMSizeOverride }
}#>
}
}
If ($NewITDWindowsVmAzureParams.VMSizeOverride) {
<#If ($NewITDWindowsVmAzureParams.VMSizeOverride) {
# do nothing
} Else {
$NewITDWindowsVMAzureParams += @{ CPU = ( ($Ritm.VariableSet | Where-Object { $_.host_name -eq $FqdnFromSCTaskDescription }).processors );}
$NewITDWindowsVMAzureParams += @{ MemoryGB = ( ($Ritm.VariableSet | Where-Object { $_.host_name -eq $FqdnFromSCTaskDescription }).memory_gb );}
}
}#>
}
}
@@ -125,7 +134,7 @@ Connect-AzAccount -ServicePrincipal -Credential $PSCredential -Tenant $tenantId
Write-Verbose -Message "Attempt server provisioning" -Verbose
Write-Verbose -Message "NewITDWindowsVMAzureParams:" -Verbose
Write-Verbose -Message ("FQDN " + $NewITDWindowsVMAzureParams.FQDN) -Verbose
Write-Verbose -Message ("VMSizeOverride " + $NewITDWindowsVMAzureParams.VMSizeOverride) -Verbose
Write-Verbose -Message ("VmSize " + $NewITDWindowsVMAzureParams.VmSize) -Verbose
Write-Verbose -Message ("DiskOsGB " + $NewITDWindowsVMAzureParams.DiskOsGB) -Verbose
Write-Verbose -Message ("DiskDataGB " + $NewITDWindowsVMAzureParams.DiskDataGB) -Verbose
Write-Verbose -Message ("Subnet " + $NewITDWindowsVMAzureParams.Subnet) -Verbose