Merge pull request #1744 from 25region/gateway-accel-nw

Enable Gateway Accelerated Network

deploy/gateway-production-parameters.json

@@ -35,6 +35,9 @@
         "gatewayStorageAccountDomain": {
             "value": ""
         },
+        "gatewayVmSize": {
+            "value": "Standard_D4s_v3"
+        },
         "gatewayVmssCapacity": {
             "value": 3
         },
@@ -79,9 +82,6 @@
         "sshPublicKey": {
             "value": ""
         },
-        "vmSize": {
-            "value": "Standard_D2s_v3"
-        },
         "vmssCleanupEnabled": {
             "value": true
         },

deploy/gateway-production.json

@@ -37,6 +37,10 @@
         "gatewayStorageAccountDomain": {
             "type": "string"
         },
+        "gatewayVmSize": {
+            "type": "string",
+            "defaultValue": "Standard_D4s_v3"
+        },
         "gatewayVmssCapacity": {
             "type": "int",
             "defaultValue": 3
@@ -83,10 +87,6 @@
         "sshPublicKey": {
             "type": "string"
         },
-        "vmSize": {
-            "type": "string",
-            "defaultValue": "Standard_D2s_v3"
-        },
         "vmssCleanupEnabled": {
             "type": "bool",
             "defaultValue": true
@@ -210,7 +210,7 @@
         },
         {
             "sku": {
-                "name": "[parameters('vmSize')]",
+                "name": "[parameters('gatewayVmSize')]",
                 "tier": "Standard",
                 "capacity": "[parameters('gatewayVmssCapacity')]"
             },
@@ -257,6 +257,7 @@
                                 "name": "gateway-vmss-nic",
                                 "properties": {
                                     "primary": true,
+                                    "enableAcceleratedNetworking": true,
                                     "ipConfigurations": [
                                         {
                                             "name": "gateway-vmss-ipconfig",

pkg/deploy/config.go

@@ -67,6 +67,7 @@ type Configuration struct {
 	GatewayFeatures                    []string      `json:"gatewayFeatures,omitempty"`
 	GatewayMDSDConfigVersion           *string       `json:"gatewayMdsdConfigVersion,omitempty" value:"required"`
 	GatewayStorageAccountDomain        *string       `json:"gatewayStorageAccountDomain,omitempty" value:"required"`
+	GatewayVMSize                      *string       `json:"gatewayVmSize,omitempty"`
 	GatewayVMSSCapacity                *int          `json:"gatewayVmssCapacity,omitempty"`
 	GlobalResourceGroupName            *string       `json:"globalResourceGroupName,omitempty" value:"required"`
 	GlobalResourceGroupLocation        *string       `json:"globalResourceGroupLocation,omitempty" value:"required"`

pkg/deploy/generator/resources_gateway.go

@@ -572,7 +572,7 @@ done
 	return &arm.Resource{
 		Resource: &mgmtcompute.VirtualMachineScaleSet{
 			Sku: &mgmtcompute.Sku{
-				Name:     to.StringPtr("[parameters('vmSize')]"),
+				Name:     to.StringPtr("[parameters('gatewayVmSize')]"),
 				Tier:     to.StringPtr("Standard"),
 				Capacity: to.Int64Ptr(1339),
 			},
@@ -618,9 +618,8 @@ done
 							{
 								Name: to.StringPtr("gateway-vmss-nic"),
 								VirtualMachineScaleSetNetworkConfigurationProperties: &mgmtcompute.VirtualMachineScaleSetNetworkConfigurationProperties{
-									Primary: to.BoolPtr(true),
-									// TODO: enable this (requires >= Standard_D4s_v3)
-									// EnableAcceleratedNetworking: to.BoolPtr(true),
+									Primary:                     to.BoolPtr(true),
+									EnableAcceleratedNetworking: to.BoolPtr(true),
 									IPConfigurations: &[]mgmtcompute.VirtualMachineScaleSetIPConfiguration{
 										{
 											Name: to.StringPtr("gateway-vmss-ipconfig"),

pkg/deploy/generator/templates_gateway.go

@@ -33,6 +33,7 @@ func (g *generator) gatewayTemplate() *arm.Template {
 		"gatewayMdsdConfigVersion",
 		"gatewayServicePrincipalId",
 		"gatewayStorageAccountDomain",
+		"gatewayVmSize",
 		"gatewayVmssCapacity",
 		"keyvaultDNSSuffix",
 		"keyvaultPrefix",
@@ -46,7 +47,6 @@ func (g *generator) gatewayTemplate() *arm.Template {
 		"rpResourceGroupName",
 		"rpServicePrincipalId",
 		"sshPublicKey",
-		"vmSize",
 		"vmssCleanupEnabled",
 		"vmssName",
 	}
@@ -57,11 +57,11 @@ func (g *generator) gatewayTemplate() *arm.Template {
 		case "gatewayDomains",
 			"gatewayFeatures":
 			p.DefaultValue = ""
+		case "gatewayVmSize":
+			p.DefaultValue = "Standard_D4s_v3"
 		case "gatewayVmssCapacity":
 			p.Type = "int"
 			p.DefaultValue = 3
-		case "vmSize":
-			p.DefaultValue = "Standard_D2s_v3"
 		case "vmssCleanupEnabled":
 			p.Type = "bool"
 			p.DefaultValue = true