Skip to content
This repository was archived by the owner on Dec 4, 2023. It is now read-only.

Commit 1b16d91

Browse files
committed
Commit for 4.4.0.1
1 parent bc4a2fd commit 1b16d91

File tree

343 files changed

+881
-1558
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

343 files changed

+881
-1558
lines changed

README.md

+72-60
Large diffs are not rendered by default.

azure-bigip-version-matrix.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ The following table contains all of the tagged releases of the F5 ARM templates
33

44
| Release Tag | Template Family | BIG-IP Versions | License Bundles and Throughput Rates |
55
| --- | --- | --- | --- |
6+
| [v4.4.0.1](https://github.com/F5Networks/f5-azure-arm-templates/releases/tag/v4.4.0.1) | Standalone | BIG-IP v13.1.0200 | *Good/Better/Best*: 1Gbps, 200Mbps, 25Mbps |
67
| [v4.4.0.0](https://github.com/F5Networks/f5-azure-arm-templates/releases/tag/v4.4.0.0) | Standalone | BIG-IP v13.1.0200, v13.0.0300, v12.1.2200 | *Good/Better/Best*: 1Gbps, 200Mbps, 25Mbps |
78
| | Cluster | BIG-IP v13.1.0200, BIG-IP v13.0.0300, v12.1.2200 | *Good/Better/Best*: 1Gbps, 200Mbps, 25Mbps |
89
| | Auto Scale WAF | BIG-IP v13.1.0200, BIG-IP v13.0.0300, v12.1.2200 | *Best*: 1Gbps, 200Mbps, 25Mbps |

build/build_arm.sh

100644100755
File mode changed.

build/files/readme_files/base.README.md

+2
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ Additionally, F5 provides checksums for all of our supported templates. For inst
5353
## Supported BIG-IP versions
5454
The following is a map that shows the available options for the template parameter **bigIpVersion** as it corresponds to the BIG-IP version itself. Only the latest version of BIG-IP VE is posted in the Azure Marketplace. For older versions, see downloads.f5.com.
5555

56+
**NOTE**: Due to changes within the Azure environment, only BIG-IP version 13.1.0200 is available (even if you select **Latest** in the template). We will update the template to include a new BIG-IP v12.1 image as soon as it is available.
57+
5658
| Azure BIG-IP Image Version | BIG-IP Version |
5759
| --- | --- |
5860
<VERSION_MAP_TXT>

build/files/readme_files/template_text.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ license_text:
166166
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).'
167167
license_map:
168168
13.1.0200: '13.1.0 Build 0.0.6'
169-
13.0.0300: '13.0.0 HF3 Build 3.0.1679'
170169
12.1.2200: '12.1.2 HF2 Build 2.0.276'
171170
latest: 'This will select the latest BIG-IP version available'
172171
# Parameter text used in the template parameters and then subsequently the README's

build/files/script_files/base.deploy_via_bash.sh

100644100755
File mode changed.

build/master_template.py

+8-9
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,18 @@
3939
route_add_cmd = ""
4040

4141
## Static Variable Assignment ##
42-
content_version = '4.4.0.0'
43-
f5_networks_tag = 'v4.4.0.0'
42+
content_version = '4.4.0.1'
43+
f5_networks_tag = 'v4.4.0.1'
4444
f5_cloud_libs_tag = 'v3.6.2'
4545
f5_cloud_libs_azure_tag = 'v1.5.0'
4646
f5_cloud_iapps_tag = 'v1.2.1'
4747
f5_cloud_workers_tag = 'v1.0.0'
4848
# Set BIG-IP versions to allow
4949
default_big_ip_version = '13.1.0200'
50-
allowed_big_ip_versions = ["13.1.0200", "13.0.0300", "12.1.2200", "latest"]
51-
version_port_map = {"latest": {"Port": 8443}, "13.1.0200": {"Port": 8443}, "13.0.0300": {"Port": 8443}, "12.1.2200": {"Port": 443}, "443": {"Port": 443}}
52-
route_cmd_array = {"latest": "route", "13.1.0200": "route", "13.0.0300": "route", "12.1.2200": "[concat('tmsh create sys management-route waagent_route network 168.63.129.16/32 gateway ', variables('mgmtRouteGw'), '; tmsh save sys config')]"}
50+
allowed_big_ip_versions = ["13.1.0200", "latest"]
51+
version_port_map = {"latest": {"Port": 8443}, "13.1.0200": {"Port": 8443}, "12.1.2200": {"Port": 443}, "443": {"Port": 443}}
52+
route_cmd_array = {"latest": "route", "13.1.0200": "route", "12.1.2200": "[concat('tmsh create sys management-route waagent_route network 168.63.129.16/32 gateway ', variables('mgmtRouteGw'), '; tmsh save sys config')]"}
5353
network_mtu_array = {"12.1.2200": "[concat('tmsh modify net vlan internal mtu 1400; RUN_NETWORK=0; EXT_ROUTE=\"\"')]",
54-
"13.0.0300": "[concat('tmsh modify sys global-settings mgmt-dhcp disabled; tmsh save sys config; tmsh modify net vlan internal mtu 1400; RUN_NETWORK=1; EXT_ROUTE=\"\"')]",
5554
"13.1.0200": "[concat('tmsh modify sys global-settings mgmt-dhcp disabled; tmsh save sys config; RUN_NETWORK=1; EXT_ROUTE=\"--route name:ext_route,gw:', variables('mgmtRouteGw'), ',network:168.63.129.16/32\"')]",
5655
"latest": "[concat('tmsh modify sys global-settings mgmt-dhcp disabled; tmsh save sys config; RUN_NETWORK=1; EXT_ROUTE=\"--route name:ext_route,gw:', variables('mgmtRouteGw'), ',network:168.63.129.16/32\"')]"
5756
}
@@ -119,7 +118,7 @@
119118
## Determine PAYG/BYOL/BIGIQ variables
120119
image_to_use = "[parameters('bigIpVersion')]"
121120
sku_to_use = "[concat('f5-bigip-virtual-edition-', variables('imageNameToLower'),'-byol')]"
122-
offer_to_use = "[if(or(equals(parameters('bigIpVersion'), '12.1.2200'), equals(parameters('bigIpVersion'), '13.0.0300')), 'f5-big-ip', concat('f5-big-ip-', variables('imageNameToLower')))]"
121+
offer_to_use = "[if(equals(parameters('bigIpVersion'), '12.1.2200'), 'f5-big-ip', concat('f5-big-ip-', variables('imageNameToLower')))]"
123122
license1_command = ''
124123
license2_command = ''
125124
big_iq_pwd_cmd = ''
@@ -129,7 +128,7 @@
129128
license2_command = "' --license ', parameters('licenseKey2'),"
130129
elif license_type == 'PAYG':
131130
sku_to_use = "[concat('f5-bigip-virtual-edition-', parameters('licensedBandwidth'), '-', variables('imageNameToLower'),'-hourly')]"
132-
offer_to_use = "[if(or(equals(parameters('bigIpVersion'), '12.1.2200'), equals(parameters('bigIpVersion'), '13.0.0300')), 'f5-big-ip-hourly', concat('f5-big-ip-', variables('imageNameToLower')))]"
131+
offer_to_use = "[if(equals(parameters('bigIpVersion'), '12.1.2200'), 'f5-big-ip-hourly', concat('f5-big-ip-', variables('imageNameToLower')))]"
133132
elif license_type == 'BIGIQ':
134133
big_iq_mgmt_ip_ref = ''
135134
big_iq_mgmt_ip_ref2 = ''
@@ -333,7 +332,7 @@
333332
data['variables']["intLbId"] = "[resourceId('Microsoft.Network/loadBalancers',variables('internalLoadBalancerName'))]"
334333
data['variables']['failoverCmdArray'] = {"No": {"first": "[concat('tmsh modify cm device ', concat(variables('instanceName'), '0.', resourceGroup().location, '.cloudapp.azure.com'), ' unicast-address none')]", "second": "[concat('tmsh modify cm device ', concat(variables('instanceName'), '1.', resourceGroup().location, '.cloudapp.azure.com'), ' unicast-address none')]" }, "Yes": {"first": "[concat('tmsh modify cm device ', concat(variables('instanceName'), '0.', resourceGroup().location, '.cloudapp.azure.com'), ' unicast-address { { ip ', variables('intSubnetPrivateAddress'), ' port 1026 } } mirror-ip ', variables('intSubnetPrivateAddress'))]", "second": "[concat('tmsh modify cm device ', concat(variables('instanceName'), '1.', resourceGroup().location, '.cloudapp.azure.com'), ' unicast-address { { ip ', variables('intSubnetPrivateAddress1'), ' port 1026 } } mirror-ip ', variables('intSubnetPrivateAddress1'))]"}}
335334
if template_name in ('ha-avset'):
336-
data['variables']['failoverCmdArray'] = { "12.1.2200": "echo \"Failover db variable not required.\"", "13.0.0300": "echo \"Failover db variable not required.\"", "13.1.0200": "tmsh modify sys db failover.selinuxallowscripts value enable", "latest": "tmsh modify sys db failover.selinuxallowscripts value enable" }
335+
data['variables']['failoverCmdArray'] = { "12.1.2200": "echo \"Failover db variable not required.\"", "13.1.0200": "tmsh modify sys db failover.selinuxallowscripts value enable", "latest": "tmsh modify sys db failover.selinuxallowscripts value enable" }
337336
if stack_type == 'new_stack':
338337
data['variables']['vnetId'] = "[resourceId('Microsoft.Network/virtualNetworks', variables('virtualNetworkName'))]"
339338
data['variables']['vnetAddressPrefix'] = "[concat(parameters('vnetAddressPrefix'),'.0.0/16')]"

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

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json",
3-
"contentVersion": "4.4.0.0",
3+
"contentVersion": "4.4.0.1",
44
"parameters": {
55
"numberOfInstances": {
66
"allowedValues": [
@@ -109,8 +109,6 @@
109109
"bigIpVersion": {
110110
"allowedValues": [
111111
"13.1.0200",
112-
"13.0.0300",
113-
"12.1.2200",
114112
"latest"
115113
],
116114
"defaultValue": "13.1.0200",
@@ -238,9 +236,6 @@
238236
"12.1.2200": {
239237
"Port": 443
240238
},
241-
"13.0.0300": {
242-
"Port": 8443
243-
},
244239
"13.1.0200": {
245240
"Port": 8443
246241
},
@@ -261,14 +256,14 @@
261256
"singleQuote": "'",
262257
"f5CloudLibsTag": "v3.6.2",
263258
"f5CloudLibsAzureTag": "v1.5.0",
264-
"f5NetworksTag": "v4.4.0.0",
259+
"f5NetworksTag": "v4.4.0.1",
265260
"f5CloudIappsTag": "v1.2.1",
266261
"verifyHash": "[concat(variables('singleQuote'), 'cli script /Common/verifyHash {\nproc script::run {} {\n if {[catch {\n set hashes(f5-cloud-libs.tar.gz) 4cf5edb76d2e8dd0493f4892ff3679a58c8c79b1c02e550b55150d9002228c24c6d841095f1edd33fb49c5aaea518771252b4fb6d423a8a4ba8d94a0baf0f77a\n set hashes(f5-cloud-libs-aws.tar.gz) 1a4ba191e997b2cfaaee0104deccc0414a6c4cc221aedc65fbdec8e47a72f1d5258b047d6487a205fa043fdbd6c8fcb1b978cac36788e493e94a4542f90bd92b\n set hashes(f5-cloud-libs-azure.tar.gz) 5c256d017d0a57f5c96c2cb43f4d8b76297ae0b91e7a11c6d74e5c14268232f6a458bf0c16033b992040be076e934392c69f32fc8beffe070b5d84924ec7b947\n set hashes(f5-cloud-libs-gce.tar.gz) 6ef33cc94c806b1e4e9e25ebb96a20eb1fe5975a83b2cd82b0d6ccbc8374be113ac74121d697f3bfc26bf49a55e948200f731607ce9aa9d23cd2e81299a653c1\n set hashes(f5-cloud-libs-openstack.tar.gz) fb6d63771bf0c8d9cae9271553372f7fb50ce2e7a653bb3fb8b7d57330a18d72fa620e844b579fe79c8908a3873b2d33ee41803f23ea6c5dc9f7d7e943e68c3a\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(f5.aws_advanced_ha.v1.4.0rc2.tmpl) 6ab0bffc426df7d31913f9a474b1a07860435e366b07d77b32064acfb2952c1f207beaed77013a15e44d80d74f3253e7cf9fbbe12a90ec7128de6facd097d68f\n set hashes(asm-policy.tar.gz) 2d39ec60d006d05d8a1567a1d8aae722419e8b062ad77d6d9a31652971e5e67bc4043d81671ba2a8b12dd229ea46d205144f75374ed4cae58cefa8f9ab6533e6\n set hashes(deploy_waf.sh) eebaf8593a29fa6e28bb65942d2b795edca0da08b357aa06277b0f4d2f25fe416da6438373f9955bdb231fa1de1a7c8d0ba7c224fa1f09bd852006070d887812\n set hashes(f5.policy_creator.tmpl) 06539e08d115efafe55aa507ecb4e443e83bdb1f5825a9514954ef6ca56d240ed00c7b5d67bd8f67b815ee9dd46451984701d058c89dae2434c89715d375a620\n set hashes(f5.service_discovery.tmpl) acc7c482a1eb8787a371091f969801b422cb92830b46460a3313b6a8e1cda0759f8013380e0c46d5214a351a248c029ec3ff04220aaef3e42a66badf9804041f\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 Kir5DhV/uRo0SwVRgPGrnNnAJBgHZ3XYraih5T90VbRZii5vPt0q3codJUdgoWiByQGpFREsa5Gy+v0+yYDAdYBzyZlThwRe+6RjWYfxP2+cKAC28wByJ0x6En1UD9kscj7ILUON5yv771izvIrxJ7x4Fd4RHcqB5++hWLvOLxXMiyJAYh2aUSOgdc+kx4lCHS6IU0aXtUxAQYpq510k4eS4UZJrfE7GPmpYkpRDJivR8UUyUWtuj0CAt3pWQEijKnC5zHhH6q5ikvQFn05PugcZO7RzOaA/a2gZw609wYAkXODMA6L49l+IKB31Y+/5ROB1w9/wf/H5RiP/kXC5/A==\n signing-key /Common/f5-irule\n}', variables('singleQuote'))]",
267262
"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 xfz /config/cloud/f5-cloud-libs.tar.gz -C /config/cloud/azure/node_modules\ntouch /config/cloud/cloudLibsReady', variables('singleQuote'))]",
268263
"dnsLabel": "[toLower(parameters('dnsLabel'))]",
269264
"imageNameToLower": "[toLower(parameters('imageName'))]",
270265
"skuToUse": "[concat('f5-bigip-virtual-edition-', variables('imageNameToLower'),'-byol')]",
271-
"offerToUse": "[if(or(equals(parameters('bigIpVersion'), '12.1.2200'), equals(parameters('bigIpVersion'), '13.0.0300')), 'f5-big-ip', concat('f5-big-ip-', variables('imageNameToLower')))]",
266+
"offerToUse": "[if(equals(parameters('bigIpVersion'), '12.1.2200'), 'f5-big-ip', concat('f5-big-ip-', variables('imageNameToLower')))]",
272267
"bigIpNicPortValue": "[variables('bigIpNicPortMap')['1'].Port]",
273268
"bigIpMgmtPort": "[variables('bigIpVersionPortMap')[variables('bigIpNicPortValue')].Port]",
274269
"availabilitySetName": "[concat(variables('dnsLabel'), '-avset')]",
@@ -512,7 +507,7 @@
512507
},
513508
"Yes": {
514509
"hashCmd": "[concat('custId=`echo \"', variables('subscriptionId'), '\"|sha512sum|cut -d \" \" -f 1`; deployId=`echo \"', variables('deploymentId'), '\"|sha512sum|cut -d \" \" -f 1`')]",
515-
"metricsCmd": "[concat(' --metrics customerId:${custId},deploymentId:${deployId},templateName:cluster_1nic-existing_stack-experimental,templateVersion:4.4.0.0,region:', variables('location'), ',bigIpVersion:', parameters('bigIpVersion') ,',licenseType:BIGIQ,cloudLibsVersion:', variables('f5CloudLibsTag'), ',cloudName:azure')]"
510+
"metricsCmd": "[concat(' --metrics customerId:${custId},deploymentId:${deployId},templateName:cluster_1nic-existing_stack-experimental,templateVersion:4.4.0.1,region:', variables('location'), ',bigIpVersion:', parameters('bigIpVersion') ,',licenseType:BIGIQ,cloudLibsVersion:', variables('f5CloudLibsTag'), ',cloudName:azure')]"
516511
}
517512
},
518513
"customConfig": "### START (INPUT) CUSTOM CONFIGURATION HERE\n",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
3-
"contentVersion": "4.4.0.0",
3+
"contentVersion": "4.4.0.1",
44
"parameters": {
55
"numberOfInstances": {
66
"value": 2

0 commit comments

Comments
 (0)