From 46162bbd66fb6ec2867b45b580dfc5af4b20720f Mon Sep 17 00:00:00 2001 From: Jun Sun <33297523+JunSun17@users.noreply.github.com> Date: Tue, 7 Aug 2018 10:10:52 -0700 Subject: [PATCH] Output VMSS cloud config settings. (#3610) /lgtm --- parts/iaasoutputs.t | 5 +++++ parts/k8s/kubernetesmastervars.t | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/parts/iaasoutputs.t b/parts/iaasoutputs.t index 32c65f8275..ddc309ea59 100644 --- a/parts/iaasoutputs.t +++ b/parts/iaasoutputs.t @@ -25,4 +25,9 @@ "primaryAvailabilitySetName": { "type": "string", "value": "[variables('primaryAvailabilitySetName')]" + }, + "primaryScaleSetName": { + "type": "string", + "value": "[variables('primaryScaleSetName')]" } + 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 }}