Revert "Update Install-ZertoVra.ps1"

This reverts commit 8285705cf3, reversing changes made to 087c2d7411.
2019-02-21 12:52:52 -05:00
parent 8285705cf3
commit 39bc93446d
1 changed files with 1 additions and 6 deletions
@@ -27,13 +27,8 @@ function Install-ZertoVra {
    )
    #TODO - Test to see if VRA already exists!
    $vraName = "Z-VRA-{0}" -f $hostName
-<<<<<<< HEAD
-    if ( -not (Get-ZertoVra -vraName $vraName) ) {
+    if ( Get-ZertoVra -vraName $vraName ) {
        $siteIdentifier = $script:zertoLocalInfo.SiteIdentifier
-=======
-    if ( -not (Get-ZertoVra -vraName $vraName) ) {
-        $siteIdentifier = $script:zertoLocalInfo.SiteIdentifier
->>>>>>> master
        $hostIdentifier = Get-ZertoVirtualizationSite -siteIdentifier $siteIdentifier -hosts | Where-Object {$_.VirtualizationHostName -eq $hostName} | Select-Object hostIdentifier -ExpandProperty hostIdentifier
        $networkIdentifier = Get-ZertoVirtualizationSite -siteIdentifier $siteIdentifier -networks | Where-Object {$_.VirtualizationNetworkName -eq $networkName} | Select-Object NetworkIdentifier -ExpandProperty NetworkIdentifier
        $datastoreIdentifier = Get-ZertoVirtualizationSite -siteIdentifier $siteIdentifier -datastores | Where-Object {$_.DatastoreName -eq $datastoreName} | Select-Object DatastoreIdentifier -ExpandProperty DatastoreIdentifier