Merge pull request #5009 from varunbeesu/puppet-enterprise-cluster_br…

…anch updated to use Managed Disks
Azure · Aug 29, 2018 · a8cc328 · a8cc328
2 parents db0a221 + 53e19be
commit a8cc328
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/puppet-enterprise-cluster/azuredeploy.json b/puppet-enterprise-cluster/azuredeploy.json
@@ -303,7 +303,7 @@
       }
     },
     {
-      "apiVersion": "2015-06-15",
+      "apiVersion": "2017-03-30",
       "type": "Microsoft.Compute/virtualMachines",
       "name": "[variables('puppetMasterVmName')]",
       "location": "[parameters('location')]",
@@ -334,10 +334,7 @@
             "version": "latest"
           },
           "osDisk": {
-            "name": "osdisk",
-            "vhd": {
-              "uri": "[concat('http://',variables('newStorageAccountName'),'.blob.core.windows.net/',variables('vmStorageAccountContainerName'),'/',variables('OSDiskName'),'.vhd')]"
-            },
+            "name": "[concat(variables('puppetMasterVmName'),'_OSDisk')]",
             "caching": "ReadWrite",
             "createOption": "FromImage"
           }
@@ -379,7 +376,7 @@
       }
     },
     {
-      "apiVersion": "2015-06-15",
+      "apiVersion": "2017-03-30",
       "type": "Microsoft.Compute/virtualMachines",
       "name": "[concat('WindowsAgentVM',copyIndex())]",
       "location": "[parameters('location')]",
@@ -408,10 +405,7 @@
             "version": "latest"
           },
           "osDisk": {
-            "name": "osdisk",
-            "vhd": {
-              "uri": "[concat('http://',variables('newStorageAccountName'),'.blob.core.windows.net/vhds/','osdisk',copyIndex(),'.vhd')]"
-            },
+            "name": "[concat('WindowsAgentVM',copyIndex(),'_OSDisk')]",
             "caching": "ReadWrite",
             "createOption": "FromImage"
           }
@@ -455,7 +449,7 @@
       }
     },
     {
-      "apiVersion": "2015-06-15",
+      "apiVersion": "2017-03-30",
       "type": "Microsoft.Compute/virtualMachines",
       "name": "[concat('UbuntuAgentVM',copyIndex())]",
       "location": "[parameters('location')]",
@@ -484,10 +478,7 @@
             "version": "latest"
           },
           "osDisk": {
-            "name": "osdisk",
-            "vhd": {
-              "uri": "[concat('http://',variables('newStorageAccountName'),'.blob.core.windows.net/vhds/','osdisk',add(copyIndex(),parameters('windowsAgentCount')),'.vhd')]"
-            },
+            "name": "[concat('UbuntuAgentVM',copyIndex(),'_OSDisk')]",
             "caching": "ReadWrite",
             "createOption": "FromImage"
           }

diff --git a/puppet-enterprise-cluster/azuredeploy.parameters.json b/puppet-enterprise-cluster/azuredeploy.parameters.json
@@ -3,7 +3,7 @@
   "contentVersion": "1.0.0.0",
   "parameters": {
      "adminUsername":{
-        "value":"admin123"
+        "value":"GEN-UNIQUE"
      },
      "adminPassword":{
         "value":"GEN-PASSWORD"

diff --git a/puppet-enterprise-cluster/metadata.json b/puppet-enterprise-cluster/metadata.json
@@ -5,7 +5,7 @@
   "description": "This template creates a Puppet Enterprise cluster consisting of a master and a configurable number of Windows & Linux agents",
   "summary": "This template creates a Puppet Enterprise cluster consisting of a master and a configurable number of Windows & Linux agents",
   "githubUsername": "kenazk",
-  "dateUpdated": "2016-07-27"
+  "dateUpdated": "2018-08-06"
 }