Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1255,14 +1255,14 @@
}
},
{
"name": "additionalDiskSizeGB",
"name": "diskSizeGB",
"type": "Microsoft.Common.TextBox",
"label": "Additional disk space (GB)",
"defaultValue": "0",
"toolTip": "Additional disk space (in GB), initial disk size is 200 GB.",
"label": "OS disk size (GB)",
"defaultValue": "200",
"toolTip": "OS disk size (in GB). Must be between 100 and 3995. Not relevant for R81.10 and R81.20.",
"constraints": {
"regex": "^([0-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|399[0-5])$",
"validationMessage": "Select a number between 0 and 3995"
"regex": "^([1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|39[0-8][0-9]|399[0-5])$",
"validationMessage": "Select a number between 100 and 3995"
},
"visible": "[not(contains('R81.10 R81.20', steps('autoprovision').cloudGuardVersion))]"
},
Expand Down Expand Up @@ -1547,7 +1547,7 @@
"sicKey": "[steps('autoprovision').sicKeyUi]",
"bootstrapScript": "[steps('chkp-advanced').bootstrapScript]",
"allowDownloadFromUploadToCheckPoint": "[coalesce(steps('chkp-advanced').allowUploadDownload, 'true')]",
"additionalDiskSizeGB": "[int(steps('chkp-advanced').additionalDiskSizeGB)]",
"diskSizeGB": "[int(steps('chkp-advanced').diskSizeGB)]",
"diskType": "[if(contains('R81.10' , steps('autoprovision').cloudGuardVersion) , steps('chkp-advanced').VMDiskTypeOldVersions , steps('chkp-advanced').VMDiskType)]",
"sourceImageVhdUri": "[coalesce(steps('chkp-advanced').sourceImageVhdUri, 'noCustomUri')]",
"hyperVGeneration": "[if(not(or(equals(steps('autoprovision').cloudGuardVersion, 'R81.10'), equals(steps('autoprovision').cloudGuardVersion, 'R81.20'), equals(steps('autoprovision').cloudGuardVersion, 'R82'))), coalesce(steps('autoprovision').hyperVGeneration, 'V1'), coalesce(steps('autoprovision').hyperVGenerationLocked, 'V1'))]",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,13 +270,13 @@
"description": "The IP address used to manage the VMSS instances."
}
},
"additionalDiskSizeGB": {
"diskSizeGB": {
"type": "int",
"defaultValue": 0,
"defaultValue": 200,
"metadata": {
"description": "Amount of additional disk space (in GB), not relevant for R81.20 and below"
"description": "OS disk size (in GB). Must be between 100 and 3995. Not relevant for R81.10 and R81.20."
},
"minValue": 0,
"minValue": 100,
"maxValue": 3995
},
"diskType": {
Expand Down Expand Up @@ -1251,9 +1251,7 @@
"subnet1Name": "[parameters('subnet1Name')]",
"storageAccountName": "[concat('bootdiag', uniqueString(variables('resourceGroup').id, deployment().name))]",
"storageAccountType": "Standard_LRS",
"baseDiskSizeGB": 200,
"additionalDiskSizeGB": "[if(contains('R8110 R8120', variables('osVersion')), 0, parameters('additionalDiskSizeGB'))]",
"diskSizeGB": "[add(variables('additionalDiskSizeGB'), variables('baseDiskSizeGB'))]",
"diskSizeGB": "[if(contains('R8110 R8120', variables('osVersion')), 200, parameters('diskSizeGB'))]",
"vxlanParametersForR82": "kernel_parameters:\n sim:\n - sim_enable_vxlan=3\n - sim_enable_gre=3\n fw: \n - fw_enable_vxlan=1\n - fw_enable_gre=1",
"cloudConfigParams":[
"[concat('installationType=\\\"', variables('installationType'), '\\\"')]",
Expand Down
14 changes: 7 additions & 7 deletions azure/templates/marketplace-ha/createUiDefinition.json
Original file line number Diff line number Diff line change
Expand Up @@ -1352,14 +1352,14 @@
}
},
{
"name": "additionalDiskSizeGB",
"name": "diskSizeGB",
"type": "Microsoft.Common.TextBox",
"label": "Additional disk space (GB)",
"defaultValue": "0",
"toolTip": "Additional disk space (in GB), initial disk size is 200 GB.",
"label": "OS disk size (GB)",
"defaultValue": "200",
"toolTip": "OS disk size (in GB). Must be between 100 and 3995.",
"constraints": {
"regex": "^([0-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|399[0-5])$",
"validationMessage": "Select a number between 0 and 3995"
"regex": "^([1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|39[0-8][0-9]|399[0-5])$",
"validationMessage": "Select a number between 100 and 3995"
}
},
{
Expand Down Expand Up @@ -1951,7 +1951,7 @@
"virtualNetworkExistingRGName": "[steps('network').virtualNetwork.resourceGroup]",
"bootstrapScript": "[steps('chkp-advanced').bootstrapScript]",
"allowDownloadFromUploadToCheckPoint": "[coalesce(steps('chkp-advanced').allowUploadDownload, 'true')]",
"additionalDiskSizeGB": "[int(steps('chkp-advanced').additionalDiskSizeGB)]",
"diskSizeGB": "[int(steps('chkp-advanced').diskSizeGB)]",
"diskType": "[if(contains('R81.10' , steps('chkp').cloudGuardVersion) , steps('chkp-advanced').VMDiskTypeOldVersions , steps('chkp-advanced').VMDiskType)]",
"managedSystemAssigned": "[steps('chkp-advanced').managedSystemAssigned]",
"sourceImageVhdUri": "[coalesce(steps('chkp-advanced').sourceImageVhdUri, 'noCustomUri')]",
Expand Down
12 changes: 5 additions & 7 deletions azure/templates/marketplace-ha/mainTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,13 @@
"description": "Automatically download Blade Contracts and other important data. Improve product experience by sending data to Check Point"
}
},
"additionalDiskSizeGB": {
"diskSizeGB": {
"type": "int",
"defaultValue": 0,
"defaultValue": 200,
"metadata": {
"description": "Amount of additional disk space (in GB)"
"description": "OS disk size (in GB). Must be between 100 and 3995."
},
"minValue": 0,
"minValue": 100,
"maxValue": 3995
},
"diskType": {
Expand Down Expand Up @@ -1233,8 +1233,6 @@
"isBlink": true,
"storageAccountName": "[concat('bootdiag', uniqueString(resourceGroup().id, deployment().name))]",
"storageAccountType": "Standard_LRS",
"baseDiskSizeGB": 200,
"diskSizeGB": "[add(parameters('additionalDiskSizeGB'), variables('baseDiskSizeGB'))]",
"imageOffer": "[concat('check-point-cg-', toLower(variables('osVersion')))]",
"imagePublisher": "checkpoint",
"imageReferenceBYOL": {
Expand Down Expand Up @@ -1883,7 +1881,7 @@
"osDisk": {
"caching": "ReadWrite",
"createOption": "FromImage",
"diskSizeGB": "[variables('diskSizeGB')]",
"diskSizeGB": "[parameters('diskSizeGB')]",
"name": "[concat(parameters('vmName'), copyIndex(1))]",
"managedDisk": {
"storageAccountType": "[parameters('diskType')]"
Expand Down
14 changes: 7 additions & 7 deletions azure/templates/marketplace-management/createUiDefinition.json
Original file line number Diff line number Diff line change
Expand Up @@ -660,14 +660,14 @@
}
},
{
"name": "additionalDiskSizeGB",
"name": "diskSizeGB",
"type": "Microsoft.Common.TextBox",
"label": "Additional disk space (GB)",
"defaultValue": "0",
"toolTip": "Additional disk space (in GB), initial disk size is 200 GB.",
"label": "OS disk size (GB)",
"defaultValue": "200",
"toolTip": "OS disk size (in GB). Must be between 100 and 3995.",
"constraints": {
"regex": "^([0-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|399[0-5])$",
"validationMessage": "Select a number between 0 and 3995"
"regex": "^([1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|39[0-8][0-9]|399[0-5])$",
"validationMessage": "Select a number between 100 and 3995"
}
},
{
Expand Down Expand Up @@ -1038,7 +1038,7 @@
"installationType": "[steps('chkp-advanced').installationType]",
"bootstrapScript": "[steps('chkp-advanced').bootstrapScript]",
"allowDownloadFromUploadToCheckPoint": "[coalesce(steps('chkp-advanced').allowUploadDownload, 'true')]",
"additionalDiskSizeGB": "[int(steps('chkp-advanced').additionalDiskSizeGB)]",
"diskSizeGB": "[int(steps('chkp-advanced').diskSizeGB)]",
"msi" : "[steps('chkp-advanced').identityAccessManagement]",
"diskType": "[if(contains('R81.10' , steps('chkp').cloudGuardVersion) , steps('chkp-advanced').VMDiskTypeOldVersions , steps('chkp-advanced').VMDiskType)]",
"sourceImageVhdUri": "[coalesce(steps('chkp-advanced').sourceImageVhdUri, 'noCustomUri')]",
Expand Down
12 changes: 5 additions & 7 deletions azure/templates/marketplace-management/mainTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,13 @@
"description": "Automatically download Blade Contracts and other important data. Improve product experience by sending data to Check Point"
}
},
"additionalDiskSizeGB": {
"diskSizeGB": {
"type": "int",
"defaultValue": 0,
"defaultValue": 200,
"metadata": {
"description": "Amount of additional disk space (in GB)"
"description": "OS disk size (in GB). Must be between 100 and 3995."
},
"minValue": 0,
"minValue": 100,
"maxValue": 3995
},
"diskType": {
Expand Down Expand Up @@ -1147,8 +1147,6 @@
"useAZ": "[equals(parameters('availabilityZonesChoice'), 'Yes')]",
"storageAccountName": "[concat('bootdiag', uniqueString(resourceGroup().id, deployment().name))]",
"storageAccountType": "Standard_LRS",
"baseDiskSizeGB": 200,
"diskSizeGB": "[add(parameters('additionalDiskSizeGB'), variables('baseDiskSizeGB'))]",
"customData": "[concat('#!/usr/bin/python3 /etc/cloud_config.py\n', '\n', 'installationType=\"', parameters('installationType'), '\"', '\n', 'allowUploadDownload=\"', variables('allowUploadDownload'), '\"', '\n', 'osVersion=\"', variables('osVersion'), '\"', '\n', 'templateName=\"', variables('templateName'), '\"', '\n', 'isBlink=\"', variables('isBlink'), '\"', '\n', 'templateVersion=\"', variables('templateVersion'), '\"', '\n', 'bootstrapScript64=\"', variables('bootstrapScript64'), '\"', '\n', 'location=\"', variables('location'), '\"', '\n', 'managementGUIClientNetwork=\"', variables('managementGUIClientNetwork'), '\"', '\n', 'enableApi=\"', parameters('enableApi'), '\"', '\n', 'adminShell=\"', parameters('adminShell'), '\"', '\n', 'MaintenanceModePassword=\"', parameters('MaintenanceModePasswordHash'), '\"', '\n', 'passwordHash=\"', parameters('SerialConsolePasswordHash'), '\"', '\n')]",
"customData64": "[base64(variables('customData'))]",
"imageOffer": "[concat('check-point-cg-', toLower(variables('osVersion')))]",
Expand Down Expand Up @@ -1774,7 +1772,7 @@
"osDisk": {
"caching": "ReadWrite",
"createOption": "FromImage",
"diskSizeGB": "[variables('diskSizeGB')]",
"diskSizeGB": "[parameters('diskSizeGB')]",
"name": "[parameters('vmName')]",
"managedDisk": {
"storageAccountType": "[parameters('diskType')]"
Expand Down
14 changes: 7 additions & 7 deletions azure/templates/marketplace-mds/createUiDefinition.json
Original file line number Diff line number Diff line change
Expand Up @@ -512,14 +512,14 @@
}
},
{
"name": "additionalDiskSizeGB",
"name": "diskSizeGB",
"type": "Microsoft.Common.TextBox",
"label": "Additional disk space (GB)",
"defaultValue": "0",
"toolTip": "Additional disk space (in GB), initial disk size is 200 GB.",
"label": "OS disk size (GB)",
"defaultValue": "200",
"toolTip": "OS disk size (in GB). Must be between 100 and 3995.",
"constraints": {
"regex": "^([0-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|399[0-5])$",
"validationMessage": "Select a number between 0 and 3995"
"regex": "^([1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|39[0-8][0-9]|399[0-5])$",
"validationMessage": "Select a number between 100 and 3995"
}
},
{
Expand Down Expand Up @@ -838,7 +838,7 @@
"bootstrapScript": "[steps('chkp-advanced').bootstrapScript]",
"allowDownloadFromUploadToCheckPoint": "[coalesce(steps('chkp-advanced').allowUploadDownload, 'true')]",
"msi" : "[steps('chkp-advanced').identityAccessManagement]",
"additionalDiskSizeGB": "[int(steps('chkp-advanced').additionalDiskSizeGB)]",
"diskSizeGB": "[int(steps('chkp-advanced').diskSizeGB)]",
"diskType": "[if(contains('R81.10' , steps('chkp').cloudGuardVersion) , steps('chkp-advanced').VMDiskTypeOldVersions , steps('chkp-advanced').VMDiskType)]",
"sourceImageVhdUri": "[coalesce(steps('chkp-advanced').sourceImageVhdUri, 'noCustomUri')]",
"availabilityZones": "[if(equals(basics('availabilityZonesChoice'), 'Yes'), parse(concat('[\"', coalesce(basics('zoneDropdown'), '1'), '\"]')), parse('[]'))]",
Expand Down
12 changes: 5 additions & 7 deletions azure/templates/marketplace-mds/mainTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,13 @@
"description": "Automatically download Blade Contracts and other important data. Improve product experience by sending data to Check Point"
}
},
"additionalDiskSizeGB": {
"diskSizeGB": {
"type": "int",
"defaultValue": 0,
"defaultValue": 200,
"metadata": {
"description": "Amount of additional disk space (in GB)"
"description": "OS disk size (in GB). Must be between 100 and 3995."
},
"minValue": 0,
"minValue": 100,
"maxValue": 3995
},
"diskType": {
Expand Down Expand Up @@ -1098,8 +1098,6 @@
"logserver": "[equals(parameters('installationType'), 'mds-logserver')]",
"storageAccountName": "[concat('bootdiag', uniqueString(resourceGroup().id, deployment().name))]",
"storageAccountType": "Standard_LRS",
"baseDiskSizeGB": 200,
"diskSizeGB": "[add(parameters('additionalDiskSizeGB'), variables('baseDiskSizeGB'))]",
"customData": "[concat('#!/usr/bin/python3 /etc/cloud_config.py\n', '\n', 'installationType=\"', parameters('installationType'), '\"', '\n', 'allowUploadDownload=\"', variables('allowUploadDownload'), '\"', '\n', 'osVersion=\"', variables('osVersion'), '\"', '\n', 'templateName=\"', variables('templateName'), '\"', '\n', 'isBlink=\"', variables('isBlink'), '\"', '\n', 'templateVersion=\"', variables('templateVersion'), '\"', '\n', 'bootstrapScript64=\"', variables('bootstrapScript64'), '\"', '\n', 'location=\"', variables('location'), '\"', '\n', 'managementGUIClientNetwork=\"', variables('managementGUIClientNetwork'), '\"', '\n', 'sicKey=\"', parameters('sicKey'), '\"', '\n', 'primary=\"', variables('primary'), '\"', '\n', 'secondary=\"', variables('secondary'), '\"', '\n', 'logserver=\"', variables('logserver'), '\"', '\n', 'adminShell=\"', parameters('adminShell'), '\"', '\n', 'MaintenanceModePassword=\"', parameters('MaintenanceModePasswordHash'), '\"', '\n', 'passwordHash=\"', parameters('SerialConsolePasswordHash'), '\"', '\n')]",
"customData64": "[base64(variables('customData'))]",
"imageOffer": "[concat('check-point-cg-', toLower(variables('osVersion')))]",
Expand Down Expand Up @@ -1567,7 +1565,7 @@
"osDisk": {
"caching": "ReadWrite",
"createOption": "FromImage",
"diskSizeGB": "[variables('diskSizeGB')]",
"diskSizeGB": "[parameters('diskSizeGB')]",
"name": "[parameters('vmName')]",
"managedDisk": {
"storageAccountType": "[parameters('diskType')]"
Expand Down
14 changes: 7 additions & 7 deletions azure/templates/marketplace-single/createUiDefinition.json
Original file line number Diff line number Diff line change
Expand Up @@ -1345,14 +1345,14 @@
}
},
{
"name": "additionalDiskSizeGB",
"name": "diskSizeGB",
"type": "Microsoft.Common.TextBox",
"label": "Additional disk space (GB)",
"defaultValue": "0",
"toolTip": "Additional disk space (in GB), initial disk size is 200 GB.",
"label": "OS disk size (GB)",
"defaultValue": "200",
"toolTip": "OS disk size (in GB). Must be between 100 and 3995.",
"constraints": {
"regex": "^([0-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|399[0-5])$",
"validationMessage": "Select a number between 0 and 3995"
"regex": "^([1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-8][0-9][0-9]|39[0-8][0-9]|399[0-5])$",
"validationMessage": "Select a number between 100 and 3995"
}
},
{
Expand Down Expand Up @@ -1772,7 +1772,7 @@
"installationType": "[steps('chkp-advanced').installationType]",
"bootstrapScript": "[steps('chkp-advanced').bootstrapScript]",
"allowDownloadFromUploadToCheckPoint": "[coalesce(steps('chkp-advanced').allowUploadDownload, 'true')]",
"additionalDiskSizeGB": "[int(steps('chkp-advanced').additionalDiskSizeGB)]",
"diskSizeGB": "[int(steps('chkp-advanced').diskSizeGB)]",
"diskType": "[if(contains('R81.10' , steps('chkp').cloudGuardVersion) , steps('chkp-advanced').VMDiskTypeOldVersions , steps('chkp-advanced').VMDiskType)]",
"sourceImageVhdUri": "[coalesce(steps('chkp-advanced').sourceImageVhdUri, 'noCustomUri')]",
"hyperVGeneration": "[if(not(or(equals(steps('chkp').cloudGuardVersion, 'R81.10'), equals(steps('chkp').cloudGuardVersion, 'R81.20'), equals(steps('chkp').cloudGuardVersion, 'R82'))), coalesce(steps('chkp').hyperVGeneration, 'V1'), coalesce(steps('chkp').hyperVGenerationLocked, 'V1'))]",
Expand Down
12 changes: 5 additions & 7 deletions azure/templates/marketplace-single/mainTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,13 +269,13 @@
"description": "Automatically download Blade Contracts and other important data. Improve product experience by sending data to Check Point"
}
},
"additionalDiskSizeGB": {
"diskSizeGB": {
"type": "int",
"defaultValue": 0,
"defaultValue": 200,
"metadata": {
"description": "Amount of additional disk space (in GB)"
"description": "OS disk size (in GB). Must be between 100 and 3995."
},
"minValue": 0,
"minValue": 100,
"maxValue": 3995
},
"diskType": {
Expand Down Expand Up @@ -1235,8 +1235,6 @@
"useAZ": "[and(equals(parameters('extendedZone'), 'None'), equals(parameters('availabilityZonesChoice'), 'Yes'))]",
"storageAccountName": "[concat('bootdiag', uniqueString(resourceGroup().id, deployment().name))]",
"storageAccountType": "Standard_LRS",
"baseDiskSizeGB": 200,
"diskSizeGB": "[add(parameters('additionalDiskSizeGB'), variables('baseDiskSizeGB'))]",
"customData": "[concat('#!/usr/bin/python3 /etc/cloud_config.py\n', '\n', 'installationType=\"', variables('installationType'), '\"', '\n', 'allowUploadDownload=\"', variables('allowUploadDownload'), '\"', '\n', 'osVersion=\"', variables('osVersion'), '\"', '\n', 'templateName=\"', variables('templateName'), '\"', '\n', 'isBlink=\"', variables('isBlink'), '\"', '\n', 'templateVersion=\"', variables('templateVersion'), '\"', '\n', 'bootstrapScript64=\"', variables('bootstrapScript64'), '\"', '\n', 'location=\"', variables('location'), '\"', '\n', 'sicKey=\"', variables('sicKey'), '\"', '\n', 'managementGUIClientNetwork=\"', variables('managementGUIClientNetwork'), '\"', '\n', 'customMetrics=\"', variables('customMetrics'), '\"', '\n', 'adminShell=\"', parameters('adminShell'), '\"', '\n', 'smart1CloudToken=\"', parameters('smart1CloudToken'), '\"', '\n', 'MaintenanceModePassword=\"', parameters('MaintenanceModePasswordHash'), '\"', '\n', 'passwordHash=\"', parameters('SerialConsolePasswordHash'), '\"', '\n')]",
"imageOffer": "[concat('check-point-cg-', toLower(variables('osVersion')))]",
"imagePublisher": "checkpoint",
Expand Down Expand Up @@ -1820,7 +1818,7 @@
"osDisk": {
"caching": "ReadWrite",
"createOption": "FromImage",
"diskSizeGB": "[variables('diskSizeGB')]",
"diskSizeGB": "[parameters('diskSizeGB')]",
"name": "[parameters('vmName')]",
"managedDisk": {
"storageAccountType": "[parameters('diskType')]"
Expand Down
Loading