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

Merge pull request #10106 from jcpowermac/upi-folder-naming

Browse Source 
OCPBUGS-65748: vSphere upi - change to infra id for folders
This commit is contained in:
openshift-merge-bot[bot]
2025-11-19 17:29:15 +00:00
committed by GitHub
parent 4b8f8de38b e3adf1b15b
commit 0791e816f6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -315,7 +315,7 @@ function New-OpenshiftVMs {
$tag = Get-Tag -Server $node.server -Category $tagCategory -Name "$($metadata.infraID)" -ErrorAction continue 2>$null $tag = Get-Tag -Server $node.server -Category $tagCategory -Name "$($metadata.infraID)" -ErrorAction continue 2>$null
# Get correct template / folder # Get correct template / folder
$folder = Get-Folder -Server $node.server -Name $clustername -Location $node.datacenter $folder = Get-Folder -Server $node.server -Name $metadata.infraID -Location $node.datacenter
$template = Get-VM -Server $node.server -Name $vm_template -Location $($node.datacenter) $template = Get-VM -Server $node.server -Name $vm_template -Location $($node.datacenter)
# Clone the virtual machine from the imported template # Clone the virtual machine from the imported template
@@ -369,4 +369,4 @@ function Set-SecureBoot {
$spec.BootOptions = $boot $spec.BootOptions = $boot
$VM.ExtensionData.ReconfigVM($spec) $VM.ExtensionData.ReconfigVM($spec)
} }

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

@@ -177,13 +177,13 @@ foreach ($fd in $fds)
# If the folder already exists # If the folder already exists
Write-Output "Checking for folder in failure domain $($fd.datacenter)/$($fd.cluster)" Write-Output "Checking for folder in failure domain $($fd.datacenter)/$($fd.cluster)"
$folder = Get-Folder -Server $viserver -Name $clustername -Location $fd.datacenter -ErrorAction continue 2>$null $folder = Get-Folder -Server $viserver -Name $metadata.infraID -Location $fd.datacenter -ErrorAction continue 2>$null
# Otherwise create the folder within the datacenter as defined in the upi-variables # Otherwise create the folder within the datacenter as defined in the upi-variables
if (-Not $?) { if (-Not $?) {
Write-Output "Creating folder $($clustername) in datacenter $($fd.datacenter) of vCenter $($fd.server)" Write-Output "Creating folder $($clustername) in datacenter $($fd.datacenter) of vCenter $($fd.server)"
(get-view (Get-Datacenter -Server $viserver -Name $fd.datacenter).ExtensionData.vmfolder).CreateFolder($clustername) (get-view (Get-Datacenter -Server $viserver -Name $fd.datacenter).ExtensionData.vmfolder).CreateFolder($metadata.infraID)
$folder = Get-Folder -Server $viserver -Name $clustername -Location $fd.datacenter $folder = Get-Folder -Server $viserver -Name $metadata.infraID -Location $fd.datacenter
New-TagAssignment -Server $viserver -Entity $folder -Tag $tag > $null New-TagAssignment -Server $viserver -Entity $folder -Tag $tag > $null
} }
@@ -257,7 +257,7 @@ $tagCategory = Get-TagCategory -Server $fds[0].server -Name "openshift-$($metada
$tag = Get-Tag -Server $fds[0].server -Category $tagCategory -Name "$($metadata.infraID)" -ErrorAction continue 2>$null $tag = Get-Tag -Server $fds[0].server -Category $tagCategory -Name "$($metadata.infraID)" -ErrorAction continue 2>$null
$rp = Get-ResourcePool -Name $($metadata.infraID) -Location $(Get-Cluster -Server $fds[0].server -Name $($fds[0].cluster)) $rp = Get-ResourcePool -Name $($metadata.infraID) -Location $(Get-Cluster -Server $fds[0].server -Name $($fds[0].cluster))
$datastoreInfo = Get-Datastore -Name $fds[0].datastore -Server $fds[0].server -Location $fds[0].datacenter $datastoreInfo = Get-Datastore -Name $fds[0].datastore -Server $fds[0].server -Location $fds[0].datacenter
$folder = Get-Folder -Server $fds[0].server -Name $clustername -Location $fds[0].datacenter $folder = Get-Folder -Server $fds[0].server -Name $metadata.infraID -Location $fds[0].datacenter
$template = Get-VM -Server $fds[0].server -Name $vm_template -Location $fds[0].datacenter $template = Get-VM -Server $fds[0].server -Name $vm_template -Location $fds[0].datacenter
# Create LB for Cluster # Create LB for Cluster