Skip to content

Commit a726bd2

Browse files
committed
refactor: move vc power on to ova deployment function
Signed-off-by: Ken Gould <ken.gould@broadcom.com>
1 parent 2f6680a commit a726bd2

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

VMware.CloudFoundation.InstanceRecovery.psm1

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2481,7 +2481,7 @@ Function New-vCenterOvaDeployment {
24812481
$restoredvCenterGateway = $extractedSddcData.mgmtDomainInfrastructure.gateway
24822482
$restoredvCenterRootPassword = ($extractedSddcData.passwords | Where-Object { ($_.entityType -eq "VCENTER") -and ($_.domainName -eq $workloadDomain) -and ($_.credentialType -eq "SSH") }).password
24832483
LogMessage -type INFO -message "[$jumpboxName] Deploying vCenter OVA"
2484-
$command = '"C:\Program Files\VMware\VMware OVF Tool\ovftool.exe" --noSSLVerify --acceptAllEulas --allowExtraConfig --X:enableHiddenProperties --diskMode=thin --X:injectOvfEnv --X:waitForIp --X:logFile=ovftool.log --name="' + $restoredvCenterVMName + '" --net:"Network 1"="' + $vmNetwork + '" --datastore="' + $vmDatastore + '" --deploymentOption="' + $restoredvCenterDeploymentSize + '" --prop:guestinfo.cis.appliance.net.addr.family="ipv4" --prop:guestinfo.cis.appliance.net.addr="' + $restoredvCenterIpAddress + '" --prop:guestinfo.cis.appliance.net.pnid="' + $restoredvCenterFqdn + '" --prop:guestinfo.cis.appliance.net.prefix="' + $restoredvCenterNetworkPrefix + '" --prop:guestinfo.cis.appliance.net.mode="static" --prop:guestinfo.cis.appliance.net.dns.servers="' + $restoredvCenterDnsServers + '" --prop:guestinfo.cis.appliance.net.gateway="' + $restoredvCenterGateway + '" --prop:guestinfo.cis.appliance.root.passwd="' + $restoredvCenterRootPassword + '" --prop:guestinfo.cis.appliance.ssh.enabled="True" "' + $vCenterOvaFile + '" ' + '"vi://' + $vCenterAdmin + ':' + $vCenterAdminPassword + '@' + $vCenterFqdn + '/' + $datacenterName + '/host/' + $clusterName + '/"'
2484+
$command = '"C:\Program Files\VMware\VMware OVF Tool\ovftool.exe" --noSSLVerify --acceptAllEulas --allowExtraConfig --X:enableHiddenProperties --diskMode=thin --X:injectOvfEnv --powerOn --X:waitForIp --X:logFile=ovftool.log --name="' + $restoredvCenterVMName + '" --net:"Network 1"="' + $vmNetwork + '" --datastore="' + $vmDatastore + '" --deploymentOption="' + $restoredvCenterDeploymentSize + '" --prop:guestinfo.cis.appliance.net.addr.family="ipv4" --prop:guestinfo.cis.appliance.net.addr="' + $restoredvCenterIpAddress + '" --prop:guestinfo.cis.appliance.net.pnid="' + $restoredvCenterFqdn + '" --prop:guestinfo.cis.appliance.net.prefix="' + $restoredvCenterNetworkPrefix + '" --prop:guestinfo.cis.appliance.net.mode="static" --prop:guestinfo.cis.appliance.net.dns.servers="' + $restoredvCenterDnsServers + '" --prop:guestinfo.cis.appliance.net.gateway="' + $restoredvCenterGateway + '" --prop:guestinfo.cis.appliance.root.passwd="' + $restoredvCenterRootPassword + '" --prop:guestinfo.cis.appliance.ssh.enabled="True" "' + $vCenterOvaFile + '" ' + '"vi://' + $vCenterAdmin + ':' + $vCenterAdminPassword + '@' + $vCenterFqdn + '/' + $datacenterName + '/host/' + $clusterName + '/"'
24852485
$scriptBlock = { Invoke-Expression "& $using:command" }
24862486
$deploymentJob = Start-Job -scriptblock $scriptBlock -ArgumentList $command
24872487
Do { Sleep 1; $jobStatus = (Get-Job -id $deploymentJob.id).state } Until ($jobStatus -eq "Running" )
@@ -3015,9 +3015,9 @@ Function Invoke-vCenterRestore {
30153015
#>
30163016

30173017
Param(
3018-
[Parameter (Mandatory = $true)][String] $vCenterFqdn,
3019-
[Parameter (Mandatory = $true)][String] $vCenterAdmin,
3020-
[Parameter (Mandatory = $true)][String] $vCenterAdminPassword,
3018+
#[Parameter (Mandatory = $true)][String] $vCenterFqdn,
3019+
#[Parameter (Mandatory = $true)][String] $vCenterAdmin,
3020+
#[Parameter (Mandatory = $true)][String] $vCenterAdminPassword,
30213021
[Parameter (Mandatory = $true)][String] $extractedSDDCDataFile,
30223022
[Parameter (Mandatory = $true)][String] $workloadDomain,
30233023
[Parameter (Mandatory = $true)][String] $vCenterBackupPath,
@@ -3032,17 +3032,19 @@ Function Invoke-vCenterRestore {
30323032
$extractedDataFilePath = (Resolve-Path -Path $extractedSDDCDataFile).path
30333033
$extractedSddcData = Get-Content $extractedDataFilePath | ConvertFrom-JSON
30343034
$restoredVcenterFqdn = ($extractedSddcData.workloadDomains | Where-Object { $_.domainName -eq $workloadDomain }).vCenterDetails.fqdn
3035-
$restoredVcenterVmName = ($extractedSddcData.workloadDomains | Where-Object { $_.domainName -eq $workloadDomain }).vCenterDetails.vmname
3035+
#$restoredVcenterVmName = ($extractedSddcData.workloadDomains | Where-Object { $_.domainName -eq $workloadDomain }).vCenterDetails.vmname
30363036
$restoredvCenterRootPassword = ($extractedSddcData.passwords | Where-Object { ($_.entityType -eq "VCENTER") -and ($_.domainName -eq $workloadDomain) -and ($_.credentialType -eq "SSH") }).password
30373037
$ssoDomain = ($extractedSddcData.workloadDomains | Where-Object { $_.domainName -eq $workloadDomain }).ssoDomain
30383038
$ssoAdminUserName = ($extractedSddcData.passwords | Where-Object { $_.entityType -eq "PSC" -and $_.username -like "*$($ssoDomain)" }).username
30393039
$ssoAdminUserPassword = ($extractedSddcData.passwords | Where-Object { $_.entityType -eq "PSC" -and $_.username -like "*$($ssoDomain)" }).password
30403040

30413041
#Power Up vCenter Appliance
3042+
<#
30423043
$vCenterConnection = Connect-VIServer -server $vCenterFqdn -user $vCenterAdmin -password $vCenterAdminPassword
30433044
LogMessage -type INFO -message "[$restoredVcenterVmName] Powering On VM"
30443045
Get-VM -Name $restoredVcenterVmName | Start-VM -confirm:$false | Out-Null
30453046
Disconnect-VIServer * -Force -Confirm:$false -ErrorAction SilentlyContinue
3047+
#>
30463048

30473049
#Wait for successful ping test
30483050
LogMessage -type WAIT -message "[$restoredVcenterFqdn] Waiting for successful ping test"
@@ -3105,9 +3107,9 @@ Function Invoke-vCenterRestore {
31053107
$sshSession = New-SSHSession -computername $restoredVcenterFqdn -Credential $mycreds -KnownHost $inmem -erroraction silentlycontinue
31063108
If ($sshSession) {
31073109
$stream = New-SSHShellStream -SSHSession $sshSession
3108-
<# $stream.writeline('appliancesh')
3110+
$stream.writeline('appliancesh')
31093111
Start-Sleep 5
3110-
$stream.writeline($restoredvCenterRootPassword) #>
3112+
$stream.writeline($restoredvCenterRootPassword)
31113113
Start-Sleep 5
31123114
$response = $stream.Read()
31133115
Start-Sleep 5

0 commit comments

Comments
 (0)