Incorporated comments- 2

apprenda · Apr 22, 2015 · f71da9c · f71da9c
1 parent fd816b7
commit f71da9c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 33 deletions.
diff --git a/couchbase-on-ubuntu/azuredeploy.json b/couchbase-on-ubuntu/azuredeploy.json
@@ -97,19 +97,19 @@
             "addressPrefix": "10.0.0.0/16",
             "subnet": {
                 "name": "couchSubnet",
-                "prefix": "10.0.0.0/24",
+                "prefix": "10.0.0.0/24"
             },
             "nodesIpPrefix": "10.0.0.1"
         },
         "machineSettings": {
             "adminUsername": "[parameters('adminUsername')]",
             "adminPassword": "[parameters('adminPassword')]",
             "machineNamePrefix": "[parameters('vmNamePrefix')]",
-            "osImageName": "[variables('sourceImageName')]",
+            "osImageName": "[variables('sourceImage')]",
             "dataDiskSize": 1023
         },
 
-        "vmSourceImageName": "b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-12_04_5_LTS-amd64-server-20150413-en-us-30GB",
+        "sourceImageName": "b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-12_04_5_LTS-amd64-server-20150413-en-us-30GB",
         "sourceImage": "[concat('/',subscription().subscriptionId,'/services/images/',variables('vmSourceImageName'))]",
         "templateBaseUrl": "https://raw.githubusercontent.com/ercenk/azurermtemplates/master/couchbase-on-ubuntu/",
         "storageAccountSuffixForNodeSmall0": "0",
@@ -257,9 +257,6 @@
                 "storageAccountName": {
                     "value": "[concat(parameters('storageAccountNamePrefix'), variables(concat('storageAccountSuffixForNode', parameters('tshirtSize'), copyindex())))]"
                 },
-                "sourceImage": {
-                    "value": "[variables('sourceImage')]"
-                },
                 "nodeId": {
                     "value": "[copyindex()]"
                 },
@@ -300,9 +297,6 @@
                 "storageAccountName": {
                     "value": "[concat(parameters('storageAccountNamePrefix'), variables(concat('storageAccountSuffixForNode', parameters('tshirtSize'), variables('clusterSpec').lastNodeId)))]"
                 },
-                "sourceImage": {
-                    "value": "[variables('sourceImage')]"
-                },
                 "nodeId": {
                     "value": "[variables('clusterSpec').lastNodeId]"
                 },

diff --git a/couchbase-on-ubuntu/cluster-nodes-A2.json b/couchbase-on-ubuntu/cluster-nodes-A2.json
@@ -25,12 +25,6 @@
           "Description": "Name of the storage account the VM is assigned to"
         }
       },
-      "sourceImage": {
-        "type": "string",
-        "metadata": {
-          "Description": "Source image for the VM."
-        },
-      },
       "nodeId": {
         "type": "int",
         "metadata": {
@@ -99,7 +93,7 @@
         },
         "storageProfile": {
           "sourceImage": {
-            "id": "[parameters('sourceImage')]"
+            "id": "[parameters('machineSettings').osImageName]"
           },
           "dataDisks": [{
             "name": "datadisk0",

diff --git a/couchbase-on-ubuntu/cluster-nodes-A6.json b/couchbase-on-ubuntu/cluster-nodes-A6.json
@@ -25,12 +25,6 @@
           "Description": "Name of the storage account the VM is assigned to"
         }
       },
-      "sourceImage": {
-        "type": "string",
-        "metadata": {
-          "Description": "Source image for the VM"
-        },
-      },
       "nodeId": {
         "type": "int",
         "metadata": {
@@ -100,7 +94,7 @@
         },
         "storageProfile": {
           "sourceImage": {
-            "id": "[parameters('sourceImage')]"
+            "id": "[parameters('machineSettings').osImageName]"
           },
           "dataDisks": [{
             "name": "datadisk0",

diff --git a/couchbase-on-ubuntu/cluster-nodes-D14.json b/couchbase-on-ubuntu/cluster-nodes-D14.json
@@ -25,12 +25,6 @@
           "Description": "Name of the storage account the VM is assigned to"
         }
       },
-      "sourceImage": {
-        "type": "string",
-        "metadata": {
-          "Description": "Source image for the VM."
-        },
-      },
       "nodeId": {
         "type": "int",
         "metadata": {
@@ -100,7 +94,7 @@
         },
         "storageProfile": {
           "sourceImage": {
-            "id": "[parameters('sourceImage')]"
+            "id": "[parameters('machineSettings').osImageName]"
           },
           "dataDisks": [{
             "name": "datadisk0",

diff --git a/couchbase-on-ubuntu/jumpbox-resources-enabled.json b/couchbase-on-ubuntu/jumpbox-resources-enabled.json
@@ -30,8 +30,6 @@
     },
     "variables": {
         "vmStorageAccountContainerName": "vhd",
-        "vmSourceImageName": "b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-14_04_2_LTS-amd64-server-20150309-en-us-30GB",
-        "sourceImageName": "[concat('/',subscription().subscriptionId,'/services/images/',variables('vmSourceImageName'))]",
         "winSourceImageName": "[concat('/',subscription().subscriptionId,'/services/images/a699494373c04fc0bc8f2bb1389d6106__Windows-Server-Technical-Preview-201504.01-en.us-127GB.vhd')]",
         "subnetRef": "[concat(resourceId('Microsoft.Network/virtualNetworks',parameters('networkSettings').virtualNetworkName),'/subnets/',parameters('networkSettings').subnet.name)]",
         "storageAccountName": "[concat(parameters('storageAccountNamePrefix'), 'jb')]"
@@ -98,7 +96,7 @@
             },
             "storageProfile": {
                 "sourceImage": {
-                    "id": "[variables('sourceImageName')]"
+                    "id": "[parameters('machineSettings').osImageName]"
                 },
                 "destinationVhdsContainer": "[concat('https://' ,variables('storageAccountName'), '.blob.core.windows.net/',variables('vmStorageAccountContainerName'),'/')]"
             },