Remoiving extra public IP addressess

paulomarquesc · paulomarquesc · commit 54c7b76c2ba5 · 2016-10-16T05:48:49.000-07:00
diff --git a/azuredeploy.json b/azuredeploy.json
@@ -192,13 +192,9 @@
     "deployStorageAccountsUrl": "[concat(variables('baseUrl'),'/deployStorageAccounts.json')]",
     "deployPublicIPsUrl": "[concat(variables('baseUrl'),'/deployPublicIPs.json')]",
     "publicIpNames": [
-      "addc01Pip",
-      "addc02Pip",
-      "adfs01Pip",
-      "adfs02Pip",
-      "wapLbPip"
+       "wapLbPip"
     ],
-    "publicIPAddressType": "Dynamic",
+    "publicIPAddressType": "Static",
     "deployAvailabilitySetsUrl": "[concat(variables('baseUrl'),'/deployAvailabilitySets.json')]",
     "availabilitySetNames": [
       "addc-as",
@@ -238,7 +234,7 @@
       "rdpWap02"
     ],
     "lbPublicIpResourceIds": [
-      "[resourceId(concat('Microsoft.Network','/','publicIPAddresses'),variables('publicIpNames')[4])]"
+      "[resourceId(concat('Microsoft.Network','/','publicIPAddresses'),variables('publicIpNames')[0])]"
     ],
     "deployNicsUrl": "[concat(variables('baseUrl'),'/deployNics.json')]",
     "deployNsgsUrl": "[concat(variables('baseUrl'),'/deployNsgs.json')]",
@@ -429,11 +425,7 @@
           },
           "publicIpAddressIds": {
             "value": [
-              "[resourceId('Microsoft.Network/publicIPAddresses',variables('publicIpNames')[0])]",
-              "[resourceId('Microsoft.Network/publicIPAddresses',variables('publicIpNames')[1])]",
-              "[resourceId('Microsoft.Network/publicIPAddresses',variables('publicIpNames')[2])]",
-              "[resourceId('Microsoft.Network/publicIPAddresses',variables('publicIpNames')[3])]",
-              "[resourceId('Microsoft.Network/publicIPAddresses',variables('publicIpNames')[4])]"
+              "[resourceId('Microsoft.Network/publicIPAddresses',variables('publicIpNames')[0])]"
             ]
           },
           "subnetIds": {
diff --git a/deployNics.json b/deployNics.json
@@ -43,9 +43,6 @@
               "privateIPAddress": "[parameters('ipAddresses')[0]]",
               "subnet": {
                 "id": "[parameters('subnetIds')[0]]"
-              },
-              "publicIPAddress": {
-                "id": "[parameters('publicIpAddressIds')[0]]"
               }
             }
           }
@@ -67,9 +64,6 @@
               "privateIPAddress": "[parameters('ipAddresses')[1]]",
               "subnet": {
                 "id": "[parameters('subnetIds')[0]]"
-              },
-              "publicIPAddress": {
-                "id": "[parameters('publicIpAddressIds')[1]]"
               }
             }
           }
@@ -92,9 +86,6 @@
               "subnet": {
                 "id": "[parameters('subnetIds')[0]]"
               },
-              "publicIPAddress": {
-                "id": "[parameters('publicIpAddressIds')[2]]"
-              },
               "loadBalancerBackendAddressPools": [
                 {
                   "id": "[parameters('adfsBEAddressPoolID')]"
@@ -121,9 +112,6 @@
               "subnet": {
                 "id": "[parameters('subnetIds')[0]]"
               },
-              "publicIPAddress": {
-                "id": "[parameters('publicIpAddressIds')[3]]"
-              },
               "loadBalancerBackendAddressPools": [
                 {
                   "id": "[parameters('adfsBEAddressPoolID')]"

Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,6 @@`
`43`	`43`	`"privateIPAddress": "[parameters('ipAddresses')[0]]",`
`44`	`44`	`"subnet": {`
`45`	`45`	`"id": "[parameters('subnetIds')[0]]"`
`46`		`- },`
`47`		`- "publicIPAddress": {`
`48`		`- "id": "[parameters('publicIpAddressIds')[0]]"`
`49`	`46`	`}`
`50`	`47`	`}`
`51`	`48`	`}`
`@@ -67,9 +64,6 @@`
`67`	`64`	`"privateIPAddress": "[parameters('ipAddresses')[1]]",`
`68`	`65`	`"subnet": {`
`69`	`66`	`"id": "[parameters('subnetIds')[0]]"`
`70`		`- },`
`71`		`- "publicIPAddress": {`
`72`		`- "id": "[parameters('publicIpAddressIds')[1]]"`
`73`	`67`	`}`
`74`	`68`	`}`
`75`	`69`	`}`
`@@ -92,9 +86,6 @@`
`92`	`86`	`"subnet": {`
`93`	`87`	`"id": "[parameters('subnetIds')[0]]"`
`94`	`88`	`},`
`95`		`- "publicIPAddress": {`
`96`		`- "id": "[parameters('publicIpAddressIds')[2]]"`
`97`		`- },`
`98`	`89`	`"loadBalancerBackendAddressPools": [`
`99`	`90`	`{`
`100`	`91`	`"id": "[parameters('adfsBEAddressPoolID')]"`
`@@ -121,9 +112,6 @@`
`121`	`112`	`"subnet": {`
`122`	`113`	`"id": "[parameters('subnetIds')[0]]"`
`123`	`114`	`},`
`124`		`- "publicIPAddress": {`
`125`		`- "id": "[parameters('publicIpAddressIds')[3]]"`
`126`		`- },`
`127`	`115`	`"loadBalancerBackendAddressPools": [`
`128`	`116`	`{`
`129`	`117`	`"id": "[parameters('adfsBEAddressPoolID')]"`