DC/OS deployment (with Windows agent) failure, a regression caused a new preprovision requirement introduced by " commit e7b78cedb9b4346c0d1ec50dba102d59abc5e21"

[soccerGB]

Is this a request for help?:

---

Is this an ISSUE or FEATURE REQUEST? (choose one):

--- This is a issue report

What version of acs-engine?:

--- Any acs-engine built with the following commit has this regression issue

#2228

Orchestrator and version (e.g. Kubernetes, DC/OS, Swarm)
DC/OS 1.10 (Windows)

What happened:

If a Windows DC/OS deployment json file did not have preprovision in its Windows agent, -preprovisionExtensionParams will have a empty parameter in it, which would cause error like the following one:

Deployment failed. Correlation ID: 49dd5aa4-f439-4866-b6fb-2f518f06416e. {
"status": "Failed",
"error": {
"code": "ResourceDeploymentFailure",
"message": "The resource operation completed with terminal provisioning state 'Failed'.",
"details": [
{
"code": "VMExtensionProvisioningError",
"message": "VM has reported a failure when processing extension 'vmssCustomScriptExtension'. Error message: "Finished executing command"."
}
]
}
}

I think this "-preprovisionExtensionParams" should only be added when preprovision was present in a node profile.

What you expected to happen:

The same old json file should continue to work without the need of adding preprovision field

How to reproduce it (as minimally and precisely as possible):

This issue could be easily repro with the following json file:

{
"apiVersion": "vlabs",
"properties": {
"orchestratorProfile": {
"orchestratorType": "DCOS",
"orchestratorVersion": "1.10.0"
},
"masterProfile": {
"count": 3,
"dnsPrefix": "dcos-rs30001",
"vmSize": "Standard_D2_v2"
},
"agentPoolProfiles": [
{
"name": "wpubrs30001",
"count": 1,
"vmSize": "Standard_D2s_v3",
"osType": "Windows",
"dnsPrefix": "wpubrs30001",
"ports": [
80,
443,
8080,
3389
]
},
{
"name": "lpubrs30001",
"count": 1,
"vmSize": "Standard_D2_v2",
"osType": "linux",
"dnsPrefix": "lpubrs30001",
"ports": [
80,
443,
22
]
}
],
"windowsProfile": {
"adminUsername": "xxxxx",
"adminPassword": "xxxx"
},
"linuxProfile": {
"adminUsername": "xxxxxx",
"ssh": {
"publicKeys": [
{
"keyData": "ssh-rsa ....."
}
]
}
}
}
}

Anything else we need to know: