Skip to content

Commit

Permalink
[TF-10414] Replace EC2 AWS Launch Configuration for AWS Launch Templa…
Browse files Browse the repository at this point in the history 
…tes (#317)
  • Loading branch information
Miguel Hernández authored Nov 14, 2023
1 parent 2749b9c commit 96f8777
Show file tree
Hide file tree
Showing 4 changed files with 99 additions and 49 deletions.
54 changes: 28 additions & 26 deletions main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ data "aws_kms_key" "main" {
}

# -----------------------------------------------------------------------------
# AWS Service Accounts
# AWS Service Accounts
# -----------------------------------------------------------------------------
module "service_accounts" {
source = "./modules/service_accounts"
Expand Down Expand Up @@ -330,29 +330,31 @@ module "private_tcp_load_balancer" {
module "vm" {
source = "./modules/vm"

active_active = local.active_active
aws_iam_instance_profile = module.service_accounts.iam_instance_profile.name
ami_id = local.ami_id
aws_lb = var.load_balancing_scheme == "PRIVATE_TCP" ? null : module.load_balancer[0].aws_lb_security_group
aws_lb_target_group_tfe_tg_443_arn = var.load_balancing_scheme == "PRIVATE_TCP" ? module.private_tcp_load_balancer[0].aws_lb_target_group_tfe_tg_443_arn : module.load_balancer[0].aws_lb_target_group_tfe_tg_443_arn
aws_lb_target_group_tfe_tg_8800_arn = var.load_balancing_scheme == "PRIVATE_TCP" ? module.private_tcp_load_balancer[0].aws_lb_target_group_tfe_tg_8800_arn : module.load_balancer[0].aws_lb_target_group_tfe_tg_8800_arn
asg_tags = var.asg_tags
default_ami_id = local.default_ami_id
enable_disk = local.enable_disk
enable_ssh = var.enable_ssh
ebs_device_name = var.ebs_device_name
ebs_volume_size = var.ebs_volume_size
ebs_volume_type = var.ebs_volume_type
ebs_iops = var.ebs_iops
ebs_delete_on_termination = var.ebs_delete_on_termination
friendly_name_prefix = var.friendly_name_prefix
health_check_grace_period = var.health_check_grace_period
instance_type = var.instance_type
is_replicated_deployment = var.is_replicated_deployment
key_name = var.key_name
network_id = local.network_id
network_subnets_private = local.network_private_subnets
network_private_subnet_cidrs = local.network_private_subnet_cidrs
node_count = var.node_count
user_data_base64 = var.is_replicated_deployment ? module.tfe_init_replicated[0].tfe_userdata_base64_encoded : module.tfe_init_fdo[0].tfe_userdata_base64_encoded
active_active = local.active_active
aws_iam_instance_profile = module.service_accounts.iam_instance_profile.name
ami_id = local.ami_id
aws_lb = var.load_balancing_scheme == "PRIVATE_TCP" ? null : module.load_balancer[0].aws_lb_security_group
aws_lb_target_group_tfe_tg_443_arn = var.load_balancing_scheme == "PRIVATE_TCP" ? module.private_tcp_load_balancer[0].aws_lb_target_group_tfe_tg_443_arn : module.load_balancer[0].aws_lb_target_group_tfe_tg_443_arn
aws_lb_target_group_tfe_tg_8800_arn = var.load_balancing_scheme == "PRIVATE_TCP" ? module.private_tcp_load_balancer[0].aws_lb_target_group_tfe_tg_8800_arn : module.load_balancer[0].aws_lb_target_group_tfe_tg_8800_arn
asg_tags = var.asg_tags
ec2_launch_template_tag_specifications = var.ec2_launch_template_tag_specifications
default_ami_id = local.default_ami_id
enable_disk = local.enable_disk
enable_ssh = var.enable_ssh
ebs_device_name = var.ebs_device_name
ebs_volume_size = var.ebs_volume_size
ebs_volume_type = var.ebs_volume_type
ebs_iops = var.ebs_iops
ebs_delete_on_termination = var.ebs_delete_on_termination
ebs_snapshot_id = var.ebs_snapshot_id
friendly_name_prefix = var.friendly_name_prefix
health_check_grace_period = var.health_check_grace_period
instance_type = var.instance_type
is_replicated_deployment = var.is_replicated_deployment
key_name = var.key_name
network_id = local.network_id
network_subnets_private = local.network_private_subnets
network_private_subnet_cidrs = local.network_private_subnet_cidrs
node_count = var.node_count
user_data_base64 = var.is_replicated_deployment ? module.tfe_init_replicated[0].tfe_userdata_base64_encoded : module.tfe_init_fdo[0].tfe_userdata_base64_encoded
}
64 changes: 42 additions & 22 deletions modules/vm/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,39 +72,55 @@ resource "aws_security_group_rule" "tfe_dashboard" {
cidr_blocks = var.aws_lb == null ? var.network_private_subnet_cidrs : null
}

resource "aws_launch_configuration" "tfe" {
name_prefix = "${var.friendly_name_prefix}-tfe-ec2-asg-lt-"
image_id = var.ami_id
instance_type = var.instance_type
user_data_base64 = var.user_data_base64
resource "aws_launch_template" "tfe" {
name_prefix = "${var.friendly_name_prefix}-tfe-ec2-asg-launch-template-"
image_id = var.ami_id
instance_type = var.instance_type
user_data = var.user_data_base64
key_name = var.key_name
vpc_security_group_ids = [aws_security_group.tfe_instance.id]

iam_instance_profile = var.aws_iam_instance_profile
key_name = var.key_name
security_groups = [aws_security_group.tfe_instance.id]
dynamic "tag_specifications" {
for_each = var.ec2_launch_template_tag_specifications

content {
resource_type = tag_specifications.value["resource_type"]
tags = tag_specifications.value["tags"]
}
}

iam_instance_profile {
name = var.aws_iam_instance_profile
}

metadata_options {
http_endpoint = "enabled"
# A hop limit of at least 2 is required for AWS Cost Estimation to function.
http_endpoint = "enabled"
http_put_response_hop_limit = 2
http_tokens = "optional"
}

root_block_device {
encrypted = true
volume_type = "gp2"
volume_size = 50
delete_on_termination = true
block_device_mappings {
device_name = "/dev/sda1"
ebs {
encrypted = true
volume_type = "gp2"
volume_size = 50
delete_on_termination = true
}
}

dynamic "ebs_block_device" {
dynamic "block_device_mappings" {
for_each = var.enable_disk ? [1] : [0]

content {
device_name = var.ebs_device_name
volume_size = var.ebs_volume_size
volume_type = var.ebs_volume_type
iops = var.ebs_iops
delete_on_termination = var.ebs_delete_on_termination
device_name = var.ebs_device_name
ebs {
volume_size = var.ebs_volume_size
volume_type = var.ebs_volume_type
iops = var.ebs_iops
delete_on_termination = var.ebs_delete_on_termination
snapshot_id = var.ebs_snapshot_id
}
}
}

Expand All @@ -127,7 +143,11 @@ resource "aws_autoscaling_group" "tfe_asg" {
# since RHEL has longer startup time
health_check_grace_period = local.health_check_grace_period
health_check_type = "ELB"
launch_configuration = aws_launch_configuration.tfe.name

launch_template {
id = aws_launch_template.tfe.id
version = "$Latest"
}

dynamic "tag" {
for_each = local.tags
Expand Down
15 changes: 14 additions & 1 deletion modules/vm/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,14 @@ variable "key_name" {
type = string
}

variable "ec2_launch_template_tag_specifications" {
description = "(Optional) List of tag specifications to apply to the launch template."
type = list(object({
resource_type = string
tags = map(string)
}))
}

# Mounted Disk Installation
# -------------------------
variable "ebs_device_name" {
Expand Down Expand Up @@ -124,7 +132,12 @@ variable "ebs_delete_on_termination" {
description = "(Optional if Mounted Disk installation) Whether the volume should be destroyed on instance termination."
}

variable "ebs_snapshot_id" {
type = string
description = "(Optional) The Snapshot ID to mount (instead of a new volume)"
}

variable "enable_disk" {
type = bool
description = "Will you be attaching an EBS block device for a Mounted Disk Installation?"
}
}
15 changes: 15 additions & 0 deletions variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ variable "ami_id" {
description = "AMI ID to use for TFE instances"
}

variable "ec2_launch_template_tag_specifications" {
description = "(Optional) List of tag specifications to apply to the launch template."
type = list(object({
resource_type = string
tags = map(string)
}))
default = []
}

variable "asg_tags" {
type = map(string)
description = "(Optional) Map of tags only used for the autoscaling group. If you are using the AWS provider's default_tags,please note that it tags every taggable resource except for the autoscaling group, therefore this variable may be used to duplicate the key/value pairs in the default_tags if you wish."
Expand Down Expand Up @@ -599,6 +608,12 @@ variable "ebs_volume_type" {
}
}

variable "ebs_snapshot_id" {
type = string
description = "(Optional) The Snapshot ID to mount (instead of a new volume)"
default = null
}

# External Vault ONLY
# -------------------
variable "extern_vault_addr" {
Expand Down

0 comments on commit 96f8777

Please sign in to comment.