more parameter fixes

pdiniz13 · pdiniz13 · commit 12a3b519e1ec · 2017-02-02T11:56:09.000-08:00
diff --git a/nestedtemplates/external-lb.json b/nestedtemplates/external-lb.json
@@ -13,6 +13,10 @@
         "lbId": {
             "type": "String",
             "defaultValue": ""
+        },
+        "vnetId": {
+            "type": "String",
+            "defaultValue": ""
         }
     },
     "variables": {},
diff --git a/nestedtemplates/internal-lb.json b/nestedtemplates/internal-lb.json
@@ -13,6 +13,10 @@
         "lbId": {
             "type": "String",
             "defaultValue": ""
+        },
+        "vnetId": {
+            "type": "String",
+            "defaultValue": ""
         }
     },
     "variables": {},
@@ -33,7 +37,7 @@
                             "privateIPAddress": "10.0.101.4",
                             "privateIPAllocationMethod": "Static",
                             "subnet": {
-                                "id": "[concat(variables('vnetId'), '/subnets/', parameters('zookeeperNetName'))]"
+                                "id": "[concat(parameters('vnetId'), '/subnets/', parameters('zookeeperNetName'))]"
                             }
                         }
                     }
diff --git a/nestedtemplates/network-resources.json b/nestedtemplates/network-resources.json
@@ -13,19 +13,14 @@
         "postgresNetName": {
             "type": "String",
             "defaultValue": ""
-        },
-        "clusterName": {
-            "type": "String",
-            "defaultValue": ""
         }
     },
     "variables": {
-        "vnetName": "[concat(parameters('clusterName'), '-net')]"
     },
     "resources": [
         {
             "type": "Microsoft.Network/virtualNetworks",
-            "name": "[variables('vnetName')]",
+            "name": "[parameters('vnetName')]",
             "apiVersion": "2015-06-15",
             "location": "[resourceGroup().location]",
             "tags": {},
diff --git a/template.json b/template.json
@@ -32,7 +32,7 @@
         },
         "lbType": {
             "type": "string",
-            "defaultValue": "yes",
+            "defaultValue": "internal",
             "allowedValues": [
                 "internal",
                 "external"
@@ -99,7 +99,6 @@
             "internal": "internal-lb.json"
         },
         "lbId": "[resourceId('Microsoft.Network/loadBalancers/', variables('lbName'))]",
-        "vnetGroup": "testht",
         "vnetId": "[resourceId(parameters('vnetGroup'), 'Microsoft.Network/virtualNetworks', parameters('vnetName'))]",
         "zookeeperInstanceCount": 3,
         "postgresInstanceCount": "[parameters('instanceCount')]",
@@ -134,6 +133,9 @@
                     },
                     "clusterName": {
                         "value": "[parameters('clusterName')]"
+                    },
+                    "vnetId": {
+                        "value": "[variables('vnetId')]"
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,10 @@`
`13`	`13`	`"lbId": {`
`14`	`14`	`"type": "String",`
`15`	`15`	`"defaultValue": ""`
	`16`	`+ },`
	`17`	`+ "vnetId": {`
	`18`	`+ "type": "String",`
	`19`	`+ "defaultValue": ""`
`16`	`20`	`}`
`17`	`21`	`},`
`18`	`22`	`"variables": {},`
`@@ -33,7 +37,7 @@`
`33`	`37`	`"privateIPAddress": "10.0.101.4",`
`34`	`38`	`"privateIPAllocationMethod": "Static",`
`35`	`39`	`"subnet": {`
`36`		`- "id": "[concat(variables('vnetId'), '/subnets/', parameters('zookeeperNetName'))]"`
	`40`	`+ "id": "[concat(parameters('vnetId'), '/subnets/', parameters('zookeeperNetName'))]"`
`37`	`41`	`}`
`38`	`42`	`}`
`39`	`43`	`}`