DCOS: use CDN to host Windows bootstrap binaries

parts/dcos/dcosWindowsProvision.ps1

@@ -124,7 +124,7 @@ Get-BootstrapScript($download_uri, $download_dir)
     # Get Mesos Binaries
     $scriptfile = "DCOSWindowsAgentSetup.ps1"
 
-    Write-Log " get script "+ ($download_uri+"/"+$scriptfile) + "and put it "+ ($download_dir+"\"+$scriptfile)
+    Write-Log "get script $download_uri/$scriptfile and put it $download_dir\$scriptfile"
 
     Invoke-WebRequest -Uri ($download_uri+"/"+$scriptfile) -OutFile ($download_dir+"\"+$scriptfile)
 }
@@ -193,6 +193,7 @@ try
         $run_cmd += ">"+$global:BootstrapInstallDir+"\DCOSWindowsAgentSetup.log 2>&1"
         Write-Log "run setup script $run_cmd"
         Invoke-Expression $run_cmd
+        Write-Log "setup script completed"
     }
     else # We must be deploying a master
     {
@@ -202,9 +203,12 @@ try
     }
 
     PREPROVISION_EXTENSION
+
+    Write-Log "Provisioning script succeeded"
 }
 catch
 {
+    Write-Log "Provisioning script failed"
     Write-Error $_
     exit 1
 }

pkg/acsengine/defaults.go

@@ -621,9 +621,6 @@ func setOrchestratorDefaults(cs *api.ContainerService) {
 		if o.DcosConfig == nil {
 			o.DcosConfig = &api.DcosConfig{}
 		}
-		if o.DcosConfig.DcosWindowsBootstrapURL == "" {
-			o.DcosConfig.DcosWindowsBootstrapURL = DefaultDCOSSpecConfig.DCOSWindowsBootstrapDownloadURL
-		}
 		dcosSemVer, _ := semver.Make(o.OrchestratorVersion)
 		dcosBootstrapSemVer, _ := semver.Make(common.DCOSVersion1Dot11Dot0)
 		if !dcosSemVer.LT(dcosBootstrapSemVer) {

pkg/acsengine/engine.go

@@ -368,6 +368,18 @@ func getDCOSDefaultBootstrapInstallerURL(profile *api.OrchestratorProfile) strin
 	return ""
 }
 
+func getDCOSDefaultWindowsBootstrapInstallerURL(profile *api.OrchestratorProfile) string {
+	if profile.OrchestratorType == api.DCOS {
+		switch profile.OrchestratorVersion {
+		case common.DCOSVersion1Dot11Dot2:
+			return "https://dcos-mirror.azureedge.net/dcos-windows/1-11-2"
+		case common.DCOSVersion1Dot11Dot0:
+			return "https://dcos-mirror.azureedge.net/dcos-windows/1-11-0"
+		}
+	}
+	return ""
+}
+
 func getDCOSDefaultProviderPackageGUID(orchestratorType string, orchestratorVersion string, masterCount int) string {
 	if orchestratorType == api.DCOS {
 		switch orchestratorVersion {

pkg/acsengine/params.go

@@ -122,6 +122,7 @@ func getParameters(cs *api.ContainerService, isClassicMode bool, generatorCode s
 				dcosBootstrapURL = cloudSpecConfig.DCOSSpecConfig.DCOS110BootstrapDownloadURL
 			default:
 				dcosBootstrapURL = getDCOSDefaultBootstrapInstallerURL(properties.OrchestratorProfile)
+				dcosWindowsBootstrapURL = getDCOSDefaultWindowsBootstrapInstallerURL(properties.OrchestratorProfile)
 			}
 		}