From f3afa4d5b30f8411afe9547f6ad0def33c41aa10 Mon Sep 17 00:00:00 2001
From: DemitasseNZ <alastair@demitasse.co.nz>
Date: Thu, 14 Apr 2016 19:33:38 +1200
Subject: [PATCH] Clobber Database

Allow VC rebuild without DC rebuild with VC 6, clobberdb in json file
Also more VCloud & VShield removal
---
 Build/Automate/DC/Phase2.ps1     |  2 +-
 Build/Automate/VC/Build.ps1      | 19 -------------------
 Build/Automate/VC/vCentre60.json |  4 ++--
 Build/Automate/automate.ini      |  2 --
 4 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/Build/Automate/DC/Phase2.ps1 b/Build/Automate/DC/Phase2.ps1
index 7707c01..c5ab216 100644
--- a/Build/Automate/DC/Phase2.ps1
+++ b/Build/Automate/DC/Phase2.ps1
@@ -103,7 +103,7 @@ if (Test-Path "B:\ESXi60\*") {
 	if ((Test-Path "B:\ESXi60\*.iso") -and !(Test-Path "B:\ESXi60\BOOT.CFG") ){
 		Write-BuildLog "Extracting ESXi 6.0 installer from ISO."
 		. "C:\Program Files\7-Zip\7z.exe" x -r -y -aoa -oB:\ESXi60\ B:\ESXi60\*.iso >> C:\ExtractLog.txt
-	} Else 
+	}  
 	Write-BuildLog "ESXi 6.0 found; creating C:\TFTP-Root\ESXi60 and copying ESXi 6.0 boot files."
 	$null = $null = New-Item -Path C:\TFTP-Root\ESXi60 -ItemType Directory -Force -Confirm:$false
 	xcopy B:\ESXi60\*.* C:\TFTP-Root\ESXi60 /s /c /y /q
diff --git a/Build/Automate/VC/Build.ps1 b/Build/Automate/VC/Build.ps1
index 8958110..f9b91b9 100644
--- a/Build/Automate/VC/Build.ps1
+++ b/Build/Automate/VC/Build.ps1
@@ -92,14 +92,6 @@ if (Test-Path "B:\Automate\automate.ini") {
 	} else {
 		$AutoAddHosts = $false
 	}
-	$AutoVCNS = "false"
-	$AutoVCNS = ((Select-String -SimpleMatch "AutoVCNS=" -Path "B:\Automate\automate.ini").line).substring(9)
-	if ($AutoVCNS -like "true") {
-		$AutoVCNS = $true
-		Write-BuildLog "  vShield Manager will be automatically deployed"
-	} else {
-		$AutoVCNS = $false
-	}
 	$AdminPWD = "VMware1!"
 	$AdminPWD = ((Select-String -SimpleMatch "Adminpwd=" -Path "B:\Automate\automate.ini").line).substring(9)
 	$emailto = ((Select-String -SimpleMatch "emailto=" -Path "B:\Automate\automate.ini").line).substring(8)
@@ -634,17 +626,6 @@ If (($AutoAddHosts -eq "True") -and (Test-Path "c:\Addhosts.ps1")){
 	Write-BuildLog " "
 	Start-Process c:\windows\syswow64\WindowsPowerShell\v1.0\powershell.exe -ArgumentList " C:\AddHosts.ps1" -wait
 }
-If ($AutovCNS -eq "True"){
-	Write-BuildLog "vShield"
-	If (($VCInstall -eq "51") -and (Test-Path "C:\vShield51.ps1")) {
-	Write-BuildLog "Automatically deploying vShield 5.1."
-		Start-Process c:\windows\syswow64\WindowsPowerShell\v1.0\powershell.exe -ArgumentList " C:\vShield51.ps1" -wait
-	}
-	If (($VCInstall -eq "5") -and (Test-Path "C:\vShield15.ps1")) {
-	Write-BuildLog "Automatically deploying vShield 5.0."
-	. "C:\vShield15.ps1"
-	}
-}
 Write-BuildLog "Installing VMware tools, build complete after reboot."
 if (Test-Path B:\VMTools\setup64.exe) {
 	#Read-Host "End of install checkpoint, before VMTools"
diff --git a/Build/Automate/VC/vCentre60.json b/Build/Automate/VC/vCentre60.json
index 0ad8ce6..7031a26 100644
--- a/Build/Automate/VC/vCentre60.json
+++ b/Build/Automate/VC/vCentre60.json
@@ -48,8 +48,8 @@
       "workflow.int.jmx-port" : 19999,
       "workflow.int.service-port" : 8088
    },
-   "clientlocale" : "en",
-   "db.clobber" : null,
+   "clientlocale" : "yes",
+   "db.clobber" : "yes",
    "db.dsn" : "vCenterDB",
    "db.password" : "VMware1!",
    "db.type" : "external",
diff --git a/Build/Automate/automate.ini b/Build/Automate/automate.ini
index 9af6fba..ccb303a 100644
--- a/Build/Automate/automate.ini
+++ b/Build/Automate/automate.ini
@@ -4,13 +4,11 @@ TZ=New Zealand Standard Time
 VCInstall=60
 VCInstallOptions=4,5,51,55,60,None,Base
 AutoAddHosts=false
-AutoVCNS=No
 DeployVUM=true
 Adminpwd=VMware1!
 
 BuildDatastores=True
 BuildVM=true
-BuildOptions=True,False
 ProductKey=XXXXX-XXXXX-XXXXX-XXXXX-XXXXX
 
 ViewInstall=None