From 336f742b12fbd82b8925e9293c9b9464b5af65a2 Mon Sep 17 00:00:00 2001
From: Cameron Stokes <cameron@cameronstokes.com>
Date: Mon, 22 Jul 2024 13:57:04 -0700
Subject: [PATCH] terraform/aws: aws-ec2-instance-dual-stack-ipv4-ipv6, add
 ipv6_address_count

---
 terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/main.tf  | 3 ++-
 terraform/aws/internal-modules/aws-ec2-instance/main.tf      | 1 +
 terraform/aws/internal-modules/aws-ec2-instance/variables.tf | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/main.tf b/terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/main.tf
index dc86a77..0fadc53 100644
--- a/terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/main.tf
+++ b/terraform/aws/aws-ec2-instance-dual-stack-ipv4-ipv6/main.tf
@@ -39,10 +39,11 @@ module "tailscale_aws_ec2" {
   instance_type = "t4g.micro"
   instance_tags = local.tags
 
-  subnet_id = module.vpc.public_subnets[0]
+  subnet_id = module.vpc.private_subnets[0]
   vpc_security_group_ids = [
     module.vpc.tailscale_security_group_id,
   ]
+  ipv6_address_count = 1
 
   # Variables for Tailscale resources
   tailscale_hostname = local.name
diff --git a/terraform/aws/internal-modules/aws-ec2-instance/main.tf b/terraform/aws/internal-modules/aws-ec2-instance/main.tf
index c89206c..304b392 100644
--- a/terraform/aws/internal-modules/aws-ec2-instance/main.tf
+++ b/terraform/aws/internal-modules/aws-ec2-instance/main.tf
@@ -42,6 +42,7 @@ resource "aws_instance" "tailscale_instance" {
 
   subnet_id              = var.subnet_id
   vpc_security_group_ids = var.vpc_security_group_ids
+  ipv6_address_count     = var.ipv6_address_count
   source_dest_check      = !module.tailscale_install_scripts.ip_forwarding_required
 
   iam_instance_profile = var.instance_profile_name
diff --git a/terraform/aws/internal-modules/aws-ec2-instance/variables.tf b/terraform/aws/internal-modules/aws-ec2-instance/variables.tf
index c4631b8..0c54e90 100644
--- a/terraform/aws/internal-modules/aws-ec2-instance/variables.tf
+++ b/terraform/aws/internal-modules/aws-ec2-instance/variables.tf
@@ -4,6 +4,10 @@
 variable "subnet_id" {
   type = string
 }
+variable "ipv6_address_count" {
+  type    = number
+  default = null
+}
 variable "vpc_security_group_ids" {
   type = set(string)
 }