Azure
diff --git a/‎pkg/engine/armresources_test.go‎
Lines changed: 116 additions & 36 deletions b/‎pkg/engine/armresources_test.go‎
Lines changed: 116 additions & 36 deletions
diff --git a/‎pkg/engine/masterarmresources.go‎
Lines changed: 4 additions & 2 deletions b/‎pkg/engine/masterarmresources.go‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎pkg/engine/masterarmresources_test.go‎
Lines changed: 33 additions & 3 deletions b/‎pkg/engine/masterarmresources_test.go‎
Lines changed: 33 additions & 3 deletions
diff --git a/‎pkg/engine/virtualmachines.go‎
Lines changed: 3 additions & 0 deletions b/‎pkg/engine/virtualmachines.go‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎pkg/engine/virtualmachines_test.go‎
Lines changed: 30 additions & 23 deletions b/‎pkg/engine/virtualmachines_test.go‎
Lines changed: 30 additions & 23 deletions
diff --git a/‎pkg/engine/virtualmachinescalesets_test.go‎
Lines changed: 8 additions & 2 deletions b/‎pkg/engine/virtualmachinescalesets_test.go‎
Lines changed: 8 additions & 2 deletions
@@ -105,8 +105,10 @@ func createKubernetesMasterResourcesVMAS(cs *api.ContainerService) []interface{}
 		}
 	}
 
-	etcdDiskResource := createEtcdDisk(cs)
-	masterResources = append(masterResources, etcdDiskResource)
+	if p.MasterProfile.IsManagedDisks() {
+		etcdDiskResource := createEtcdDisk(cs)
+		masterResources = append(masterResources, etcdDiskResource)
+	}
 
 	masterVM := CreateMasterVM(cs)
 	masterResources = append(masterResources, masterVM)
 
@@ -170,6 +170,9 @@ func CreateMasterVM(cs *api.ContainerService) VirtualMachineARM {
 			Name:         to.StringPtr("[concat(variables('masterVMNamePrefix'), copyIndex(variables('masterOffset')),'-etcddisk')]"),
 		}
 		if cs.Properties.MasterProfile.IsStorageAccount() {
+			etcdSizeGB, _ := strconv.Atoi(kubernetesConfig.EtcdDiskSizeGB)
+			dataDisk.CreateOption = compute.DiskCreateOptionTypesEmpty
+			dataDisk.DiskSizeGB = to.Int32Ptr(int32(etcdSizeGB))
 			dataDisk.Vhd = &compute.VirtualHardDisk{
 				URI: to.StringPtr("[concat(reference(concat('Microsoft.Storage/storageAccounts/',variables('masterStorageAccountName')),variables('apiVersionStorage')).primaryEndpoints.blob,'vhds/', variables('masterVMNamePrefix'),copyIndex(variables('masterOffset')),'-etcddisk.vhd')]"),
 			}
Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,10 @@ func createKubernetesMasterResourcesVMAS(cs *api.ContainerService) []interface{}`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
`108`		`- etcdDiskResource := createEtcdDisk(cs)`
`109`		`- masterResources = append(masterResources, etcdDiskResource)`
	`108`	`+ if p.MasterProfile.IsManagedDisks() {`
	`109`	`+ etcdDiskResource := createEtcdDisk(cs)`
	`110`	`+ masterResources = append(masterResources, etcdDiskResource)`
	`111`	`+ }`
`110`	`112`
`111`	`113`	`masterVM := CreateMasterVM(cs)`
`112`	`114`	`masterResources = append(masterResources, masterVM)`
Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,9 @@ func CreateMasterVM(cs *api.ContainerService) VirtualMachineARM {`
`170`	`170`	`Name: to.StringPtr("[concat(variables('masterVMNamePrefix'), copyIndex(variables('masterOffset')),'-etcddisk')]"),`
`171`	`171`	`}`
`172`	`172`	`if cs.Properties.MasterProfile.IsStorageAccount() {`
	`173`	`+ etcdSizeGB, _ := strconv.Atoi(kubernetesConfig.EtcdDiskSizeGB)`
	`174`	`+ dataDisk.CreateOption = compute.DiskCreateOptionTypesEmpty`
	`175`	`+ dataDisk.DiskSizeGB = to.Int32Ptr(int32(etcdSizeGB))`
`173`	`176`	`dataDisk.Vhd = &compute.VirtualHardDisk{`
`174`	`177`	`URI: to.StringPtr("[concat(reference(concat('Microsoft.Storage/storageAccounts/',variables('masterStorageAccountName')),variables('apiVersionStorage')).primaryEndpoints.blob,'vhds/', variables('masterVMNamePrefix'),copyIndex(variables('masterOffset')),'-etcddisk.vhd')]"),`
`175`	`178`	`}`