gcp-deployment-packages | Templates alignment

- Update the recommended version to R81.20 - Added maintenance mode support - Changed Single default number of NICs to 2
CheckPointSW · Jan 9, 2024 · 9beb622 · 9beb622
1 parent 56f15a5
commit 9beb622
Show file tree

Hide file tree

Showing 24 changed files with 306 additions and 232 deletions.
diff --git a/gcp/deployment-packages/autoscale-byol/c2d_deployment_configuration.json b/gcp/deployment-packages/autoscale-byol/c2d_deployment_configuration.json
@@ -1,6 +1,6 @@
 {
   "defaultDeploymentType": "MULTI_VM",
-  "imageName": "check-point-r8110-gw-byol-mig-335-991001174-v20221113",
+  "imageName": "check-point-r8120-gw-byol-mig-631-991001475-v20231221",
   "projectId": "checkpoint-public",
   "templateName": "nonexistent_template",
   "useSolutionPackage": "true"

diff --git a/gcp/deployment-packages/autoscale-byol/check-point-autoscale--byol.py b/gcp/deployment-packages/autoscale-byol/check-point-autoscale--byol.py
@@ -18,12 +18,12 @@
 }
 
 TEMPLATE_NAME = 'autoscale'
-TEMPLATE_VERSION = '20230319'
+TEMPLATE_VERSION = '20231221'
 
 startup_script = '''
 #cloud-config
 runcmd:
-  - 'python3 /etc/cloud_config.py "generatePassword=\\"{generatePassword}\\"" "allowUploadDownload=\\"{allowUploadDownload}\\"" "templateName=\\"{templateName}\\"" "templateVersion=\\"{templateVersion}\\"" "mgmtNIC=\\"{mgmtNIC}\\"" "hasInternet=\\"{hasInternet}\\"" "config_url=\\"{config_url}\\"" "config_path=\\"{config_path}\\"" "installationType=\\"{installationType}\\"" "enableMonitoring=\\"{enableMonitoring}\\"" "shell=\\"{shell}\\"" "computed_sic_key=\\"{computed_sic_key}\\"" "sicKey=\\"{sicKey}\\"" "managementGUIClientNetwork=\\"{managementGUIClientNetwork}\\"" "primary_cluster_address_name=\\"{primary_cluster_address_name}\\"" "secondary_cluster_address_name=\\"{secondary_cluster_address_name}\\"" "managementNetwork=\\"{managementNetwork}\\"" "numAdditionalNICs=\\"{numAdditionalNICs}\\"" "smart1CloudToken=\\"{smart1CloudToken}\\"" "name=\\"{name}\\"" "zone=\\"{zoneConfig}\\"" "region=\\"{region}\\""'
+  - 'python3 /etc/cloud_config.py "generatePassword=\\"{generatePassword}\\"" "allowUploadDownload=\\"{allowUploadDownload}\\"" "templateName=\\"{templateName}\\"" "templateVersion=\\"{templateVersion}\\"" "mgmtNIC=\\"{mgmtNIC}\\"" "hasInternet=\\"{hasInternet}\\"" "config_url=\\"{config_url}\\"" "config_path=\\"{config_path}\\"" "installationType=\\"{installationType}\\"" "enableMonitoring=\\"{enableMonitoring}\\"" "shell=\\"{shell}\\"" "computed_sic_key=\\"{computed_sic_key}\\"" "sicKey=\\"{sicKey}\\"" "managementGUIClientNetwork=\\"{managementGUIClientNetwork}\\"" "primary_cluster_address_name=\\"{primary_cluster_address_name}\\"" "secondary_cluster_address_name=\\"{secondary_cluster_address_name}\\"" "managementNetwork=\\"{managementNetwork}\\"" "numAdditionalNICs=\\"{numAdditionalNICs}\\"" "smart1CloudToken=\\"{smart1CloudToken}\\"" "name=\\"{name}\\"" "zone=\\"{zoneConfig}\\"" "region=\\"{region}\\"" "osVersion=\\"{osVersion}\\"" "MaintenanceModePassword=\\"{maintenanceMode}\\""'
 '''
 
 
@@ -101,7 +101,7 @@ def create_instance_template(context,
                              name,
                              nics,
                              depends_on=None,
-                             gw_version=VERSIONS['R81.10-GW']):
+                             gw_version=VERSIONS['R81.20-GW']):
     if 'gw' in gw_version:
         license_name = "{}-{}".format(LICENSE, LICENCE_TYPE)
     else:
@@ -203,7 +203,16 @@ def create_instance_template(context,
                 'value': context.properties['instanceSSHKey']
             }
         )
-    return instance_template
+    passwd = ''
+    if context.properties['generatePassword']:
+        passwd = password.GeneratePassword(12, False)
+        metadata['items'].append(
+            {
+                'key': 'adminPasswordSourceMetadata',
+                'value': passwd
+            }
+        )
+    return instance_template, passwd
 
 
 def GenerateAutscaledGroup(context, name,
@@ -302,12 +311,16 @@ def generate_config(context):
     prop['gatewayExternalIP'] = (prop['mgmtNIC'] ==
                                  'Ephemeral Public IP (eth0)')
     version_chosen = prop['autoscalingVersion'].split(' ')[0] + "-GW"
+    prop['osVersion'] = prop['autoscalingVersion'].split(' ')[0].replace(
+        ".", "")
     nics = create_nics(context)
-    gw_template = create_instance_template(context,
-                                           prop['deployment'],
-                                           nics,
-                                           depends_on=prop['gw_dependencies'],
-                                           gw_version=VERSIONS[version_chosen])
+    gw_template, passwd = create_instance_template(context,
+                                                   prop['deployment'],
+                                                   nics,
+                                                   depends_on=prop[
+                                                       'gw_dependencies'],
+                                                   gw_version=VERSIONS[
+                                                       version_chosen])
     prop['resources'] += [gw_template]
     prop['igm_dependencies'] = [gw_template['name']]
     igm = GenerateAutscaledGroup(context,
@@ -360,5 +373,9 @@ def generate_config(context):
             'name': 'maxInstancesInt',
             'value': str(int(prop['maxInstances']))
         },
+        {
+            'name': 'password',
+            'value': passwd
+        }
     ]
     return common.MakeResource(prop['resources'], prop['outputs'])
diff --git a/gcp/deployment-packages/autoscale-byol/check-point-autoscale--byol.py.schema b/gcp/deployment-packages/autoscale-byol/check-point-autoscale--byol.py.schema
@@ -21,6 +21,7 @@ required:
   - networkDefinedByRoutes
   - shell
   - enableMonitoring
+  - generatePassword
 
 properties:
   zone:
@@ -166,7 +167,7 @@ properties:
         diskTypeProperty: diskType
   autoscalingVersion:
     type: string
-    default: R81.10 Autoscaling
+    default: R81.20 Autoscaling
     enum:
       - R80.40 Autoscaling
       - R81 Autoscaling
@@ -189,6 +190,13 @@ properties:
   allowUploadDownload:
     type: boolean
     default: True
+  generatePassword:
+    type: boolean
+    default: False
+  maintenanceMode:
+    type: string
+    pattern: ^([a-z0-9A-Z.]{12,300}|)$
+    default: ''
   shell:
     type: string
     default: /etc/cli.sh
@@ -202,4 +210,6 @@ outputs:
   deployment:
     type: string
   project:
+    type: string
+  password:
     type: string
diff --git a/gcp/deployment-packages/autoscale-byol/images.py b/gcp/deployment-packages/autoscale-byol/images.py
@@ -1,34 +1,34 @@
 IMAGES = {
-  "check-point-r8120-payg": "check-point-r8120-payg-631-991001383-v20230907",
-  "check-point-r8120-gw-payg-single": "check-point-r8120-gw-payg-single-631-991001383-v20230907",
-  "check-point-r8120-gw-payg-mig": "check-point-r8120-gw-payg-mig-631-991001383-v20230907",
-  "check-point-r8120-gw-payg-cluster": "check-point-r8120-gw-payg-cluster-631-991001383-v20230907",
-  "check-point-r8120-gw-byol-single": "check-point-r8120-gw-byol-single-631-991001383-v20230907",
-  "check-point-r8120-gw-byol-mig": "check-point-r8120-gw-byol-mig-631-991001383-v20230907",
-  "check-point-r8120-gw-byol-cluster": "check-point-r8120-gw-byol-cluster-631-991001383-v20230907",
-  "check-point-r8120-byol": "check-point-r8120-byol-631-991001383-v20230907",
-  "check-point-r8110-payg": "check-point-r8110-payg-335-991001383-v20230907",
-  "check-point-r8110-gw-payg-single": "check-point-r8110-gw-payg-single-335-991001383-v20230907",
-  "check-point-r8110-gw-payg-mig": "check-point-r8110-gw-payg-mig-335-991001383-v20230907",
-  "check-point-r8110-gw-payg-cluster": "check-point-r8110-gw-payg-cluster-335-991001383-v20230907",
-  "check-point-r8110-gw-byol-single": "check-point-r8110-gw-byol-single-335-991001383-v20230907",
-  "check-point-r8110-gw-byol-mig": "check-point-r8110-gw-byol-mig-335-991001383-v20230907",
-  "check-point-r8110-gw-byol-cluster": "check-point-r8110-gw-byol-cluster-335-991001383-v20230907",
-  "check-point-r8110-byol": "check-point-r8110-byol-335-991001383-v20230907",
-  "check-point-r81-payg": "check-point-r81-payg-392-991001383-v20230907",
-  "check-point-r81-gw-payg-single": "check-point-r81-gw-payg-single-392-991001383-v20230907",
-  "check-point-r81-gw-payg-mig": "check-point-r81-gw-payg-mig-392-991001383-v20230907",
-  "check-point-r81-gw-payg-cluster": "check-point-r81-gw-payg-cluster-392-991001383-v20230907",
-  "check-point-r81-gw-byol-single": "check-point-r81-gw-byol-single-392-991001383-v20230907",
-  "check-point-r81-gw-byol-mig": "check-point-r81-gw-byol-mig-392-991001383-v20230907",
-  "check-point-r81-gw-byol-cluster": "check-point-r81-gw-byol-cluster-392-991001383-v20230907",
-  "check-point-r81-byol": "check-point-r81-byol-392-991001383-v20230907",
-  "check-point-r8040-payg": "check-point-r8040-payg-294-991001383-v20230907",
-  "check-point-r8040-gw-payg-single": "check-point-r8040-gw-payg-single-294-991001383-v20230907",
-  "check-point-r8040-gw-payg-mig": "check-point-r8040-gw-payg-mig-294-991001383-v20230907",
-  "check-point-r8040-gw-payg-cluster": "check-point-r8040-gw-payg-cluster-294-991001383-v20230907",
-  "check-point-r8040-gw-byol-single": "check-point-r8040-gw-byol-single-294-991001383-v20230907",
-  "check-point-r8040-gw-byol-mig": "check-point-r8040-gw-byol-mig-294-991001383-v20230907",
-  "check-point-r8040-gw-byol-cluster": "check-point-r8040-gw-byol-cluster-294-991001383-v20230907",
-  "check-point-r8040-byol": "check-point-r8040-byol-294-991001383-v20230907"
+  "check-point-r8120-payg": "check-point-r8120-payg-631-991001475-v20231221",
+  "check-point-r8120-gw-payg-single": "check-point-r8120-gw-payg-single-631-991001475-v20231221",
+  "check-point-r8120-gw-payg-mig": "check-point-r8120-gw-payg-mig-631-991001475-v20231221",
+  "check-point-r8120-gw-payg-cluster": "check-point-r8120-gw-payg-cluster-631-991001475-v20231221",
+  "check-point-r8120-gw-byol-single": "check-point-r8120-gw-byol-single-631-991001475-v20231221",
+  "check-point-r8120-gw-byol-mig": "check-point-r8120-gw-byol-mig-631-991001475-v20231221",
+  "check-point-r8120-gw-byol-cluster": "check-point-r8120-gw-byol-cluster-631-991001475-v20231221",
+  "check-point-r8120-byol": "check-point-r8120-byol-631-991001475-v20231221",
+  "check-point-r8110-payg": "check-point-r8110-payg-335-991001475-v20231221",
+  "check-point-r8110-gw-payg-single": "check-point-r8110-gw-payg-single-335-991001475-v20231221",
+  "check-point-r8110-gw-payg-mig": "check-point-r8110-gw-payg-mig-335-991001475-v20231221",
+  "check-point-r8110-gw-payg-cluster": "check-point-r8110-gw-payg-cluster-335-991001475-v20231221",
+  "check-point-r8110-gw-byol-single": "check-point-r8110-gw-byol-single-335-991001475-v20231221",
+  "check-point-r8110-gw-byol-mig": "check-point-r8110-gw-byol-mig-335-991001475-v20231221",
+  "check-point-r8110-gw-byol-cluster": "check-point-r8110-gw-byol-cluster-335-991001475-v20231221",
+  "check-point-r8110-byol": "check-point-r8110-byol-335-991001475-v20231221",
+  "check-point-r81-payg": "check-point-r81-payg-392-991001475-v20231221",
+  "check-point-r81-gw-payg-single": "check-point-r81-gw-payg-single-392-991001475-v20231221",
+  "check-point-r81-gw-payg-mig": "check-point-r81-gw-payg-mig-392-991001475-v20231221",
+  "check-point-r81-gw-payg-cluster": "check-point-r81-gw-payg-cluster-392-991001475-v20231221",
+  "check-point-r81-gw-byol-single": "check-point-r81-gw-byol-single-392-991001475-v20231221",
+  "check-point-r81-gw-byol-mig": "check-point-r81-gw-byol-mig-392-991001475-v20231221",
+  "check-point-r81-gw-byol-cluster": "check-point-r81-gw-byol-cluster-392-991001475-v20231221",
+  "check-point-r81-byol": "check-point-r81-byol-392-991001475-v20231221",
+  "check-point-r8040-payg": "check-point-r8040-payg-294-991001475-v20231221",
+  "check-point-r8040-gw-payg-single": "check-point-r8040-gw-payg-single-294-991001475-v20231221",
+  "check-point-r8040-gw-payg-mig": "check-point-r8040-gw-payg-mig-294-991001475-v20231221",
+  "check-point-r8040-gw-payg-cluster": "check-point-r8040-gw-payg-cluster-294-991001475-v20231221",
+  "check-point-r8040-gw-byol-single": "check-point-r8040-gw-byol-single-294-991001475-v20231221",
+  "check-point-r8040-gw-byol-mig": "check-point-r8040-gw-byol-mig-294-991001475-v20231221",
+  "check-point-r8040-gw-byol-cluster": "check-point-r8040-gw-byol-cluster-294-991001475-v20231221",
+  "check-point-r8040-byol": "check-point-r8040-byol-294-991001475-v20231221"
 }
diff --git a/gcp/deployment-packages/autoscale-payg/c2d_deployment_configuration.json b/gcp/deployment-packages/autoscale-payg/c2d_deployment_configuration.json
@@ -1,6 +1,6 @@
 {
   "defaultDeploymentType": "MULTI_VM",
-  "imageName": "check-point-r8110-gw-payg-mig-335-991001174-v20221113",
+  "imageName": "check-point-r8120-gw-payg-mig-631-991001475-v20231221",
   "projectId": "checkpoint-public",
   "templateName": "nonexistent_template",
   "useSolutionPackage": "true"

diff --git a/gcp/deployment-packages/autoscale-payg/check-point-autoscale--payg.py b/gcp/deployment-packages/autoscale-payg/check-point-autoscale--payg.py
@@ -18,12 +18,12 @@
 }
 
 TEMPLATE_NAME = 'autoscale'
-TEMPLATE_VERSION = '20230319'
+TEMPLATE_VERSION = '20231221'
 
 startup_script = '''
 #cloud-config
 runcmd:
-  - 'python3 /etc/cloud_config.py "generatePassword=\\"{generatePassword}\\"" "allowUploadDownload=\\"{allowUploadDownload}\\"" "templateName=\\"{templateName}\\"" "templateVersion=\\"{templateVersion}\\"" "mgmtNIC=\\"{mgmtNIC}\\"" "hasInternet=\\"{hasInternet}\\"" "config_url=\\"{config_url}\\"" "config_path=\\"{config_path}\\"" "installationType=\\"{installationType}\\"" "enableMonitoring=\\"{enableMonitoring}\\"" "shell=\\"{shell}\\"" "computed_sic_key=\\"{computed_sic_key}\\"" "sicKey=\\"{sicKey}\\"" "managementGUIClientNetwork=\\"{managementGUIClientNetwork}\\"" "primary_cluster_address_name=\\"{primary_cluster_address_name}\\"" "secondary_cluster_address_name=\\"{secondary_cluster_address_name}\\"" "managementNetwork=\\"{managementNetwork}\\"" "numAdditionalNICs=\\"{numAdditionalNICs}\\"" "smart1CloudToken=\\"{smart1CloudToken}\\"" "name=\\"{name}\\"" "zone=\\"{zoneConfig}\\"" "region=\\"{region}\\""'
+  - 'python3 /etc/cloud_config.py "generatePassword=\\"{generatePassword}\\"" "allowUploadDownload=\\"{allowUploadDownload}\\"" "templateName=\\"{templateName}\\"" "templateVersion=\\"{templateVersion}\\"" "mgmtNIC=\\"{mgmtNIC}\\"" "hasInternet=\\"{hasInternet}\\"" "config_url=\\"{config_url}\\"" "config_path=\\"{config_path}\\"" "installationType=\\"{installationType}\\"" "enableMonitoring=\\"{enableMonitoring}\\"" "shell=\\"{shell}\\"" "computed_sic_key=\\"{computed_sic_key}\\"" "sicKey=\\"{sicKey}\\"" "managementGUIClientNetwork=\\"{managementGUIClientNetwork}\\"" "primary_cluster_address_name=\\"{primary_cluster_address_name}\\"" "secondary_cluster_address_name=\\"{secondary_cluster_address_name}\\"" "managementNetwork=\\"{managementNetwork}\\"" "numAdditionalNICs=\\"{numAdditionalNICs}\\"" "smart1CloudToken=\\"{smart1CloudToken}\\"" "name=\\"{name}\\"" "zone=\\"{zoneConfig}\\"" "region=\\"{region}\\"" "osVersion=\\"{osVersion}\\"" "MaintenanceModePassword=\\"{maintenanceMode}\\""'
 '''
 
 
@@ -101,7 +101,7 @@ def create_instance_template(context,
                              name,
                              nics,
                              depends_on=None,
-                             gw_version=VERSIONS['R81.10-GW']):
+                             gw_version=VERSIONS['R81.20-GW']):
     if 'gw' in gw_version:
         license_name = "{}-{}".format(LICENSE, LICENCE_TYPE)
     else:
@@ -203,7 +203,16 @@ def create_instance_template(context,
                 'value': context.properties['instanceSSHKey']
             }
         )
-    return instance_template
+    passwd = ''
+    if context.properties['generatePassword']:
+        passwd = password.GeneratePassword(12, False)
+        metadata['items'].append(
+            {
+                'key': 'adminPasswordSourceMetadata',
+                'value': passwd
+            }
+        )
+    return instance_template, passwd
 
 
 def GenerateAutscaledGroup(context, name,
@@ -302,12 +311,16 @@ def generate_config(context):
     prop['gatewayExternalIP'] = (prop['mgmtNIC'] ==
                                  'Ephemeral Public IP (eth0)')
     version_chosen = prop['autoscalingVersion'].split(' ')[0] + "-GW"
+    prop['osVersion'] = prop['autoscalingVersion'].split(' ')[0].replace(
+        ".", "")
     nics = create_nics(context)
-    gw_template = create_instance_template(context,
-                                           prop['deployment'],
-                                           nics,
-                                           depends_on=prop['gw_dependencies'],
-                                           gw_version=VERSIONS[version_chosen])
+    gw_template, passwd = create_instance_template(context,
+                                                   prop['deployment'],
+                                                   nics,
+                                                   depends_on=prop[
+                                                       'gw_dependencies'],
+                                                   gw_version=VERSIONS[
+                                                       version_chosen])
     prop['resources'] += [gw_template]
     prop['igm_dependencies'] = [gw_template['name']]
     igm = GenerateAutscaledGroup(context,
@@ -360,5 +373,9 @@ def generate_config(context):
             'name': 'maxInstancesInt',
             'value': str(int(prop['maxInstances']))
         },
+        {
+            'name': 'password',
+            'value': passwd
+        }
     ]
     return common.MakeResource(prop['resources'], prop['outputs'])
diff --git a/gcp/deployment-packages/autoscale-payg/check-point-autoscale--payg.py.schema b/gcp/deployment-packages/autoscale-payg/check-point-autoscale--payg.py.schema
@@ -21,6 +21,7 @@ required:
   - networkDefinedByRoutes
   - shell
   - enableMonitoring
+  - generatePassword
 
 properties:
   zone:
@@ -166,7 +167,7 @@ properties:
         diskTypeProperty: diskType
   autoscalingVersion:
     type: string
-    default: R81.10 Autoscaling
+    default: R81.20 Autoscaling
     enum:
       - R80.40 Autoscaling
       - R81 Autoscaling
@@ -189,6 +190,13 @@ properties:
   allowUploadDownload:
     type: boolean
     default: True
+  generatePassword:
+    type: boolean
+    default: False
+  maintenanceMode:
+    type: string
+    pattern: ^([a-z0-9A-Z.]{12,300}|)$
+    default: ''
   shell:
     type: string
     default: /etc/cli.sh
@@ -202,4 +210,6 @@ outputs:
   deployment:
     type: string
   project:
+    type: string
+  password:
     type: string