Skip to content

Commit 36422b1

Browse files
chkp-eddiekchkp-natanelm
chkp-eddiek
and
chkp-natanelm
authored
VSECPC-10387 | Remove V2, V3 VMs from Terraform templates (#15)
Co-authored-by: natanelm <natanelm@checkpoint.com>
1 parent 9c5b37a commit 36422b1

11 files changed

Lines changed: 27 additions & 35 deletions

File tree

‎modules/common/variables.tf‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -184,21 +184,13 @@ variable "vm_size" {
184184
}
185185

186186
locals {// locals for 'vm_size' allowed values
187-
allowed_vm_sizes = ["Standard_DS2_v2", "Standard_DS3_v2", "Standard_DS4_v2", "Standard_DS5_v2", "Standard_F2s",
188-
"Standard_F4s", "Standard_F8s", "Standard_F16s", "Standard_D4s_v3", "Standard_D8s_v3",
189-
"Standard_D16s_v3", "Standard_D32s_v3", "Standard_D64s_v3", "Standard_E4s_v3", "Standard_E8s_v3",
190-
"Standard_E16s_v3", "Standard_E20s_v3", "Standard_E32s_v3", "Standard_E64s_v3", "Standard_E64is_v3",
191-
"Standard_F4s_v2", "Standard_F8s_v2", "Standard_F16s_v2", "Standard_F32s_v2", "Standard_F64s_v2",
192-
"Standard_M8ms", "Standard_M16ms", "Standard_M32ms", "Standard_M64ms", "Standard_M64s",
193-
"Standard_D2_v2", "Standard_D3_v2", "Standard_D4_v2", "Standard_D5_v2", "Standard_D11_v2",
194-
"Standard_D12_v2", "Standard_D13_v2", "Standard_D14_v2", "Standard_D15_v2", "Standard_F2",
195-
"Standard_F4", "Standard_F8", "Standard_F16", "Standard_D4_v3", "Standard_D8_v3", "Standard_D16_v3",
196-
"Standard_D32_v3", "Standard_D64_v3", "Standard_E4_v3", "Standard_E8_v3", "Standard_E16_v3",
197-
"Standard_E20_v3", "Standard_E32_v3", "Standard_E64_v3", "Standard_E64i_v3", "Standard_DS11_v2",
198-
"Standard_DS12_v2", "Standard_DS13_v2", "Standard_DS14_v2", "Standard_DS15_v2", "Standard_D2_v5", "Standard_D4_v5",
199-
"Standard_D8_v5", "Standard_D16_v5","Standard_D32_v5", "Standard_D2s_v5", "Standard_D4s_v5", "Standard_D8s_v5",
200-
"Standard_D16s_v5", "Standard_D2d_v5", "Standard_D4d_v5", "Standard_D8d_v5", "Standard_D16d_v5", "Standard_D32d_v5",
201-
"Standard_D2ds_v5", "Standard_D4ds_v5", "Standard_D8ds_v5", "Standard_D16ds_v5", "Standard_D32ds_v5"
187+
allowed_vm_sizes = ["Standard_F2s", "Standard_F4s", "Standard_F8s", "Standard_F16s", "Standard_M8ms", "Standard_M16ms",
188+
"Standard_M32ms", "Standard_M64ms", "Standard_M64s", "Standard_F2", "Standard_F4", "Standard_F8",
189+
"Standard_F16", "Standard_D2_v5", "Standard_D4_v5", "Standard_D8_v5", "Standard_D16_v5",
190+
"Standard_D32_v5", "Standard_D2s_v5", "Standard_D4s_v5", "Standard_D8s_v5", "Standard_D16s_v5",
191+
"Standard_D2d_v5", "Standard_D4d_v5", "Standard_D8d_v5", "Standard_D16d_v5", "Standard_D32d_v5",
192+
"Standard_D2ds_v5", "Standard_D4ds_v5", "Standard_D8ds_v5", "Standard_D16ds_v5",
193+
"Standard_D32ds_v5"
202194
]
203195
// will fail if [var.vm_size] is invalid:
204196
validate_vm_size_value = index(local.allowed_vm_sizes, var.vm_size)

‎modules/high_availability_existing_vnet/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ module "example_module" {
4040
smart_1_cloud_token_a = "xxxxxxxxxxxx"
4141
smart_1_cloud_token_b = "xxxxxxxxxxxx"
4242
sic_key = "xxxxxxxxxxxx"
43-
vm_size = "Standard_D3_v2"
43+
vm_size = "Standard_D4ds_v5"
4444
disk_size = "110"
4545
vm_os_sku = "sg-byol"
4646
vm_os_offer = "check-point-cg-r82"
@@ -107,7 +107,7 @@ module "example_module" {
107107
| **smart_1_cloud_token_a** | Smart-1 Cloud token to connect automatically ***Member A*** to Check Point's Security Management as a Service. Follow these instructions to connect this member. | string | A valid token copied from the Connect Gateway screen in Smart-1 Cloud portal<br /> |
108108
| **smart_1_cloud_token_b** | Smart-1 Cloud token to connect automatically ***Member B*** to Check Point's Security Management as a Service. Follow these instructions to connect this member. | string | A valid token copied from the Connect Gateway screen in Smart-1 Cloud portal<br /> |
109109
| **sic_key** | The Secure Internal Communication one-time secret used to set up trust between the cluster object and the management server | string | Only alphanumeric characters are allowed, and the value must be 12-30 characters long<br /> |
110-
| **vm_size** | Specifies the size of Virtual Machine | string | Various valid sizes (e.g., "Standard_DS2_v2", "Standard_D4s_v3", etc.)<br /> |
110+
| **vm_size** | Specifies the size of Virtual Machine | string | Various valid sizes (e.g., "Standard_D4ds_v5", "Standard_D8ds_v5", etc.)<br /> |
111111
| **disk_size** | Storage data disk size (GB) | string | A number in the range 100 - 3995 (GB)<br /> |
112112
| **vm_os_sku** | A SKU of the image to be deployed | string | "sg-byol" - BYOL license;<br />"sg-ngtp" - NGTP PAYG license;<br />"sg-ngtx" - NGTX PAYG license<br /> |
113113
| **vm_os_offer** | The name of the image offer to be deployed | string | "check-point-cg-r81.10";<br />"check-point-cg-r81.20";<br />"check-point-cg-r82";<br /> |

‎modules/high_availability_new_vnet/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ module "example_module" {
4343
smart_1_cloud_token_a = "xxxxxxxxxxxx"
4444
smart_1_cloud_token_b = "xxxxxxxxxxxx"
4545
sic_key = "xxxxxxxxxxxx"
46-
vm_size = "Standard_D3_v2"
46+
vm_size = "Standard_D4ds_v5"
4747
disk_size = "110"
4848
vm_os_sku = "sg-byol"
4949
vm_os_offer = "check-point-cg-r82"
@@ -108,7 +108,7 @@ module "example_module" {
108108
| **smart_1_cloud_token_a** | Smart-1 Cloud token to connect automatically ***Member A*** to Check Point's Security Management as a Service. | string | A valid token copied from the Connect Gateway screen in the Smart-1 Cloud portal<br /> |
109109
| **smart_1_cloud_token_b** | Smart-1 Cloud token to connect automatically ***Member B*** to Check Point's Security Management as a Service. | string | A valid token copied from the Connect Gateway screen in the Smart-1 Cloud portal<br /> |
110110
| **sic_key** | The Secure Internal Communication one-time secret used to set up trust between the cluster object and the management server | string | Only alphanumeric characters are allowed, and the value must be 12-30 characters long<br /> |
111-
| **vm_size** | Specifies the size of the Virtual Machine | string | Various valid sizes (e.g., "Standard_DS2_v2", "Standard_D4s_v3", etc.)<br /> |
111+
| **vm_size** | Specifies the size of the Virtual Machine | string | Various valid sizes (e.g., "Standard_D4ds_v5", "Standard_D8ds_v5", etc.)<br /> |
112112
| **disk_size** | Storage data disk size (GB) | string | A number in the range 100 - 3995 (GB)<br /> |
113113
| **vm_os_sku** | A SKU of the image to be deployed | string | "sg-byol" - BYOL license;<br />"sg-ngtp" - NGTP PAYG license;<br />"sg-ngtx" - NGTX PAYG license;<br /> |
114114
| **vm_os_offer** | The name of the image offer to be deployed | string | "check-point-cg-r8110";<br />"check-point-cg-r8120";<br />"check-point-cg-r82";<br /> |

‎modules/management_existing_vnet/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ module "example_module" {
3737
management_GUI_client_network = "0.0.0.0/0"
3838
mgmt_enable_api = "disable"
3939
admin_password = "xxxxxxxxxxxx"
40-
vm_size = "Standard_D3_v2"
40+
vm_size = "Standard_D4ds_v5"
4141
disk_size = "110"
4242
vm_os_sku = "mgmt-byol"
4343
vm_os_offer = "check-point-cg-r82"
@@ -71,7 +71,7 @@ module "example_module" {
7171
| **management_GUI_client_network** | Allowed GUI clients - GUI clients network CIDR | string | |
7272
| **mgmt_enable_api** | Enable api access to the management | string | "all";<br/>"management_only";<br/>"gui_clients";<br/>"disable".<br/>**Default:** "disable" |
7373
| **admin_password** | The password associated with the local administrator account on each cluster member | string | Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. |
74-
| **vm_size** | Specifies the size of Virtual Machine | string | "Standard_DS2_v2", "Standard_DS3_v2", "Standard_DS4_v2", "Standard_DS5_v2", "Standard_F2s", "Standard_F4s", "Standard_F8s", "Standard_F16s", "Standard_D4s_v3", "Standard_D8s_v3", "Standard_D16s_v3", "Standard_D32s_v3", "Standard_D64s_v3", "Standard_E4s_v3", "Standard_E8s_v3", "Standard_E16s_v3", "Standard_E20s_v3", "Standard_E32s_v3", "Standard_E64s_v3", "Standard_E64is_v3", "Standard_F4s_v2", "Standard_F8s_v2", "Standard_F16s_v2", "Standard_F32s_v2", "Standard_F64s_v2", "Standard_M8ms", "Standard_M16ms", "Standard_M32ms", "Standard_M64ms", "Standard_M64s", "Standard_D2_v2", "Standard_D3_v2", "Standard_D4_v2", "Standard_D5_v2", "Standard_D11_v2", "Standard_D12_v2", "Standard_D13_v2", "Standard_D14_v2", "Standard_D15_v2", "Standard_F2", "Standard_F4", "Standard_F8", "Standard_F16", "Standard_D4_v3", "Standard_D8_v3", "Standard_D16_v3", "Standard_D32_v3", "Standard_D64_v3", "Standard_E4_v3", "Standard_E8_v3", "Standard_E16_v3", "Standard_E20_v3", "Standard_E32_v3", "Standard_E64_v3", "Standard_E64i_v3", "Standard_DS11_v2", "Standard_DS12_v2", "Standard_DS13_v2", "Standard_DS14_v2", "Standard_DS15_v2", "Standard_D2_v5", "Standard_D4_v5", "Standard_D8_v5", "Standard_D16_v5","Standard_D32_v5", "Standard_D2s_v5", "Standard_D4s_v5", "Standard_D8s_v5", "Standard_D16s_v5", "Standard_D2d_v5", "Standard_D4d_v5", "Standard_D8d_v5", "Standard_D16d_v5", "Standard_D32d_v5", "Standard_D2ds_v5", "Standard_D4ds_v5", "Standard_D8ds_v5", "Standard_D16ds_v5", "Standard_D32ds_v5". |
74+
| **vm_size** | Specifies the size of Virtual Machine | string | "Standard_F2s", "Standard_F4s", "Standard_F8s", "Standard_F16s", "Standard_M8ms", "Standard_M16ms", "Standard_M32ms", "Standard_M64ms", "Standard_M64s", "Standard_F2", "Standard_F4", "Standard_F8", "Standard_F16", "Standard_D2_v5", "Standard_D4_v5", "Standard_D8_v5", "Standard_D16_v5","Standard_D32_v5", "Standard_D2s_v5", "Standard_D4s_v5", "Standard_D8s_v5", "Standard_D16s_v5", "Standard_D2d_v5", "Standard_D4d_v5", "Standard_D8d_v5", "Standard_D16d_v5", "Standard_D32d_v5", "Standard_D2ds_v5", "Standard_D4ds_v5", "Standard_D8ds_v5", "Standard_D16ds_v5", "Standard_D32ds_v5". |
7575
| **disk_size** | Storage data disk size size(GB) | string | A number in the range 100 - 3995 (GB). |
7676
| **vm_os_sku** | A sku of the image to be deployed | string | "mgmt-byol" - BYOL license;<br/>"mgmt-25" - PAYG. |
7777
| **vm_os_offer** | The name of the image offer to be deployed | string | "check-point-cg-r8110";<br/>"check-point-cg-r8120";<br/>"check-point-cg-r82". |

0 commit comments

Comments
 (0)