diff --git a/infrastructure/aws/__init__.py b/infrastructure/aws/__init__.py index 45ce4c41..53d3c9a4 100644 --- a/infrastructure/aws/__init__.py +++ b/infrastructure/aws/__init__.py @@ -23,7 +23,7 @@ def key_pair( resource_name: str, public_key: str ): key_pair = pulumi_aws.ec2.KeyPair( resource_name=resource_name, public_key=public_key ) return key_pair.key_name #------------------------------------# -def ec2( arch, ec2_name, ec2_type, disk_size=50, disk_type='gp3', key_name, subnet_id, security_group_id ): +def ec2( arch, ec2_name, ec2_type, key_name, subnet_id, security_group_id ): if arch == 'amd64': ami = pulumi_aws.ec2.get_ami( owners = ["099720109477"], @@ -43,14 +43,21 @@ def ec2( arch, ec2_name, ec2_type, disk_size=50, disk_type='gp3', key_name, subn values = ["ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-*"] )], most_recent = True) + + root_ebs = { + "deleteOnTermination": True, + "volume_size": 100, + "volumeType": 'gp3', + "encrypted": False + } + instance = pulumi_aws.ec2.Instance( ami=ami.id, - resource_name=ec2_name, + resource_name = ec2_name, instance_type = ec2_type, - volumeSize = disk_size, - volumeType = disk_type, - key_name=key_name, - subnet_id=subnet_id, + key_name = key_name, + subnet_id = subnet_id, + root_block_device = root_ebs, vpc_security_group_ids = [ security_group_id ], tags = { "Name": ec2_name