Skip to content

[release-4.20] OCPBUGS-65796: vSphere upi - change to infra id for folders #10111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
openshift-cherrypick-robot wants to merge 1 commit into
base: release-4.20
Choose a base branch
from
Open

[release-4.20] OCPBUGS-65796: vSphere upi - change to infra id for folders #10111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions upi/vsphere/powercli/upi-functions.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ function New-OpenshiftVMs {
$tag = Get-Tag -Server $node.server -Category $tagCategory -Name "$($metadata.infraID)" -ErrorAction continue 2>$null

# 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)

# Clone the virtual machine from the imported template
Expand Down Expand Up @@ -369,4 +369,4 @@ function Set-SecureBoot {
$spec.BootOptions = $boot

$VM.ExtensionData.ReconfigVM($spec)
}
}
8 changes: 4 additions & 4 deletions upi/vsphere/powercli/upi.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,13 @@ foreach ($fd in $fds)

# If the folder already exists
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
if (-Not $?) {
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)
$folder = Get-Folder -Server $viserver -Name $clustername -Location $fd.datacenter
(get-view (Get-Datacenter -Server $viserver -Name $fd.datacenter).ExtensionData.vmfolder).CreateFolder($metadata.infraID)
$folder = Get-Folder -Server $viserver -Name $metadata.infraID -Location $fd.datacenter
New-TagAssignment -Server $viserver -Entity $folder -Tag $tag > $null
}

Expand Down Expand Up @@ -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
$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
$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

# Create LB for Cluster
Expand Down