Merge pull request #354 from openaustralia/new-openaustralia-terraform

Update Terraform configuration for new OpenAustralia server

Author: benrfairless

terraform/main.tf

@@ -94,6 +94,7 @@ module "openaustralia" {
   security_group_service   = aws_security_group.openaustralia
   instance_profile         = aws_iam_instance_profile.logging
   ami                      = var.ubuntu_16_ami
+  ubuntu_22_ami            = var.ubuntu_22_ami
   ubuntu_24_ami            = var.ubuntu_24_ami
   cloudflare_account_id    = var.cloudflare_account_id
 }

terraform/openaustralia/production.tf

@@ -1,16 +1,17 @@
-# New OpenAustralia Production Server on Ubuntu 24.04
+# New OpenAustralia Production Server on Ubuntu 22.04
 # This creates a parallel production environment for OpenAustralia
 
 # After discussion with Brenda, this new server will house both staging and production.
+# Note: Using Ubuntu 22.04 due to Ansible 2.10 compatibility issues with Ubuntu 24.04
 
 resource "aws_instance" "production" {
-  ami = var.ubuntu_24_ami
+  ami = var.ubuntu_22_ami
 
   instance_type = "t3.small"
   ebs_optimized = true
-  key_name      = "test"
+  key_name      = "terraform"
   tags = {
-    Name = "openaustralia"
+    Name = "openaustralia-prod"
   }
 
   # Increase root volume size to 20GB to allow for more packages and data
@@ -44,7 +45,7 @@ resource "aws_ebs_volume" "production_data" {
   size = 20
   type = "gp3"
   tags = {
-    Name = "openaustralia_data"
+    Name = "openaustralia-prod-data"
   }
 }
 

terraform/openaustralia/variables.tf

@@ -3,4 +3,5 @@ variable "security_group_service" {}
 variable "instance_profile" {}
 variable "ami" {}
 variable "cloudflare_account_id" {}
+variable "ubuntu_22_ami" {}
 variable "ubuntu_24_ami" {}