Updating QuickStart templates to WS2016 (#237)

* Multiple VMs Availability set quick start template - initial checkin. * Add Parameters json file. * Added Metadat json and readme files * CR feedback addressed. * Updating QuickStart templates to WS2016
Azure · Jun 8, 2017 · c761ac0 · c761ac0
1 parent db676c0
commit c761ac0
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 18 deletions.
diff --git a/101-vm-windows-create-with-extension-diagnostic/azuredeploy.json b/101-vm-windows-create-with-extension-diagnostic/azuredeploy.json
@@ -25,14 +25,15 @@
       "type": "securestring",
       "metadata": {
         "description": "Password for the Virtual Machine"
-      },            
+      },
       "defaultValue": "[concat('Subscription#',subscription().subscriptionId)]"
     },
     "windowsOSVersion": {
       "type": "string",
-      "defaultValue": "2012-R2-Datacenter",
+      "defaultValue": "2016-Datacenter",
       "allowedValues": [
-        "2012-R2-Datacenter"
+        "2012-R2-Datacenter",
+        "2016-Datacenter"
       ],
       "metadata": {
         "description": "The Windows version for the VM. This will pick a fully patched image of this given Windows version. Allowed values: 2012-R2-Datacenter."

diff --git a/101-vm-windows-create-with-extension-diagnostic/azuredeploy.parameters.json b/101-vm-windows-create-with-extension-diagnostic/azuredeploy.parameters.json
@@ -5,9 +5,6 @@
     "vmsuffix": {
       "value": "myVM"
     },
-    "windowsOSVersion": {
-      "value": "2012-R2-Datacenter"
-    },
     "DiagnosticResourceGroup": {
       "value": "DiagRg"
     }

diff --git a/101-vm-windows-create/azuredeploy.parameters.json b/101-vm-windows-create/azuredeploy.parameters.json
@@ -1,9 +1,5 @@
 {
   "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
   "contentVersion": "1.0.0.0",
-  "parameters": {
-    "windowsOSVersion": {
-      "value": "2012-R2-Datacenter"
-    }
-  }
+  "parameters": {}
 }
diff --git a/ad-join-domain-ext-win/azuredeploy.json b/ad-join-domain-ext-win/azuredeploy.json
@@ -88,7 +88,7 @@
         "vmSize": "Standard_A2",
         "imagePublisher": "MicrosoftWindowsServer",
         "imageOffer": "WindowsServer",
-        "imageSKU": "2012-R2-Datacenter",
+        "imageSKU": "2016-Datacenter",
         "imageVersion": "latest",
         "OSDiskName": "osdisk",
         "publicIPAddressName": "[concat(parameters('vmName'),'-pip')]",
@@ -124,7 +124,7 @@
             "name": "[variables('nicName')]",
             "location": "[resourceGroup().location]",
             "dependsOn": [
-                "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'))]"                
+                "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'))]"
             ],
             "properties": {
                 "ipConfigurations": [
@@ -212,8 +212,8 @@
                     "Restart": "true",
                     "Options": "[parameters('domainJoinOptions')]"
                 },
-                "protectedsettings": { 
-                    "Password": "[parameters('domainPassword')]"    
+                "protectedsettings": {
+                    "Password": "[parameters('domainPassword')]"
                 }
             }
         }

diff --git a/ad-non-ha/CreateADPDC.ps1.zip b/ad-non-ha/CreateADPDC.ps1.zip
diff --git a/ad-non-ha/adVmTemplate.json b/ad-non-ha/adVmTemplate.json
@@ -18,10 +18,14 @@
         },
         "windowsImageSKU": {
             "type": "string",
+            "allowedValues": [
+                "2012-R2-Datacenter",
+                "2016-Datacenter"
+            ],
             "metadata": {
                 "description": "The SKU Name of Windows Image"
             },
-            "defaultValue": "2012-R2-Datacenter"
+            "defaultValue": "2016-Datacenter"
         },
         "windowsImageVersion": {
             "type": "string",

diff --git a/ad-non-ha/azuredeploy.json b/ad-non-ha/azuredeploy.json
@@ -27,6 +27,7 @@
     "variables": {
         "assetLocation": "https://raw.githubusercontent.com/Azure/AzureStack-QuickStart-Templates/master/ad-non-ha",
         "adVMSize": "Standard_A1",
+        "adOSVersion": "2016-Datacenter",
         "vmNetworkSubnet": "10.0.0.0/24",
         "virtualNetworkAddressRange": "10.0.0.0/16",
         "primaryAdIpAddress": "10.0.0.4",
@@ -196,6 +197,9 @@
                     "storageAccountType": {
                         "value": "[variables('storageAccountType')]"
                     },
+                    "windowsImageSKU": {
+                        "value": "[variables('adOSVersion')]"
+                    },
                     "vmName": {
                         "value": "[variables('adPDCVMName')]"
                     },

diff --git a/sql-2014-non-ha/sqlVmTemplate.json b/sql-2014-non-ha/sqlVmTemplate.json
@@ -21,7 +21,7 @@
             "metadata": {
                 "description": "The SKU Name of Windows Image"
             },
-            "defaultValue": "2012-R2-Datacenter"
+            "defaultValue": "2016-Datacenter"
         },
         "windowsImageVersion": {
             "type": "string",
@@ -54,7 +54,7 @@
             "metadata": {
                 "description": "The type of the Storage Account created"
             },
-            "defaultValue": "Standard_LRS" 
+            "defaultValue": "Standard_LRS"
         },
         "adminUsername": {
             "type": "string",