From da758a99af45d726eacfe544994433092739ad7c Mon Sep 17 00:00:00 2001
From: Jun Sun <jusu@microsoft.com>
Date: Fri, 3 Aug 2018 11:13:26 -0700
Subject: [PATCH 1/2] Output VMSS cloud config settings.

---
 parts/iaasoutputs.t              | 9 +++++++++
 parts/k8s/kubernetesmastervars.t | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/parts/iaasoutputs.t b/parts/iaasoutputs.t
index 32c65f8275..972fd5a12a 100644
--- a/parts/iaasoutputs.t
+++ b/parts/iaasoutputs.t
@@ -25,4 +25,13 @@
     "primaryAvailabilitySetName": {
         "type": "string",
         "value": "[variables('primaryAvailabilitySetName')]"
+    },
+    "primaryScaleSetName": {
+        "type": "string",
+        "value": "[variables('primaryScaleSetName')]"
+    },
+    "vmType": {
+        "type": "string",
+        "value": "[variables('vmType')]"
     }
+
diff --git a/parts/k8s/kubernetesmastervars.t b/parts/k8s/kubernetesmastervars.t
index ab9d42038f..468d55bf35 100644
--- a/parts/k8s/kubernetesmastervars.t
+++ b/parts/k8s/kubernetesmastervars.t
@@ -359,11 +359,11 @@
     "nsgID": "[resourceId('Microsoft.Network/networkSecurityGroups',variables('nsgName'))]",
 {{if not AnyAgentUsesVirtualMachineScaleSets}}
     "primaryAvailabilitySetName": "[concat('{{ (index .AgentPoolProfiles 0).Name }}-availabilitySet-',variables('nameSuffix'))]",
-    "primaryScaleSetName": "''",
+    "primaryScaleSetName": "",
     "vmType": "standard",
 {{else}}
     "primaryScaleSetName": "[concat(variables('orchestratorName'), '-{{ (index .AgentPoolProfiles 0).Name }}-',variables('nameSuffix'), '-vmss')]",
-    "primaryAvailabilitySetName": "''",
+    "primaryAvailabilitySetName": "",
     "vmType": "vmss",
 {{end}}
 {{if not IsHostedMaster }}

From f5b3c85cc2d3eaf0514d0900a51fa8033e6981d8 Mon Sep 17 00:00:00 2001
From: Jun Sun <jusu@microsoft.com>
Date: Mon, 6 Aug 2018 12:13:35 -0700
Subject: [PATCH 2/2] Remove vmType from output.

---
 parts/iaasoutputs.t | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/parts/iaasoutputs.t b/parts/iaasoutputs.t
index 972fd5a12a..ddc309ea59 100644
--- a/parts/iaasoutputs.t
+++ b/parts/iaasoutputs.t
@@ -29,9 +29,5 @@
     "primaryScaleSetName": {
         "type": "string",
         "value": "[variables('primaryScaleSetName')]"
-    },
-    "vmType": {
-        "type": "string",
-        "value": "[variables('vmType')]"
     }