Gets rid of the redundant xdr- prefix

common/aws-us-gov/partition.hcl

@@ -14,9 +14,9 @@ locals {
   # Don't forget `lifecycle { ignore_changes = ["ami"] }` in yoru ec2
   # builds!
   amis = {
-    "rhel7-base"   = "ami-07bc8289a7cc97304",
-    "rhel7-master" = "ami-0b2284c85a8635731",
-    "rhel7-minion" = "ami-06df5afc7636bd980"
+    "rhel7-base"   = "ami-0767b07af716390e4",
+    "rhel7-master" = "ami-01e1c45b087777413",
+    "rhel7-minion" = "ami-0f3d22321d9037644"
   }
   default_ami = local.amis["rhel7-minion"] # Allows us to easily change to a new base standard
 

test/aws-us-gov/mdr-test-c2/018-interconnect-instances/README.md

@@ -0,0 +1,24 @@
+# XDR Interconnect Instances
+
+Instances to interconnect govcloud with commercial
+
+# Full Connectivity Update
+
+Untested, but starting to take notes:
+
+1. Verify that nothing would be rebuilt
+```
+terragrunt plan
+```
+1. Stop routing daemon on instance? (May not be necessary)
+1. Taint one instance: 
+```
+terragrunt taint aws_instance.xdr_interconnects[0]
+```
+1. Rebuild
+```
+terragrunt apply
+```
+1. Validate routing is back up
+1. Repeat for other servers.
+

test/aws-us-gov/mdr-test-c2/018-xdr-interconnect-instances/terragrunt.hcl → test/aws-us-gov/mdr-test-c2/018-interconnect-instances/terragrunt.hcl

@@ -13,7 +13,7 @@ locals {
 # working directory, into a temporary folder, and execute your Terraform commands in that folder.
 terraform {
   # Double slash is intentional and required to show root of modules
-  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/xdr_interconnects?ref=v0.3.1"
+  source = "git@github.mdr.defpoint.com:mdr-engineering/xdr-terraform-modules.git//base/interconnects?ref=v0.3.1"
 }
 
 dependency "security_vpc" {

test/aws-us-gov/mdr-test-c2/018-xdr-interconnect-instances/README.md

@@ -1,3 +0,0 @@
-# XDR Interconnect Instances
-
-Instances to interconnect govcloud with commercial

test/aws-us-gov/mdr-test-c2/020-transit-gateway-interconnect-vpn/terragrunt.hcl

@@ -15,8 +15,8 @@ dependency "transit-gateway-hub" {
   config_path = "../008-transit-gateway-hub"
 }
 
-dependency "xdr-interconnect-instances" {
-  config_path = "../018-xdr-interconnect-instances"
+dependency "interconnect-instances" {
+  config_path = "../018-interconnect-instances"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -34,6 +34,6 @@ inputs = {
     Purpose = "Transit Gateway VPN"
     Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
   }
-  xdr_interconnect_public_ips = dependency.xdr-interconnect-instances.outputs.public_ips
+  interconnect_public_ips = dependency.interconnect-instances.outputs.public_ips
   transit_gateway_id = dependency.transit-gateway-hub.outputs.tgw_id
 }

test/aws-us-gov/mdr-test-c2/account.hcl

@@ -20,9 +20,9 @@ locals {
 
   security_vpc_cidr = "10.179.128.0/22"
 
-  # XDR-Interconnects
-  xdr_interconnect_asn = 64888
-  xdr_interconnects_instance_type = "t3a.micro"
-  xdr_interconnects_key_name = "fdamstra" # DO NOT CHANGE
-  xdr_interconnects_count = 2
+  # Interconnects
+  interconnect_asn = 64888
+  interconnects_instance_type = "t3a.micro"
+  interconnects_key_name = "fdamstra" # DO NOT CHANGE
+  interconnects_count = 2
 }