correcting arm templates of type and names

kisantia · Aug 18, 2017 · 98a05b1 · 98a05b1
1 parent 041ccb5
commit 98a05b1
Show file tree

Hide file tree

Showing 266 changed files with 780 additions and 781 deletions.
diff --git a/101-acsengine-swarmmode/azuredeploy.json b/101-acsengine-swarmmode/azuredeploy.json
@@ -944,7 +944,7 @@
             "computerNamePrefix": "[variables('agentVMNamePrefix')]",
             "customData": "[base64(concat('#cloud-config\n\nwrite_files:\n -  encoding: gzip\n    content: !!binary |\n        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\n    path: /opt/azure/containers/configure-swarmmode-cluster.sh\n    permissions: \"0744\"\n\n',variables('agentRunCmdFile'),variables('agentRunCmd')))]",
             "linuxConfiguration": {
-              "disablePasswordAuthentication": "true",
+              "disablePasswordAuthentication": true,
               "ssh": {
                 "publicKeys": [
                   {
@@ -1177,10 +1177,10 @@
         },
         "osProfile": {
           "adminUsername": "[variables('adminUsername')]",
-          "computername": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
+          "computerName": "[concat(variables('masterVMNamePrefix'), copyIndex())]",
           "customData": "[base64('#cloud-config\n\nwrite_files:\n -  encoding: gzip\n    content: !!binary |\n        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\n    path: /opt/azure/containers/configure-swarmmode-cluster.sh\n    permissions: \"0744\"\n\n')]",
           "linuxConfiguration": {
-            "disablePasswordAuthentication": "true",
+            "disablePasswordAuthentication": true,
             "ssh": {
               "publicKeys": [
                 {

diff --git a/101-app-service-certificate-standard/azuredeploy.json b/101-app-service-certificate-standard/azuredeploy.json
@@ -63,7 +63,7 @@
       {
          "type":"Microsoft.Web/sites/domainOwnershipIdentifiers",
          "name":"[concat(parameters('existingAppName'), concat('/', parameters('certificateOrderName')))]",
-         "apiVersion":"2015-08-01",
+         "apiVersion":"2016-08-01",
          "location":"[parameters('existingAppLocation')]",
          "dependsOn":[
             "[resourceId('Microsoft.CertificateRegistration/certificateOrders', parameters('certificateOrderName'))]"

diff --git a/101-jenkins-with-ssh-public-key/azuredeploy.json b/101-jenkins-with-ssh-public-key/azuredeploy.json
@@ -188,7 +188,7 @@
           "computerName": "[variables('vmName')]",
           "adminUsername": "[parameters('adminUsername')]",
           "linuxConfiguration": {
-            "disablePasswordAuthentication": "true",
+            "disablePasswordAuthentication": true,
             "ssh": {
               "publicKeys": [
                 {

diff --git a/101-redis-cache/prereqs/prereq.azuredeploy.parameters.json b/101-redis-cache/prereqs/prereq.azuredeploy.parameters.json
@@ -1,4 +1,4 @@
-{
+{
     "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
     "contentVersion": "1.0.0.0",
     "parameters": {

diff --git a/101-spinnaker-existing-vnet/azuredeploy.json b/101-spinnaker-existing-vnet/azuredeploy.json
@@ -121,7 +121,7 @@
           "computerName": "[variables('vmName')]",
           "adminUsername": "[parameters('adminUsername')]",
           "linuxConfiguration": {
-            "disablePasswordAuthentication": "true",
+            "disablePasswordAuthentication": true,
             "ssh": {
               "publicKeys": [
                 {

diff --git a/101-spinnaker/azuredeploy.json b/101-spinnaker/azuredeploy.json
@@ -124,7 +124,7 @@
           "computerName": "[variables('vmName')]",
           "adminUsername": "[parameters('adminUsername')]",
           "linuxConfiguration": {
-            "disablePasswordAuthentication": "true",
+            "disablePasswordAuthentication": true,
             "ssh": {
               "publicKeys": [
                 {

diff --git a/101-subnet-add-vnet-existing/prereqs/prereq.azuredeploy.parameters.json b/101-subnet-add-vnet-existing/prereqs/prereq.azuredeploy.parameters.json
@@ -1,4 +1,4 @@
-{
+{
   "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
   "contentVersion": "1.0.0.0",
   "parameters": {

diff --git a/101-vm-from-user-image/azuredeploy.json b/101-vm-from-user-image/azuredeploy.json
@@ -121,7 +121,7 @@
       "name": "vnet-template",
       "type": "Microsoft.Resources/deployments",
       "properties": {
-        "mode": "incremental",
+        "mode": "Incremental",
         "templateLink": {
           "uri": "[variables('templatelink')]",
           "contentVersion": "1.0.0.0"

diff --git a/101-vm-sshkey/azuredeploy.json b/101-vm-sshkey/azuredeploy.json
@@ -2,7 +2,7 @@
   "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json",
   "contentVersion": "1.0.0.0",
   "parameters": {
-    "adminUserName": {
+    "adminUsername": {
       "type": "string",
       "defaultValue": "azureuser",
       "metadata": {
@@ -143,7 +143,7 @@
           "computerName": "[variables('vmName')]",
           "adminUsername": "[parameters('adminUserName')]",
           "linuxConfiguration": {
-            "disablePasswordAuthentication": "true",
+            "disablePasswordAuthentication": true,
             "ssh": {
               "publicKeys": [
                 {

diff --git a/101-vm-sshkey/azuredeploy.parameters.json b/101-vm-sshkey/azuredeploy.parameters.json
@@ -2,7 +2,7 @@
   "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
   "contentVersion": "1.0.0.0",
   "parameters": {
-    "adminUserName": {
+    "adminUsername": {
       "value": "azureuser"
     },
     "sshKeyData": {

diff --git a/101-vm-user-image-data-disks/azuredeploy.json b/101-vm-user-image-data-disks/azuredeploy.json
@@ -26,7 +26,7 @@
         "description": "Unique DNS Name for the Public IP used to access the Virtual Machine."
       }
     },
-    "adminUserName": {
+    "adminUsername": {
       "type": "string",
       "metadata": {
         "description": "User Name for the Virtual Machine"

diff --git a/101-vm-with-data-management-gateway/azuredeploy.json b/101-vm-with-data-management-gateway/azuredeploy.json
@@ -14,7 +14,7 @@
         "description": "Gateway name must be unique in subscription"
       }
     },
-    "adminUserName": {
+    "adminUsername": {
       "type": "string",
       "metadata": {
         "description": "User name for the virtual machine"
@@ -240,7 +240,7 @@
         "[resourceId('Microsoft.DataFactory/dataFactories/gateways', parameters('existingDataFactoryName'), parameters('GatewayName'))]"
       ],
       "properties": {
-        "mode": "incremental",
+        "mode": "Incremental",
         "templateLink": {
           "uri": "[variables('nsglink')]",
           "contentVersion": "1.0.0.0"

diff --git a/101-vm-with-data-management-gateway/azuredeploy.parameters.json b/101-vm-with-data-management-gateway/azuredeploy.parameters.json
@@ -8,7 +8,7 @@
     "GatewayName": {
       "value": "newgateway"
     },
-    "adminUserName": {
+    "adminUsername": {
       "value": "GEN-USER"
     },
     "adminPassword": {

diff --git a/201-dependency-between-scripts-using-extensions/azuredeploy.json b/201-dependency-between-scripts-using-extensions/azuredeploy.json
@@ -14,7 +14,7 @@
         "description": "This is the unique DNS name of the for the public IP for your VM"
       }
     },
-    "adminUserName": {
+    "adminUsername": {
       "type": "string",
       "metadata": {
         "description": "This is the username you wish to assign to your VMs admin account"

diff --git a/201-discover-private-ip-dynamically/azuredeploy.json b/201-discover-private-ip-dynamically/azuredeploy.json
@@ -56,7 +56,7 @@
         "description": "Image SKU"
       }
     },
-    "adminUserName": {
+    "adminUsername": {
       "type": "string",
       "metadata": {
         "description": "VM Admin Username"

diff --git a/201-discover-private-ip-dynamically/azuredeploy.parameters.json b/201-discover-private-ip-dynamically/azuredeploy.parameters.json
@@ -11,7 +11,7 @@
     "vmSize": {
       "value": "Standard_D1"
     },
-    "adminUserName": {
+    "adminUsername": {
       "value": "admin123"
     },
     "adminPassword": {

diff --git a/201-list-storage-keys-windows-vm/azuredeploy.parameters.json b/201-list-storage-keys-windows-vm/azuredeploy.parameters.json
@@ -11,7 +11,7 @@
     "vmSize": {
       "value": "Standard_A2"
     },
-    "adminUserName": {
+    "adminUsername": {
       "value": "changeme"
     },
     "adminPassword": {

diff --git a/201-oms-extension-ubuntu-vm/azuredeploy.json b/201-oms-extension-ubuntu-vm/azuredeploy.json
@@ -148,7 +148,7 @@
           "vmSize": "[variables('vmSize')]"
         },
         "osProfile": {
-          "computername": "[variables('vmName')]",
+          "computerName": "[variables('vmName')]",
           "adminUsername": "[parameters('adminUsername')]",
           "adminPassword": "[parameters('adminPassword')]"
         },

diff --git a/201-oms-extension-windows-vm/azuredeploy.json b/201-oms-extension-windows-vm/azuredeploy.json
@@ -144,7 +144,7 @@
           "vmSize": "[variables('vmSize')]"
         },
         "osProfile": {
-          "computername": "[variables('vmName')]",
+          "computerName": "[variables('vmName')]",
           "adminUsername": "[parameters('adminUsername')]",
           "adminPassword": "[parameters('adminPassword')]"
         },

diff --git a/201-ospatching-extension-on-ubuntu/prereqs/prereq.azuredeploy.json b/201-ospatching-extension-on-ubuntu/prereqs/prereq.azuredeploy.json
@@ -1,4 +1,4 @@
-{
+{
     "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
     "contentVersion": "1.0.0.0",
     "parameters": {},

diff --git a/201-ospatching-extension-on-ubuntu/prereqs/prereq.azuredeploy.parameters.json b/201-ospatching-extension-on-ubuntu/prereqs/prereq.azuredeploy.parameters.json
@@ -1,4 +1,4 @@
-{
+{
     "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
     "contentVersion": "1.0.0.0",
     "parameters": {

diff --git a/201-spinnaker-acr-k8s/azuredeploy.json b/201-spinnaker-acr-k8s/azuredeploy.json
@@ -207,7 +207,7 @@
           "computerName": "[variables('vmName')]",
           "adminUsername": "[parameters('adminUsername')]",
           "linuxConfiguration": {
-            "disablePasswordAuthentication": "true",
+            "disablePasswordAuthentication": true,
             "ssh": {
               "publicKeys": [
                 {

diff --git a/201-vm-custom-image-new-storage-account/azuredeploy.json b/201-vm-custom-image-new-storage-account/azuredeploy.json
@@ -33,7 +33,7 @@
         "description": "Name of the VHD to be used as source syspreped/generalized image to deploy the VM. E.g. mybaseimage.vhd."
       }
     },
-    "adminUserName": {
+    "adminUsername": {
       "type": "string",
       "minLength": 1,
       "metadata": {

diff --git a/201-vm-custom-image-new-storage-account/azuredeploy.parameters.json b/201-vm-custom-image-new-storage-account/azuredeploy.parameters.json
@@ -2,7 +2,7 @@
   "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
   "contentVersion": "1.0.0.0",
   "parameters": {
-    "adminUserName": {
+    "adminUsername": {
       "value": "testusername"
     },
     "adminPassword": {

diff --git a/201-vm-different-rg-vnet/azuredeploy.json b/201-vm-different-rg-vnet/azuredeploy.json
@@ -76,7 +76,7 @@
         "description": "Image SKU"
       }
     },
-    "adminUserName": {
+    "adminUsername": {
       "type": "string",
       "metadata": {
         "description": "VM Admin Username"

diff --git a/201-vm-different-rg-vnet/azuredeploy.parameters.json b/201-vm-different-rg-vnet/azuredeploy.parameters.json
@@ -17,7 +17,7 @@
     "vmSize": {
       "value": "Standard_A2"
     },
-    "adminUserName": {
+    "adminUsername": {
       "value": "changeme"
     },
     "adminPassword": {

diff --git a/201-vm-domain-join/azuredeploy.json b/201-vm-domain-join/azuredeploy.json
@@ -167,7 +167,7 @@
             {
               "name": "myvm-data-disk1",
               "vhd": {
-                "Uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName')), '2015-06-15').primaryEndpoints.blob,'vhds/',parameters('dnsLabelPrefix'), 'disk1.vhd')]"
+                "uri": "[concat(reference(concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName')), '2015-06-15').primaryEndpoints.blob,'vhds/',parameters('dnsLabelPrefix'), 'disk1.vhd')]"
               },
               "caching": "None",
               "createOption": "Empty",

diff --git a/201-vm-linux-dynamic-data-disks/azuredeploy.json b/201-vm-linux-dynamic-data-disks/azuredeploy.json
@@ -22,7 +22,7 @@
         "description": "Unique public dns prefix where the  node will be exposed"
       }
     },
-    "adminUserName": {
+    "adminUsername": {
       "type": "string",
       "defaultValue": "azureuser",
       "metadata": {
@@ -340,7 +340,7 @@
           "vmSize": "[parameters('nodeSize')]"
         },
         "osProfile": {
-          "computername": "[parameters('masterVMName')]",
+          "computerName": "[parameters('masterVMName')]",
           "adminUsername": "[parameters('adminUsername')]",
           "linuxConfiguration": {
             "disablePasswordAuthentication": true,

diff --git a/201-vm-linux-dynamic-data-disks/azuredeploy.parameters.json b/201-vm-linux-dynamic-data-disks/azuredeploy.parameters.json
@@ -5,7 +5,7 @@
     "dnsLabelPrefix": {
       "value": "GEN-UNIQUE"
     },
-    "adminUserName": {
+    "adminUsername": {
       "value": "azureuser"
     },
     "imagePublisher": {

diff --git a/201-vm-monitoring-diagnostics-extension/prereqs/prereq.azuredeploy.json b/201-vm-monitoring-diagnostics-extension/prereqs/prereq.azuredeploy.json
@@ -1,4 +1,4 @@
-{
+{
     "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
     "contentVersion": "1.0.0.0",
     "parameters": {

diff --git a/201-vm-monitoring-diagnostics-extension/prereqs/prereq.azuredeploy.parameters.json b/201-vm-monitoring-diagnostics-extension/prereqs/prereq.azuredeploy.parameters.json
@@ -1,4 +1,4 @@
-{
+{
   "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
   "contentVersion": "1.0.0.0",
   "parameters": {

diff --git a/201-vm-multiple-nics-linux/azuredeploy.json b/201-vm-multiple-nics-linux/azuredeploy.json
@@ -249,7 +249,7 @@
           "computerName": "[parameters('vmName')]",
           "adminUsername": "[parameters('adminUsername')]",
           "linuxConfiguration": {
-            "disablePasswordAuthentication": "true",
+            "disablePasswordAuthentication": true,
             "ssh": {
               "publicKeys": [
                 {

diff --git a/201-vm-push-certificate-windows/azuredeploy.json b/201-vm-push-certificate-windows/azuredeploy.json
@@ -153,7 +153,7 @@
           "vmSize": "[parameters('vmSize')]"
         },
         "osProfile": {
-          "computername": "[parameters('vmName')]",
+          "computerName": "[parameters('vmName')]",
           "adminUsername": "[parameters('adminUsername')]",
           "adminPassword": "[parameters('adminPassword')]",
           "secrets": [

diff --git a/201-vm-push-certificate-windows/azuredeploy.parameters.json b/201-vm-push-certificate-windows/azuredeploy.parameters.json
@@ -11,7 +11,7 @@
     "vmSize": {
       "value": "Standard_A2"
     },
-    "adminUserName": {
+    "adminUsername": {
       "value": ""
     },
     "adminPassword": {

diff --git a/201-vm-winrm-keyvault-windows/azuredeploy.json b/201-vm-winrm-keyvault-windows/azuredeploy.json
@@ -14,7 +14,7 @@
         "description": "DNS Name for the Public IP. Must be lowercase."
       }
     },
-    "adminUserName": {
+    "adminUsername": {
       "type": "string",
       "metadata": {
         "description": "Admin username"