Commit for 4.2.0.0

Author: jsevedge

README.md

@@ -3,6 +3,16 @@ The following table contains all of the tagged releases of the F5 ARM templates
 
 | Release Tag | Template Family | BIG-IP Versions | License Bundles and Throughput Rates |
 | --- | --- | --- | --- |
+| [v4.2.0.0](https://github.com/F5Networks/f5-azure-arm-templates/releases/tag/v4.2.0.0) | Standalone | BIG-IP v13.0.0300, v12.1.2200 | *Good/Better/Best*: 1Gbps, 200Mbps, 25Mbps |
+|  | Cluster | BIG-IP v13.0.0300, v12.1.2200 | *Good/Better/Best*: 1Gbps, 200Mbps, 25Mbps |
+|  | Auto Scale WAF | BIG-IP v13.0.0300, v12.1.2200 | *Best*: 1Gbps, 200Mbps, 25Mbps |
+|  | Auto Scale LTM |BIG-IP v13.0.0300, v12.1.2200 | *Good/Better/Best*: 1Gbps, 200Mbps, 25Mbps |
+|  | HA-AVSET | BIG-IP v13.0.0300, v12.1.2200 | *Good/Better/Best*: 1Gbps, 200Mbps, 25Mbps |
+| [v4.1.0.0](https://github.com/F5Networks/f5-azure-arm-templates/releases/tag/v4.1.0.0) | Standalone | BIG-IP v13.0.021, v12.1.24 | *Good/Better/Best*: 1Gbps, 200Mbps, 25Mbps |
+|  | Cluster | BIG-IP v13.0.021, v12.1.24 | *Good/Better/Best*: 1Gbps, 200Mbps, 25Mbps |
+|  | Auto Scale WAF | BIG-IP v13.0.021, v12.1.24 | *Best*: 1Gbps, 200Mbps, 25Mbps |
+|  | Auto Scale LTM | BIG-IP v13.0.021, v12.1.24 | *Good/Better/Best*: 1Gbps, 200Mbps, 25Mbps |
+|  | HA-AVSET | BIG-IP v13.0.021, v12.1.24 | *Good/Better/Best*: 1Gbps, 200Mbps, 25Mbps |
 | [v4.0.0.0](https://github.com/F5Networks/f5-azure-arm-templates/releases/tag/v4.0.0.0) | Standalone | BIG-IP v13.0.021, v12.1.24 | *Good/Better/Best*: 1Gbps, 200Mbps, 25Mbps |
 |  | Cluster | BIG-IP v13.0.021, v12.1.24 | *Good/Better/Best*: 1Gbps, 200Mbps, 25Mbps |
 |  | Auto Scale WAF | BIG-IP v13.0.021, v12.1.24 | *Best*: 1Gbps, 200Mbps, 25Mbps |

azure-bigip-version-matrix.md

@@ -9,11 +9,11 @@ Refer to the [Azure ARM Template Matrix](https://github.com/F5Networks/f5-azure-
 1.  Determine the F5 ARM template you want to deploy (for example, standalone, 1-NIC).
 2.  Select the release Tag that corresponds to the template.  To select the release tag:
   *  Go to the F5 ARM Template main page (https://github.com/F5Networks/f5-azure-arm-templates).  
-  *  From the **Branch** list, click the arrow, and then click the **Tags** tab.  ![Finding tagged releases](images/tag-location.png)<br>  
+  *  From the **Branch** list, click the arrow, and then click the **Tags** tab. <br> ![Finding tagged releases](images/tag-location.png)<br>  
   *  Select the Tagged version that contains the template you want to update.  
 3.  Browse to the template file (**azuredeploy.json**) which contains the BIG-IP image you want to replace.  For example, for a 1-NIC, new stack, PAYG template, we click **supported > standalone > 1nic > new_stack > PAYG > azuredeploy.json**.
 4.  Click the **Raw** button and save the file locally.  
-5.  Open the azuredeploy.json file and search for the BIG-IP version (image SKU) you want to replace (for example, **13.0.021**).  Replace this number with the new BIG-IP version (image SKU) everywhere it appears in the file.   The following is a snippet of the file showing where you would change the version.
+5.  Open the azuredeploy.json file and search for the BIG-IP version (image SKU) you want to replace (for example, **13.0.021**).  Replace this number with the new BIG-IP version (image SKU) everywhere it appears in the file (for example, with **13.0.0300**) .   The following is a snippet of the file showing where you would change the version.
     ```
     "bigIpVersion": {
             "allowedValues": [

azure-update-bigip-image.md

@@ -61,6 +61,7 @@ prereq_text:
   asm_sync: '**Important**: After the template successfully deploys, you must log into one of the BIG-IP VEs to modify the Application Security Synchronization settings.  Log in to the BIG-IP VE, and then click **Security > Options > Synchronization > Application Security Synchronization**.  From the **Device Group** list, select **Sync**, and then click **Save**. This ensures any changes to the ASM security policy are synchronized to other devices in the cluster.'
   tg_config: 'This template now supports associating Azure Public IP Address resources with up to two BIG-IP traffic groups, allowing each BIG-IP VE device to process traffic for applications associated with the traffic group for which the device is active.  See [Traffic Group Configuration](#traffic-group-configuration) for instructions.'
   failover_log: 'The BIG-IP VE failover log can be found at **/var/tmp/azureFailover.log**.'
+  ha_avset: 'F5 recommends you deploy this template into a unique Azure resource group.  Deploying into a resource group with other BIG-IP virtual machines can cause unexpected results.'
 
 help_text:
   supported: 'Because this template has been created and fully tested by F5 Networks, it is fully supported by F5. This means you can get assistance if necessary from [F5 Technical Support](https://support.f5.com/csp/article/K40701984).'
@@ -81,8 +82,8 @@ license_text:
   BIG-IQ: ': This allows you to launch the template using an existing BIG-IQ device with a pool of licenses to license the BIG-IP VE(s).'
 
 license_map:
-  13.0.021: '13.0.0 HF2 Build 2.10.1671'
-  12.1.24: '12.1.2 HF1 Build 1.34.271'
+  13.0.0300: '13.0.0 HF3 Build 3.0.1679'
+  12.1.2200: '12.1.2 HF2 Build 2.0.276'
   latest: 'This will select the latest BIG-IP version available'
 
 parameter_list:

build/files/readme_files/template_text.yaml

@@ -39,19 +39,19 @@
 route_add_cmd = ""
 
 ## Static Variable Assignment ##
-content_version = '4.1.0.0'
-f5_networks_tag = 'v4.1.0.0'
+content_version = '4.2.0.0'
+f5_networks_tag = 'v4.2.0.0'
 f5_cloud_libs_tag = 'v3.4.2'
 f5_cloud_libs_azure_tag = 'v1.3.0'
 f5_cloud_iapps_tag = 'v1.1.1'
 f5_cloud_workers_tag = 'v1.0.0'
 f5_tag = '82e08e16-fc62-4bf0-8916-e1c02dc871cd'
 f5_template_tag = template_name
 # Set BIG-IP versions to allow
-default_big_ip_version = '13.0.021'
-allowed_big_ip_versions = ["13.0.021", "12.1.24", "latest"]
-version_port_map = {"latest": {"Port": 8443}, "13.0.021": {"Port": 8443}, "12.1.24": {"Port": 443}, "443": {"Port": 443}}
-route_cmd_array = {"latest": "route", "13.0.021": "route", "12.1.24": "[concat('route add 168.63.129.16 gw ', variables('mgmtRouteGw'), ' eth0')]"}
+default_big_ip_version = '13.0.0300'
+allowed_big_ip_versions = ["13.0.0300", "12.1.2200", "latest"]
+version_port_map = {"latest": {"Port": 8443}, "13.0.0300": {"Port": 8443}, "12.1.2200": {"Port": 443}, "443": {"Port": 443}}
+route_cmd_array = {"latest": "route", "13.0.0300": "route", "12.1.2200": "[concat('route add 168.63.129.16 gw ', variables('mgmtRouteGw'), ' eth0')]"}
 
 install_cloud_libs = """[concat(variables('singleQuote'), '#!/bin/bash\necho about to execute\nchecks=0\nwhile [ $checks -lt 120 ]; do echo checking mcpd\n/usr/bin/tmsh -a show sys mcp-state field-fmt | grep -q running\nif [ $? == 0 ]; then\necho mcpd ready\nbreak\nfi\necho mcpd not ready yet\nlet checks=checks+1\nsleep 1\ndone\necho loading verifyHash script\n/usr/bin/tmsh load sys config merge file /config/verifyHash\nif [ $? != 0 ]; then\necho cannot validate signature of /config/verifyHash\nexit 1\nfi\necho loaded verifyHash\n\nconfig_loc="/config/cloud/"\nhashed_file_list="<HASHED_FILE_LIST>"\nfor file in $hashed_file_list; do\necho "verifying $file"\n/usr/bin/tmsh run cli script verifyHash $file\nif [ $? != 0 ]; then\necho "$file is not valid"\nexit 1\nfi\necho "verified $file"\ndone\necho "expanding $hashed_file_list"\ntar xvfz /config/cloud/f5-cloud-libs.tar.gz -C /config/cloud/azure/node_modules\n<TAR_LIST>touch /config/cloud/cloudLibsReady', variables('singleQuote'))]"""
 

build/master_template.py

@@ -197,6 +197,7 @@ def create(self, data, i_data):
             extra_prereq_text += '  - ' + self.get_custom_text('prereq_text', 'udr_tags') + '\n'
             extra_prereq_text += '  - ' + self.get_custom_text('prereq_text', 'tg_config') + '\n'
             extra_prereq_text += '  - ' + self.get_custom_text('prereq_text', 'failover_log') + '\n'
+            extra_prereq_text += '  - ' + self.get_custom_text('prereq_text', 'ha_avset') + '\n'
             tg_config_text = self.misc_readme_grep('<TG_CONFIG_TEXT>')
         if template_name in ('waf_autoscale'):
             extra_prereq_text += '  - ' + self.get_custom_text('prereq_text', 'asm_sync') + '\n'

build/readme_generator.py

@@ -1,6 +1,6 @@
 {
     "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json", 
-    "contentVersion": "4.1.0.0", 
+    "contentVersion": "4.2.0.0", 
     "parameters": {
         "numberOfInstances": {
             "allowedValues": [
@@ -108,11 +108,11 @@
         }, 
         "bigIpVersion": {
             "allowedValues": [
-                "13.0.021", 
-                "12.1.24", 
+                "13.0.0300", 
+                "12.1.2200", 
                 "latest"
             ], 
-            "defaultValue": "13.0.021", 
+            "defaultValue": "13.0.0300", 
             "metadata": {
                 "description": "F5 BIG-IP version you want to use."
             }, 
@@ -234,10 +234,10 @@
             }
         }, 
         "bigIpVersionPortMap": {
-            "12.1.24": {
+            "12.1.2200": {
                 "Port": 443
             }, 
-            "13.0.021": {
+            "13.0.0300": {
                 "Port": 8443
             }, 
             "443": {
@@ -260,7 +260,7 @@
         "f5TemplateTag": "cluster_1nic", 
         "f5CloudLibsTag": "v3.4.2", 
         "f5CloudLibsAzureTag": "v1.3.0", 
-        "f5NetworksTag": "v4.1.0.0", 
+        "f5NetworksTag": "v4.2.0.0", 
         "f5CloudIappsTag": "v1.1.1", 
         "verifyHash": "[concat(variables('singleQuote'), 'cli script /Common/verifyHash {\nproc script::run {} {\n        if {[catch {\n            set hashes(f5-cloud-libs.tar.gz) 5b5035fe7e1d98260be409cc29d65da49bcaaa9becb4124b308023ce8790439356a2b85de4ce5a4433532967e1d5f13379e98eeadcf251b607032f47481d832f\n            set hashes(f5-cloud-libs-aws.tar.gz) 279254b05d175df4ba1155fa810b3ea66a38e69198d7a6840ac9443ce730a5997e12c3b76af76ebadf13550d8bb0d45a5b09badfff4aac89e75d121bc166358d\n            set hashes(f5-cloud-libs-azure.tar.gz) 3c52145334fe80da577f980cdfbb1ef71fa4284b2f7fb4fa6f241cf50528e9fdc8df088a8312c3f6b90d3db198c787f7c10739e4098efb071cc29bf0ed70437b\n            set hashes(f5-cloud-libs-gce.tar.gz) 6ef33cc94c806b1e4e9e25ebb96a20eb1fe5975a83b2cd82b0d6ccbc8374be113ac74121d697f3bfc26bf49a55e948200f731607ce9aa9d23cd2e81299a653c1\n            set hashes(asm-policy-linux.tar.gz) 63b5c2a51ca09c43bd89af3773bbab87c71a6e7f6ad9410b229b4e0a1c483d46f1a9fff39d9944041b02ee9260724027414de592e99f4c2475415323e18a72e0\n            set hashes(f5.http.v1.2.0rc4.tmpl) 47c19a83ebfc7bd1e9e9c35f3424945ef8694aa437eedd17b6a387788d4db1396fefe445199b497064d76967b0d50238154190ca0bd73941298fc257df4dc034\n            set hashes(f5.http.v1.2.0rc6.tmpl) 811b14bffaab5ed0365f0106bb5ce5e4ec22385655ea3ac04de2a39bd9944f51e3714619dae7ca43662c956b5212228858f0592672a2579d4a87769186e2cbfe\n            set hashes(f5.http.v1.2.0rc7.tmpl) 21f413342e9a7a281a0f0e1301e745aa86af21a697d2e6fdc21dd279734936631e92f34bf1c2d2504c201f56ccd75c5c13baa2fe7653213689ec3c9e27dff77d\n            set hashes(f5.aws_advanced_ha.v1.3.0rc1.tmpl) 9e55149c010c1d395abdae3c3d2cb83ec13d31ed39424695e88680cf3ed5a013d626b326711d3d40ef2df46b72d414b4cb8e4f445ea0738dcbd25c4c843ac39d\n            set hashes(f5.aws_advanced_ha.v1.4.0rc1.tmpl) de068455257412a949f1eadccaee8506347e04fd69bfb645001b76f200127668e4a06be2bbb94e10fefc215cfc3665b07945e6d733cbe1a4fa1b88e881590396\n            set hashes(asm-policy.tar.gz) 2d39ec60d006d05d8a1567a1d8aae722419e8b062ad77d6d9a31652971e5e67bc4043d81671ba2a8b12dd229ea46d205144f75374ed4cae58cefa8f9ab6533e6\n            set hashes(deploy_waf.sh) 7ac8caac0f4e6f3907cd541a2d905931e97cd0220b443403dfbaaa30f3cad615fcd9420a3123327c2609441bd4a87d86a1a35b7567dbe78e3f97bd954a3cc5df\n            set hashes(f5.policy_creator.tmpl) 06539e08d115efafe55aa507ecb4e443e83bdb1f5825a9514954ef6ca56d240ed00c7b5d67bd8f67b815ee9dd46451984701d058c89dae2434c89715d375a620\n            set hashes(f5.service_discovery.tmpl) d4008a2c5a7f26cc42eb5cbe2171e15e6e95afb1b34fb03d04f6c1b80f154d896e6faaa2e04fbb85fd8e0e51b479dbfcd286357ce0967b162233cc57e0138b96\n\n            set file_path [lindex $tmsh::argv 1]\n            set file_name [file tail $file_path]\n\n            if {![info exists hashes($file_name)]} {\n                tmsh::log err \"No hash found for $file_name\"\n                exit 1\n            }\n\n            set expected_hash $hashes($file_name)\n            set computed_hash [lindex [exec /usr/bin/openssl dgst -r -sha512 $file_path] 0]\n            if { $expected_hash eq $computed_hash } {\n                exit 0\n            }\n            tmsh::log err \"Hash does not match for $file_path\"\n            exit 1\n        }]} {\n            tmsh::log err {Unexpected error in verifyHash}\n            exit 1\n        }\n    }\n    script-signature Ta4Gw6Snzfn7VC9D1S4f5CZiYfFyxDJWJTUEAbQ17i5ZQ2CPuQ8TBiNQy2Z/s3mmiJ2ZYdPTTST8FfTq5DsWobvZt1eQrsLjV9TR+FVyPzL2ePOBPmofUq/TKV2RhF1Vhm7mIEk+YbkxTmwaNnba1dLWj9KY7lN5ue6t1PfqqZmHQuMaOtywn0bX+Jhp0VdrS70PkH4NkRmFHVzuoC+NmMXLagr198yXW3IAHu7aViWFj8F4Y+asI8HO2+dAJ3srd/y00RjfNBANvXpEZHoi2hU4uLHuqBiJRa+4L2ADmj+x3a4Q1hVTxCCVWoItrUbPheQqgVOXpr4h7vdAL/eI/w==\n    signing-key /Common/f5-irule\n}', variables('singleQuote'))]", 
         "installCloudLibs": "[concat(variables('singleQuote'), '#!/bin/bash\necho about to execute\nchecks=0\nwhile [ $checks -lt 120 ]; do echo checking mcpd\n/usr/bin/tmsh -a show sys mcp-state field-fmt | grep -q running\nif [ $? == 0 ]; then\necho mcpd ready\nbreak\nfi\necho mcpd not ready yet\nlet checks=checks+1\nsleep 1\ndone\necho loading verifyHash script\n/usr/bin/tmsh load sys config merge file /config/verifyHash\nif [ $? != 0 ]; then\necho cannot validate signature of /config/verifyHash\nexit 1\nfi\necho loaded verifyHash\n\nconfig_loc=\"/config/cloud/\"\nhashed_file_list=\"${config_loc}f5-cloud-libs.tar.gz f5.service_discovery.tmpl\"\nfor file in $hashed_file_list; do\necho \"verifying $file\"\n/usr/bin/tmsh run cli script verifyHash $file\nif [ $? != 0 ]; then\necho \"$file is not valid\"\nexit 1\nfi\necho \"verified $file\"\ndone\necho \"expanding $hashed_file_list\"\ntar xvfz /config/cloud/f5-cloud-libs.tar.gz -C /config/cloud/azure/node_modules\ntouch /config/cloud/cloudLibsReady', variables('singleQuote'))]", 
@@ -457,7 +457,7 @@
             }, 
             "Yes": {
                 "hashCmd": "[concat('custId=`echo \"', variables('subscriptionId'), '\"|sha512sum|cut -d \" \" -f 1`; deployId=`echo \"', variables('deploymentId'), '\"|sha512sum|cut -d \" \" -f 1`')]", 
-                "metricsCmd": "[concat(' --metrics customerId:${custId},deploymentId:${deployId},templateName:cluster_1nic-existing_stack-experimental,templateVersion:4.1.0.0,region:', variables('location'), ',bigIpVersion:', parameters('bigIpVersion') ,',licenseType:BIGIQ,cloudLibsVersion:', variables('f5CloudLibsTag'), ',cloudName:azure')]"
+                "metricsCmd": "[concat(' --metrics customerId:${custId},deploymentId:${deployId},templateName:cluster_1nic-existing_stack-experimental,templateVersion:4.2.0.0,region:', variables('location'), ',bigIpVersion:', parameters('bigIpVersion') ,',licenseType:BIGIQ,cloudLibsVersion:', variables('f5CloudLibsTag'), ',cloudName:azure')]"
             }
         }, 
         "customConfig": "### START (INPUT) CUSTOM CONFIGURATION HERE\n", 

experimental/cluster/1nic/existing_stack/BIGIQ/azuredeploy.json

@@ -1,6 +1,6 @@
 {
     "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", 
-    "contentVersion": "4.1.0.0", 
+    "contentVersion": "4.2.0.0", 
     "parameters": {
         "numberOfInstances": {
             "value": 2
@@ -21,7 +21,7 @@
             "value": "Good"
         }, 
         "bigIpVersion": {
-            "value": "13.0.021"
+            "value": "13.0.0300"
         }, 
         "bigIqLicenseHost": {
             "value": "GEN_UNIQUE"