Update AMI ID (#2193)

cisagov · Sep 15, 2023 · ae75292 · ae75292
1 parent 10c0419
commit ae75292
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 20 deletions.
diff --git a/infrastructure/database.tf b/infrastructure/database.tf
@@ -57,24 +57,6 @@ resource "aws_db_instance" "db" {
   }
 }
 
-data "aws_ami" "ubuntu" {
-
-  most_recent = true
-
-  filter {
-    name   = "name"
-    values = ["ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*"]
-  }
-
-  filter {
-    name   = "virtualization-type"
-    values = ["hvm"]
-  }
-
-  # Canonical
-  owners = ["513442679011"]
-}
-
 resource "aws_iam_role" "db_accessor" {
   name               = "crossfeed-db-accessor-${var.stage}"
   assume_role_policy = <<EOF
@@ -139,7 +121,7 @@ EOF
 
 resource "aws_instance" "db_accessor" {
   count                       = var.create_db_accessor_instance ? 1 : 0
-  ami                         = data.aws_ami.ubuntu.id
+  ami                         = var.ami_id
   instance_type               = var.db_accessor_instance_class
   associate_public_ip_address = false
 

diff --git a/infrastructure/elastic.tf b/infrastructure/elastic.tf
@@ -2,7 +2,7 @@
 
 resource "aws_instance" "elk_stack" {
   count                       = var.create_elk_instance ? 1 : 0
-  ami                         = data.aws_ami.ubuntu.id
+  ami                         = var.ami_id
   instance_type               = var.elk_instance_class
   associate_public_ip_address = false
 

diff --git a/infrastructure/prod.tfvars b/infrastructure/prod.tfvars
@@ -64,3 +64,4 @@ create_db_accessor_instance       = true
 db_accessor_instance_class        = "t3.2xlarge"
 create_elk_instance               = false
 elk_instance_class                = "t3.2xlarge"
+ami_id = "ami-064cd328d8f9a9f00"
diff --git a/infrastructure/stage.tfvars b/infrastructure/stage.tfvars
@@ -65,3 +65,4 @@ create_db_accessor_instance       = true
 db_accessor_instance_class        = "t3.2xlarge"
 create_elk_instance               = true
 elk_instance_class                = "t3.2xlarge"
+ami_id = "ami-064cd328d8f9a9f00"
diff --git a/infrastructure/vars.tf b/infrastructure/vars.tf
@@ -400,3 +400,9 @@ variable "create_elk_instance" {
   type        = bool
   default     = false
 }
+
+variable "ami_id" {
+  description = "ID of the AMI to use for EC2 instances."
+  type        = string
+  default     = "ami-064cd328d8f9a9f00"
+}