openshift/installer
1
0
Fork 0
mirror of https://github.com/openshift/installer.git synced 2026-02-05 15:47:14 +01:00
Code Issues Releases Activity

Added ability to configure CoresPerSocket

Browse Source
This commit is contained in:
vr4manta
2025-08-25 13:42:54 -04:00
parent d0aabcc2a9
commit 7e8ad3be8e
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
upi/vsphere/powercli/upi-functions.ps1
View File

@@ -2,18 +2,19 @@
function New-OpenShiftVM {
param(
[int]$CoresPerSocket = 1, # Default is 1 due to not knowing how many may come in via NumCpu variable
[Parameter(Mandatory=$true)]
$Datastore,
[Parameter(Mandatory=$true)]
[string]$IgnitionData,
[switch]$LinkedClone,
$Location,
$MemoryMB,
[int]$MemoryMB = 8192,
[Parameter(Mandatory=$true)]
[string]$Name,
$Network,
$Networking,
$NumCpu,
[int]$NumCpu = 4,
$ReferenceSnapshot,
$ResourcePool,
$SecureBoot,
@@ -38,6 +39,7 @@ function New-OpenShiftVM {
$args.Remove('Network') > $null
$args.Remove('MemoryMB') > $null
$args.Remove('NumCpu') > $null
$args.Remove('CoresPerSocket') > $null
$args.Remove('SecureBoot') > $null
foreach ($key in $args.Keys){
if ($NULL -eq $($args.Item($key)) -or $($args.Item($key)) -eq "") {
@@ -62,7 +64,7 @@ function New-OpenShiftVM {
# Update VM specs. New-VM does not honor the passed in parameters due to Template being used.
if ($null -ne $MemoryMB -And $null -ne $NumCpu)
{
Set-VM -Server $Server -VM $vm -MemoryMB $MemoryMB -NumCpu $NumCpu -CoresPerSocket 4 -Confirm:$false > $null
Set-VM -Server $Server -VM $vm -MemoryMB $MemoryMB -NumCpu $NumCpu -CoresPerSocket $CoresPerSocket -Confirm:$false > $null
}
#Get-HardDisk -VM $vm | Select-Object -First 1 | Set-HardDisk -CapacityGB 120 -Confirm:$false > $null
updateDisk -VM $vm -CapacityGB 120
@@ -284,14 +286,23 @@ function New-OpenshiftVMs {
if ($node.type -eq "master") {
$numCPU = $control_plane_num_cpus
$memory = $control_plane_memory
$coresPerSocket = $control_plane_cores_per_socket
} elseif ($node.type -eq "worker") {
$numCPU = $compute_num_cpus
$memory = $compute_memory
$coresPerSocket = $compute_cores_per_socket
} else {
# should only be bootstrap
$numCPU = $control_plane_num_cpus
$memory = $control_plane_memory
$coresPerSocket = $control_plane_cores_per_socket
}
# Since coresPerSocket is not required for configs, we need to make sure its not zero (default). We'll make it match NumCPU.
if ($NULL -eq $coresPerSocket -or $coresPerSocket -lt 1) {
$coresPerSocket = $numCPU
}
$ip = $node.ip
$network = New-VMNetworkConfig -Server $node.server -Hostname $name -IPAddress $ip -Netmask $netmask -Gateway $gateway -DNS $dns
@@ -309,7 +320,7 @@ function New-OpenshiftVMs {
# Clone the virtual machine from the imported template
#$vm = New-OpenShiftVM -Template $template -Name $name -ResourcePool $rp -Datastore $datastoreInfo -Location $folder -LinkedClone -ReferenceSnapshot $snapshot -IgnitionData $ignition -Tag $tag -Networking $network -NumCPU $numCPU -MemoryMB $memory
$vm = New-OpenShiftVM -Server $node.server -Template $template -Name $name -ResourcePool $rp -Datastore $datastoreInfo -Location $folder -IgnitionData $ignition -Tag $tag -Networking $network -Network $node.network -SecureBoot $secureboot -StoragePolicy $storagepolicy -NumCPU $numCPU -MemoryMB $memory
$vm = New-OpenShiftVM -Server $node.server -Template $template -Name $name -ResourcePool $rp -Datastore $datastoreInfo -Location $folder -IgnitionData $ignition -Tag $tag -Networking $network -Network $node.network -SecureBoot $secureboot -StoragePolicy $storagepolicy -NumCPU $numCPU -MemoryMB $memory -CoresPerSocket $coresPerSocket
# Assign tag so we can later clean up
# New-TagAssignment -Entity $vm -Tag $tag

2
upi/vsphere/powercli/upi.ps1
View File

@@ -263,7 +263,7 @@ $template = Get-VM -Server $fds[0].server -Name $vm_template -Location $fds[0].d
# Create LB for Cluster
$ignition = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes((New-LoadBalancerIgnition $sshKey)))
$network = New-VMNetworkConfig -Server $fds[0].server -Hostname "$($metadata.infraID)-lb" -IPAddress $lb_ip_address -Netmask $netmask -Gateway $gateway -DNS $dns -Network $failure_domains[0].network
$vm = New-OpenShiftVM -IgnitionData $ignition -Name "$($metadata.infraID)-lb" -Template $template -Server $fds[0].server -ResourcePool $rp -Datastore $datastoreInfo -Location $folder -Tag $tag -Networking $network -Network $($fds[0].network) -SecureBoot $secureboot -StoragePolicy $storagepolicy -MemoryMB 8192 -NumCpu 4
$vm = New-OpenShiftVM -IgnitionData $ignition -Name "$($metadata.infraID)-lb" -Template $template -Server $fds[0].server -ResourcePool $rp -Datastore $datastoreInfo -Location $folder -Tag $tag -Networking $network -Network $($fds[0].network) -SecureBoot $secureboot -StoragePolicy $storagepolicy -MemoryMB 8192 -NumCpu 4 -CoresPerSocket 4
$vm | Start-VM
# Take the $virtualmachines defined in upi-variables and convert to a powershell object