Commit for 1.1.1.0

F5Networks · Feb 28, 2018 · 32b7713 · 32b7713
1 parent 0d99e79
commit 32b7713
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/build/master_template.py b/build/master_template.py
@@ -177,9 +177,9 @@
 if template_name == '2nic_limited':
     nic_reference = [{ "id": "[resourceId('Microsoft.Network/networkInterfaces', variables('nic1Name'))]", "properties": { "primary": True } }, { "id": "[resourceId('Microsoft.Network/networkInterfaces', variables('nic2Name'))]", "properties": { "primary": False } }]
 if template_name in ('1nic', '2nic_limited'):
-    resources_list += [{"apiVersion": api_version, "type": "Microsoft.Compute/virtualMachines", "dependsOn": [ "[concat('Microsoft.Storage/storageAccounts/', variables('newStorageAccountName'))]", "[concat('Microsoft.Compute/availabilitySets/', variables('availabilitySetName'))]", "[concat('Microsoft.Network/networkInterfaces/', variables('nic1Name'))]" ], "location": location, "name": "[variables('instanceName')]", "tags": tags, "plan": { "name": "[variables('skuToUse')]", "publisher": "f5-networks", "product": "f5-big-ip" }, "properties": { "diagnosticsProfile": { "bootDiagnostics": { "enabled": True, "storageUri": "[concat('http://',variables('newStorageAccountName'),'.blob.core.windows.net')]" } }, "hardwareProfile": { "vmSize": "[parameters('instanceType')]" }, "networkProfile": { "networkInterfaces":  nic_reference }, "availabilitySet": { "id": "[resourceId('Microsoft.Compute/availabilitySets',variables('availabilitySetName'))]" }, "osProfile": { "computerName": "[variables('instanceName')]", "adminUsername": "[parameters('adminUsername')]", "adminPassword": "[parameters('adminPassword')]" }, "storageProfile": { "imageReference": { "publisher": "f5-networks", "offer": "f5-big-ip", "sku": "[variables('skuToUse')]", "version": "latest" }, "osDisk": { "caching": "ReadWrite", "createOption": "FromImage", "name": "osdisk", "vhd": { "uri": "[concat('http://',variables('newStorageAccountName'), '.blob.core.windows.net/vhds/', variables('instanceName'), '.vhd')]" } } } } }]
+    resources_list += [{"apiVersion": api_version, "type": "Microsoft.Compute/virtualMachines", "dependsOn": [ "[concat('Microsoft.Storage/storageAccounts/', variables('newStorageAccountName'))]", "[concat('Microsoft.Compute/availabilitySets/', variables('availabilitySetName'))]", "[concat('Microsoft.Network/networkInterfaces/', variables('nic1Name'))]" ], "location": location, "name": "[variables('instanceName')]", "tags": tags, "plan": { "name": "[variables('skuToUse')]", "publisher": "f5-networks", "product": "f5-big-ip" }, "properties": { "diagnosticsProfile": { "bootDiagnostics": { "enabled": True, "storageUri": "[concat('http://',variables('newStorageAccountName'),'.blob.core.windows.net')]" } }, "hardwareProfile": { "vmSize": "[parameters('instanceType')]" }, "networkProfile": { "networkInterfaces":  nic_reference }, "availabilitySet": { "id": "[resourceId('Microsoft.Compute/availabilitySets',variables('availabilitySetName'))]" }, "osProfile": { "computerName": "[variables('instanceName')]", "adminUsername": "[parameters('adminUsername')]", "adminPassword": "[parameters('adminPassword')]" }, "storageProfile": { "imageReference": { "publisher": "f5-networks", "offer": "f5-big-ip", "sku": "[variables('skuToUse')]", "version": "12.1.21" }, "osDisk": { "caching": "ReadWrite", "createOption": "FromImage", "name": "osdisk", "vhd": { "uri": "[concat('http://',variables('newStorageAccountName'), '.blob.core.windows.net/vhds/', variables('instanceName'), '.vhd')]" } } } } }]
 if template_name == 'cluster_base':
-    resources_list += [{ "apiVersion": "2015-06-15", "type": "Microsoft.Compute/virtualMachines", "name": "[concat(variables('deviceNamePrefix'),copyindex())]", "location": "[variables('location')]", "tags": { "displayName": "VirtualMachine", "application": "[parameters('tagValues').application]", "environment": "[parameters('tagValues').environment]", "group": "[parameters('tagValues').group]", "owner": "[parameters('tagValues').owner]", "costCenter": "[parameters('tagValues').cost]" }, "dependsOn": [ "[concat('Microsoft.Network/networkInterfaces/', variables('nicNamePrefix'), copyindex())]", "[concat('Microsoft.Compute/availabilitySets/', variables('availabilitySetName'))]", "[concat('Microsoft.Storage/storageAccounts/', variables('newStorageAccountName'))]" ], "copy": { "count": "[parameters('numberOfInstances')]", "name": "devicecopy" }, "plan": { "name": "[variables('skuToUse')]", "publisher": "f5-networks", "product": "f5-big-ip" }, "properties": { "availabilitySet": { "id": "[resourceId('Microsoft.Compute/availabilitySets',variables('availabilitySetName'))]" }, "hardwareProfile": { "vmSize": "[parameters('instanceType')]" }, "osProfile": { "computerName": "[concat(variables('deviceNamePrefix'),copyindex())]", "adminUsername": "[parameters('adminUsername')]", "adminPassword": "[parameters('adminPassword')]" }, "storageProfile": { "imageReference": { "publisher": "f5-networks", "offer": "f5-big-ip", "sku": "[variables('skuToUse')]", "version": "latest" }, "osDisk": { "name": "[concat('osdisk',copyindex())]", "vhd": { "uri": "[concat('http://',variables('newStorageAccountName'),'.blob.core.windows.net/',variables('newStorageAccountName'),'/osDisk',copyindex(),'.vhd')]" }, "caching": "ReadWrite", "createOption": "FromImage" } }, "networkProfile": { "networkInterfaces": [ { "id": "[concat(resourceId('Microsoft.Network/networkInterfaces',variables('nicNamePrefix')),copyindex())]" } ] }, "diagnosticsProfile": { "bootDiagnostics": { "enabled": True, "storageUri": "[concat('http://',variables('newstorageAccountName'),'.blob.core.windows.net')]" } } } }]
+    resources_list += [{ "apiVersion": "2015-06-15", "type": "Microsoft.Compute/virtualMachines", "name": "[concat(variables('deviceNamePrefix'),copyindex())]", "location": "[variables('location')]", "tags": { "displayName": "VirtualMachine", "application": "[parameters('tagValues').application]", "environment": "[parameters('tagValues').environment]", "group": "[parameters('tagValues').group]", "owner": "[parameters('tagValues').owner]", "costCenter": "[parameters('tagValues').cost]" }, "dependsOn": [ "[concat('Microsoft.Network/networkInterfaces/', variables('nicNamePrefix'), copyindex())]", "[concat('Microsoft.Compute/availabilitySets/', variables('availabilitySetName'))]", "[concat('Microsoft.Storage/storageAccounts/', variables('newStorageAccountName'))]" ], "copy": { "count": "[parameters('numberOfInstances')]", "name": "devicecopy" }, "plan": { "name": "[variables('skuToUse')]", "publisher": "f5-networks", "product": "f5-big-ip" }, "properties": { "availabilitySet": { "id": "[resourceId('Microsoft.Compute/availabilitySets',variables('availabilitySetName'))]" }, "hardwareProfile": { "vmSize": "[parameters('instanceType')]" }, "osProfile": { "computerName": "[concat(variables('deviceNamePrefix'),copyindex())]", "adminUsername": "[parameters('adminUsername')]", "adminPassword": "[parameters('adminPassword')]" }, "storageProfile": { "imageReference": { "publisher": "f5-networks", "offer": "f5-big-ip", "sku": "[variables('skuToUse')]", "version": "12.1.21" }, "osDisk": { "name": "[concat('osdisk',copyindex())]", "vhd": { "uri": "[concat('http://',variables('newStorageAccountName'),'.blob.core.windows.net/',variables('newStorageAccountName'),'/osDisk',copyindex(),'.vhd')]" }, "caching": "ReadWrite", "createOption": "FromImage" } }, "networkProfile": { "networkInterfaces": [ { "id": "[concat(resourceId('Microsoft.Network/networkInterfaces',variables('nicNamePrefix')),copyindex())]" } ] }, "diagnosticsProfile": { "bootDiagnostics": { "enabled": True, "storageUri": "[concat('http://',variables('newstorageAccountName'),'.blob.core.windows.net')]" } } } }]
 
 # Compute/VM Extension Resource(s)
 if template_name == '1nic':

diff --git a/build/testing_built_templates/cluster/1nic/azuredeploy.json b/build/testing_built_templates/cluster/1nic/azuredeploy.json
@@ -429,7 +429,7 @@
                         "offer": "f5-big-ip", 
                         "publisher": "f5-networks", 
                         "sku": "[variables('skuToUse')]", 
-                        "version": "latest"
+                        "version": "12.1.21"
                     }, 
                     "osDisk": {
                         "caching": "ReadWrite", 

diff --git a/experimental/cluster/1nic/azuredeploy.json b/experimental/cluster/1nic/azuredeploy.json
@@ -413,7 +413,7 @@
               "publisher": "f5-networks",
               "offer": "f5-big-ip",
               "sku": "[variables('skuToUse')]",
-              "version": "latest"
+              "version": "12.1.21"
           },
           "osDisk": {
             "name": "[concat('osdisk',copyindex())]",

diff --git a/experimental/standalone/1nic/azuredeploy.json b/experimental/standalone/1nic/azuredeploy.json
@@ -330,7 +330,7 @@
                         "offer": "f5-big-ip", 
                         "publisher": "f5-networks", 
                         "sku": "[variables('skuToUse')]", 
-                        "version": "latest"
+                        "version": "12.1.21"
                     }, 
                     "osDisk": {
                         "caching": "ReadWrite", 

diff --git a/experimental/standalone/2nic_limited/azuredeploy.json b/experimental/standalone/2nic_limited/azuredeploy.json
@@ -377,7 +377,7 @@
                         "offer": "f5-big-ip", 
                         "publisher": "f5-networks", 
                         "sku": "[variables('skuToUse')]", 
-                        "version": "latest"
+                        "version": "12.1.21"
                     }, 
                     "osDisk": {
                         "caching": "ReadWrite", 

diff --git a/supported/cluster/1nic/azuredeploy.json b/supported/cluster/1nic/azuredeploy.json
@@ -413,7 +413,7 @@
               "publisher": "f5-networks",
               "offer": "f5-big-ip",
               "sku": "[variables('skuToUse')]",
-              "version": "latest"
+              "version": "12.1.21"
           },
           "osDisk": {
             "name": "[concat('osdisk',copyindex())]",

diff --git a/supported/standalone/1nic/azuredeploy.json b/supported/standalone/1nic/azuredeploy.json
@@ -330,7 +330,7 @@
                         "offer": "f5-big-ip", 
                         "publisher": "f5-networks", 
                         "sku": "[variables('skuToUse')]", 
-                        "version": "latest"
+                        "version": "12.1.21"
                     }, 
                     "osDisk": {
                         "caching": "ReadWrite", 

diff --git a/supported/standalone/2nic_limited/azuredeploy.json b/supported/standalone/2nic_limited/azuredeploy.json
@@ -377,7 +377,7 @@
                         "offer": "f5-big-ip", 
                         "publisher": "f5-networks", 
                         "sku": "[variables('skuToUse')]", 
-                        "version": "latest"
+                        "version": "12.1.21"
                     }, 
                     "osDisk": {
                         "caching": "ReadWrite",