From 9fd4768289be65ddc514937a71fc9ea53f209a4d Mon Sep 17 00:00:00 2001
From: Curtis Wilson <cwilso99@peraton.com>
Date: Tue, 24 May 2022 14:36:37 -0400
Subject: [PATCH] checkin

---
 main.tf | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 66 insertions(+), 4 deletions(-)

diff --git a/main.tf b/main.tf
index 6515d23..f64e241 100644
--- a/main.tf
+++ b/main.tf
@@ -1,10 +1,16 @@
 
 locals {
-  k8s-subnets-ids = [
+  old-k8s-subnets-ids = [
     # module.aws-network-from-scratch.subnet.id,
     module.aws-network-existing.subnet-by-name["subnet_1"].id,
     module.aws-network-existing.subnet-by-name["subnet_3"].id,
   ]
+  # TODO Started to try to use the new vpc. However, we need to make sure we're
+  # getting the default security group for the new vpc as well.
+  new-k8s-subnets-ids = [
+    module.aws-network-existing.subnet-by-name["mssdev Subnet 1"].id,
+    module.aws-network-existing.subnet-by-name["mssdev Subnet 3"].id,
+  ]
   nfs-subnets = [
     # module.aws-network-from-scratch.subnet,
     module.aws-network-existing.subnet-by-name["subnet_4"],
@@ -27,23 +33,57 @@ locals {
     "k8s-master" = {
       base-image   = module.aws-ami-constants.ubuntu-ami
       aws-ec2-type = module.ec2-types.t2-medium-4gib-2vcpu
-      subnet-ids   = local.k8s-subnets-ids
+      subnet-ids   = local.old-k8s-subnets-ids
       num          = 1
     },
     "k8s-wrkr" = {
       base-image   = module.aws-ami-constants.ubuntu-ami
       aws-ec2-type = module.ec2-types.c5a-xlarge-amd-8gib-4vcpu
-      subnet-ids   = local.k8s-subnets-ids
+      subnet-ids   = local.old-k8s-subnets-ids
       disk-size    = 32
       num          = 2
     },
+    "worker" = {
+      base-image   = module.aws-ami-constants.ubuntu-ami
+      aws-ec2-type = module.ec2-types.c5a-xlarge-amd-8gib-4vcpu
+      subnet-ids   = local.old-k8s-subnets-ids
+      disk-size    = 64
+      num          = 3
+    },
+    "tst-master" = {
+      base-image   = module.aws-ami-constants.ubuntu-ami
+      aws-ec2-type = module.ec2-types.t2-medium-4gib-2vcpu
+      subnet-ids   = local.old-k8s-subnets-ids
+      num          = 0
+    },
+    "tst-wrkr" = {
+      base-image   = module.aws-ami-constants.ubuntu-ami
+      aws-ec2-type = module.ec2-types.c5a-xlarge-amd-8gib-4vcpu
+      subnet-ids   = local.old-k8s-subnets-ids
+      disk-size    = 32
+      num          = 0
+    },
+    "rancher-master" = {
+      base-image   = module.aws-ami-constants.ubuntu-ami
+      aws-ec2-type = module.ec2-types.c5a-xlarge-amd-8gib-4vcpu
+      subnet-ids   = local.old-k8s-subnets-ids
+      disk-size    = 64
+      num          = 1
+    },
+    "rancher-worker" = {
+      base-image   = module.aws-ami-constants.ubuntu-ami
+      aws-ec2-type = module.ec2-types.c5a-xlarge-amd-8gib-4vcpu
+      subnet-ids   = local.old-k8s-subnets-ids
+      disk-size    = 64
+      num          = 2
+    },
     "dev" = {
       base-image   = module.aws-ami-constants.ubuntu-ami
       aws-ec2-type = module.ec2-types.c5a-xlarge-amd-8gib-4vcpu
       # subnet-ids = [module.aws-network-from-scratch.subnet.id]
       subnet-ids   = [module.aws-network-existing.subnet-by-name["subnet_4"].id]
       disk-size    = 32
-      num          = 1
+      num          = 2
     },
     "nfs" = {
       base-image    = module.aws-ami-constants.ubuntu-ami
@@ -72,6 +112,11 @@ locals {
       size              = 64
       availability_zone = local.nfs-subnets[0].availability_zone
     },
+    "zfs-256g" = {
+      num               = 1,
+      size              = 256
+      availability_zone = local.nfs-subnets[0].availability_zone
+    },
   }
 
   disk-mounts = [
@@ -91,6 +136,22 @@ locals {
       # set.
       drive-letters = ["g", "h", "i"]
     },
+    {
+      # TODO make this attach field work.
+      attach        = false
+      ec2-id        = module.nodes["nfs"].nodes[0].id,
+      disk-group    = "zfs-256g"
+      # TODO also make sure that get drive letters or whetever still works. did
+      # it ever work?
+      # TODO We need to have a map of drive letters to device path in linux.
+      # This gets a little more complicated becuase the t2 instances map to
+      # /dev/xvdg while the t3a instance types map to /dev/nvme0n1 where 0 is
+      # the nth drive connected. The nth drive does not seem to map to a drive
+      # letter, ie. drive letter "f" does not map to 6, the nth drive simply
+      # increments by 1 for each drive attached regardless of the drive letter
+      # set.
+      drive-letters = ["j", "k", "l"]
+    },
   ]
 
   # This is only needed for libvirt.
@@ -188,6 +249,7 @@ module "disk-mounts" {
   count  = length(local.disk-mounts)
 }
 
+# TODO REM remove if unuesed.
 resource "aws_ebs_volume" "zfs" {
   # TODO REM look at types.
   availability_zone = local.nfs-subnets[0].availability_zone