Skip to content

Commit 0ad7658

Browse files
cgns-gitlab-mirror-app[bot]eddiek
andauthored
feat(CGNSPC-835): IPv6 | AWS | Single Gateway and Single Management. (#537)
Co-authored-by: eddiek <eddiek+dol@checkpoint.com>
1 parent 4b2be17 commit 0ad7658

6 files changed

Lines changed: 195 additions & 83 deletions

File tree

aws/templates/management/README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
21
## Security Management Server
2+
33
<table>
44
<thead>
55
<tr>
@@ -24,10 +24,11 @@
2424
In order to check the template version, please refer to [sk125252](https://support.checkpoint.com/results/sk/sk125252#ToggleR8120gateway)
2525

2626
| Template Version | Description |
27-
|------------------|---------------------------------------------------------------------------------------------------------------|
27+
| ---------------- | ------------------------------------------------------------------------------------------------------------- |
28+
| 20260208 | Add IPv6 support via IPMode variable: "IPv4" and "DualStack" |
2829
| 20240704 | - R80.40 version deprecation.<br/>- R81 version deprecation. |
2930
| 20240519 | Add support for requiring use instance metadata service version 2 (IMDSv2) only |
30-
| 20230923 | Add support for C5d instance type |
31+
| 20230923 | Add support for C5d instance type |
3132
| 20230521 | - Change default shell for the admin user to /etc/cli.sh<br/>- Add description for reserved words in hostname |
3233
| 20221123 | Templates version 20221120 and above support R81.20 |
3334
| 20220606 | New instance type support |

aws/templates/management/management-master.yaml

100755100644
Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AWSTemplateFormatVersion: 2010-09-09
22
Description: |
3-
Deploys a Check Point Management Server into a new VPC (20260101)
3+
Deploys a Check Point Management Server into a new VPC (20260205)
44
See sk130372 administration guide for detailed deployment and configuration steps.
55
Metadata:
66
AWS::CloudFormation::Interface:
@@ -24,6 +24,7 @@ Metadata:
2424
- VPCCIDR
2525
- PublicSubnet1CIDR
2626
- ManagementName
27+
- IPMode
2728
- AllocatePublicAddress
2829
- VolumeSize
2930
- VolumeType
@@ -57,8 +58,10 @@ Metadata:
5758
default: Management Instance type
5859
KeyName:
5960
default: Key name
61+
IPMode:
62+
default: IP Configuration Mode
6063
AllocatePublicAddress:
61-
default: Allocate an Elastic IP
64+
default: Allocate an Elastic IPv4 address (Irrelevant for IPv6 only mode)
6265
VolumeSize:
6366
default: Root volume size (GB)
6467
VolumeType:
@@ -319,6 +322,13 @@ Parameters:
319322
Type: AWS::EC2::KeyPair::KeyName
320323
MinLength: 1
321324
ConstraintDescription: must be the name of an existing EC2 KeyPair.
325+
IPMode:
326+
Description: Specifies the IP mode for the Management and AWS resources.
327+
Type: String
328+
AllowedValues:
329+
- IPv4
330+
- DualStack
331+
Default: IPv4
322332
AllocatePublicAddress:
323333
Description: Allocate an elastic IP for the Management.
324334
Type: String
@@ -451,15 +461,15 @@ Parameters:
451461
- true
452462
- false
453463
AdminCIDR:
454-
Description: Allow web, SSH, and graphical clients only from this network to communicate
464+
Description: Allow web, SSH, and graphical clients only from this network to communicate (IPv4 or IPv6 CIDR)
455465
with the Management Server.
456466
Type: String
457-
AllowedPattern: '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))$'
467+
AllowedPattern: '^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/(3[0-2]|[12]?[0-9])|([0-9a-fA-F]{0,4}:){2,7}([0-9a-fA-F]{0,4}|((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))\/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))$'
458468
GatewaysAddresses:
459-
Description: Allow gateways only from this network to communicate with the Management
469+
Description: Allow gateways only from this network to communicate with the Management (IPv4 or IPv6 CIDR)
460470
Server.
461471
Type: String
462-
AllowedPattern: '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))$'
472+
AllowedPattern: '^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/(3[0-2]|[12]?[0-9])|([0-9a-fA-F]{0,4}:){2,7}([0-9a-fA-F]{0,4}|((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))\/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))$'
463473
GatewayManagement:
464474
Description: Select 'Over the internet' if any of the gateways you wish to manage
465475
are not directly accessed via their private IP address.
@@ -484,23 +494,28 @@ Parameters:
484494
Default: 0.pool.ntp.org
485495
AllowedPattern: '[\.a-zA-Z0-9\-]*'
486496
Conditions:
487-
EIP: !Equals [!Ref AllocatePublicAddress, true]
497+
IsIPv6Enabled: !Not [!Equals [!Ref IPMode, "IPv4"]]
498+
IsIPv4Enabled: !Not [!Equals [!Ref IPMode, "IPv6"]]
499+
AllocatePublicIPv4:
500+
!And [!Equals [!Ref AllocatePublicAddress, true], !Condition IsIPv4Enabled]
488501
Resources:
489502
VPCStack:
490503
Type: AWS::CloudFormation::Stack
491504
Properties:
492-
TemplateURL: https://cgi-cfts.s3.amazonaws.com/utils/vpc.yaml
505+
TemplateURL:
506+
!If [IsIPv6Enabled, https://cgi-cfts.s3.amazonaws.com/utils/vpc-ipv6.yaml, https://cgi-cfts.s3.amazonaws.com/utils/vpc.yaml]
493507
Parameters:
494508
AvailabilityZones: !Ref AvailabilityZone
495509
NumberOfAZs: 1
496510
VPCCIDR: !Ref VPCCIDR
497511
PublicSubnet1CIDR: !Ref PublicSubnet1CIDR
498512
CreatePrivateSubnets: false
499513
CreateAttachmentSubnets: false
514+
IPMode: !Ref IPMode
500515
ManagementStack:
501516
Type: AWS::CloudFormation::Stack
502517
Properties:
503-
TemplateURL: https://cgi-cfts.s3.us-east-1.amazonaws.com/management/management.yaml
518+
TemplateURL: https://cgi-cfts.s3.amazonaws.com/management/management.yaml
504519
Parameters:
505520
VPC: !GetAtt VPCStack.Outputs.VPCID
506521
ManagementSubnet: !GetAtt VPCStack.Outputs.PublicSubnet1ID
@@ -531,16 +546,17 @@ Resources:
531546
ManagementBootstrapScript: !Ref ManagementBootstrapScript
532547
NTPPrimary: !Ref NTPPrimary
533548
NTPSecondary: !Ref NTPSecondary
549+
IPMode: !Ref IPMode
534550
Outputs:
535551
PublicAddress:
536-
Condition: EIP
537-
Description: The public address of the management server.
552+
Condition: AllocatePublicIPv4
553+
Description: The public address of the Management Server.
538554
Value: !GetAtt ManagementStack.Outputs.PublicAddress
539555
SSH:
540-
Condition: EIP
541-
Description: SSH command to the management server.
556+
Condition: AllocatePublicIPv4
557+
Description: SSH command.
542558
Value: !GetAtt ManagementStack.Outputs.SSH
543559
URL:
544-
Condition: EIP
545-
Description: URL to the management server portal.
546-
Value: !GetAtt ManagementStack.Outputs.URL
560+
Condition: AllocatePublicIPv4
561+
Description: URL to the portal.
562+
Value: !GetAtt ManagementStack.Outputs.URL

0 commit comments

Comments
 (0)