archive old ec2, and new ec2 setup

terraform-modules · Apr 19, 2023 · 5bf11bc · 5bf11bc
1 parent a574d43
commit 5bf11bc
Show file tree

Hide file tree

Showing 41 changed files with 41 additions and 0 deletions.
diff --git a/...n-vpcN-new/apps/test-instances/.gitignore → ...n-vpcN-new/apps/test-instances/.gitignore b/...n-vpcN-new/apps/test-instances/.gitignore → ...n-vpcN-new/apps/test-instances/.gitignore
diff --git a/...w/apps/test-instances/.terraform-docs.yml → ...w/apps/test-instances/.terraform-docs.yml b/...w/apps/test-instances/.terraform-docs.yml → ...w/apps/test-instances/.terraform-docs.yml
diff --git a/...on-vpcN-new/apps/test-instances/README.md → ...on-vpcN-new/apps/test-instances/README.md b/...on-vpcN-new/apps/test-instances/README.md → ...on-vpcN-new/apps/test-instances/README.md
diff --git a/...gion-vpcN-new/apps/test-instances/data.tf → ...gion-vpcN-new/apps/test-instances/data.tf b/...gion-vpcN-new/apps/test-instances/data.tf → ...gion-vpcN-new/apps/test-instances/data.tf
diff --git a/...cN-new/apps/test-instances/ec2-keypair.tf → ...cN-new/apps/test-instances/ec2-keypair.tf b/...cN-new/apps/test-instances/ec2-keypair.tf → ...cN-new/apps/test-instances/ec2-keypair.tf
diff --git a/...-vpcN-new/apps/test-instances/ec2-role.tf → ...-vpcN-new/apps/test-instances/ec2-role.tf b/...-vpcN-new/apps/test-instances/ec2-role.tf → ...-vpcN-new/apps/test-instances/ec2-role.tf
diff --git a/...egion-vpcN-new/apps/test-instances/ec2.tf → ...egion-vpcN-new/apps/test-instances/ec2.tf b/...egion-vpcN-new/apps/test-instances/ec2.tf → ...egion-vpcN-new/apps/test-instances/ec2.tf
diff --git a/...cN-new/apps/test-instances/ec2.tf.example → ...cN-new/apps/test-instances/ec2.tf.example b/...cN-new/apps/test-instances/ec2.tf.example → ...cN-new/apps/test-instances/ec2.tf.example
diff --git a/...cN-new/apps/test-instances/install-ssm.sh → ...cN-new/apps/test-instances/install-ssm.sh b/...cN-new/apps/test-instances/install-ssm.sh → ...cN-new/apps/test-instances/install-ssm.sh
diff --git a/...on-vpcN-new/apps/test-instances/locals.tf → ...on-vpcN-new/apps/test-instances/locals.tf b/...on-vpcN-new/apps/test-instances/locals.tf → ...on-vpcN-new/apps/test-instances/locals.tf
diff --git a/.../apps/test-instances/settings.auto.tfvars → .../apps/test-instances/settings.auto.tfvars b/.../apps/test-instances/settings.auto.tfvars → .../apps/test-instances/settings.auto.tfvars
diff --git a/...-vpcN-new/apps/test-instances/settings.tf → ...-vpcN-new/apps/test-instances/settings.tf b/...-vpcN-new/apps/test-instances/settings.tf → ...-vpcN-new/apps/test-instances/settings.tf
diff --git a/...apps/test-instances/show-tunnel-status.sh → ...apps/test-instances/show-tunnel-status.sh b/...apps/test-instances/show-tunnel-status.sh → ...apps/test-instances/show-tunnel-status.sh
diff --git a/...test-instances/templates/test-ips.txt.tpl → ...test-instances/templates/test-ips.txt.tpl b/...test-instances/templates/test-ips.txt.tpl → ...test-instances/templates/test-ips.txt.tpl
diff --git a/...vpcN-new/apps/test-instances/test-ping.sh → ...vpcN-new/apps/test-instances/test-ping.sh b/...vpcN-new/apps/test-instances/test-ping.sh → ...vpcN-new/apps/test-instances/test-ping.sh
diff --git a/...-vpcN-new/apps/test-instances/test-ssh.sh → ...-vpcN-new/apps/test-instances/test-ssh.sh b/...-vpcN-new/apps/test-instances/test-ssh.sh → ...-vpcN-new/apps/test-instances/test-ssh.sh
diff --git a/...-vpcN-new/apps/test-instances/tf-run.data → ...-vpcN-new/apps/test-instances/tf-run.data b/...-vpcN-new/apps/test-instances/tf-run.data → ...-vpcN-new/apps/test-instances/tf-run.data
diff --git a/...vpcN-new/apps/test-instances/variables.tf → ...vpcN-new/apps/test-instances/variables.tf b/...vpcN-new/apps/test-instances/variables.tf → ...vpcN-new/apps/test-instances/variables.tf
diff --git a/examples/ec2-vpc-region-vpcN/apps/README.md → .../ATTIC/ec2-vpc-region-vpcN/apps/README.md b/examples/ec2-vpc-region-vpcN/apps/README.md → .../ATTIC/ec2-vpc-region-vpcN/apps/README.md
diff --git a/examples/ec2-vpc-region-vpcN/apps/region.tf → .../ATTIC/ec2-vpc-region-vpcN/apps/region.tf b/examples/ec2-vpc-region-vpcN/apps/region.tf → .../ATTIC/ec2-vpc-region-vpcN/apps/region.tf
diff --git a/...egion-vpcN/apps/test-instances/.gitignore → ...egion-vpcN/apps/test-instances/.gitignore b/...egion-vpcN/apps/test-instances/.gitignore → ...egion-vpcN/apps/test-instances/.gitignore
diff --git a/...N/apps/test-instances/.terraform-docs.yml → ...N/apps/test-instances/.terraform-docs.yml b/...N/apps/test-instances/.terraform-docs.yml → ...N/apps/test-instances/.terraform-docs.yml
diff --git a/...region-vpcN/apps/test-instances/README.md → ...region-vpcN/apps/test-instances/README.md b/...region-vpcN/apps/test-instances/README.md → ...region-vpcN/apps/test-instances/README.md
diff --git a/...c-region-vpcN/apps/test-instances/data.tf → ...c-region-vpcN/apps/test-instances/data.tf b/...c-region-vpcN/apps/test-instances/data.tf → ...c-region-vpcN/apps/test-instances/data.tf
diff --git a/...n-vpcN/apps/test-instances/ec2-keypair.tf → ...n-vpcN/apps/test-instances/ec2-keypair.tf b/...n-vpcN/apps/test-instances/ec2-keypair.tf → ...n-vpcN/apps/test-instances/ec2-keypair.tf
diff --git a/...gion-vpcN/apps/test-instances/ec2-role.tf → ...gion-vpcN/apps/test-instances/ec2-role.tf b/...gion-vpcN/apps/test-instances/ec2-role.tf → ...gion-vpcN/apps/test-instances/ec2-role.tf
diff --git a/...pc-region-vpcN/apps/test-instances/ec2.tf → ...pc-region-vpcN/apps/test-instances/ec2.tf b/...pc-region-vpcN/apps/test-instances/ec2.tf → ...pc-region-vpcN/apps/test-instances/ec2.tf
diff --git a/...region-vpcN/apps/test-instances/locals.tf → ...region-vpcN/apps/test-instances/locals.tf b/...region-vpcN/apps/test-instances/locals.tf → ...region-vpcN/apps/test-instances/locals.tf
diff --git a/.../apps/test-instances/settings.auto.tfvars → .../apps/test-instances/settings.auto.tfvars b/.../apps/test-instances/settings.auto.tfvars → .../apps/test-instances/settings.auto.tfvars
diff --git a/...gion-vpcN/apps/test-instances/settings.tf → ...gion-vpcN/apps/test-instances/settings.tf b/...gion-vpcN/apps/test-instances/settings.tf → ...gion-vpcN/apps/test-instances/settings.tf
diff --git a/...apps/test-instances/show-tunnel-status.sh → ...apps/test-instances/show-tunnel-status.sh b/...apps/test-instances/show-tunnel-status.sh → ...apps/test-instances/show-tunnel-status.sh
diff --git a/...test-instances/templates/test-ips.txt.tpl → ...test-instances/templates/test-ips.txt.tpl b/...test-instances/templates/test-ips.txt.tpl → ...test-instances/templates/test-ips.txt.tpl
diff --git a/...vpcN/apps/test-instances/test-ips.txt.tpl → ...vpcN/apps/test-instances/test-ips.txt.tpl b/...vpcN/apps/test-instances/test-ips.txt.tpl → ...vpcN/apps/test-instances/test-ips.txt.tpl
diff --git a/...ion-vpcN/apps/test-instances/test-ping.sh → ...ion-vpcN/apps/test-instances/test-ping.sh b/...ion-vpcN/apps/test-instances/test-ping.sh → ...ion-vpcN/apps/test-instances/test-ping.sh
diff --git a/...gion-vpcN/apps/test-instances/test-ssh.sh → ...gion-vpcN/apps/test-instances/test-ssh.sh b/...gion-vpcN/apps/test-instances/test-ssh.sh → ...gion-vpcN/apps/test-instances/test-ssh.sh
diff --git a/...gion-vpcN/apps/test-instances/tf-run.data → ...gion-vpcN/apps/test-instances/tf-run.data b/...gion-vpcN/apps/test-instances/tf-run.data → ...gion-vpcN/apps/test-instances/tf-run.data
diff --git a/...ion-vpcN/apps/test-instances/variables.tf → ...ion-vpcN/apps/test-instances/variables.tf b/...ion-vpcN/apps/test-instances/variables.tf → ...ion-vpcN/apps/test-instances/variables.tf
diff --git a/...ples/ec2-vpc-region-vpcN/apps/tf-run.data → ...TTIC/ec2-vpc-region-vpcN/apps/tf-run.data b/...ples/ec2-vpc-region-vpcN/apps/tf-run.data → ...TTIC/ec2-vpc-region-vpcN/apps/tf-run.data
diff --git a/examples/vpcN-ec2-test-instance/instances.tf b/examples/vpcN-ec2-test-instance/instances.tf
@@ -0,0 +1,9 @@
+module "instances" {
+  source = "git@github.e.it.census.gov:terraform-modules/aws-ec2-test-instance.git"
+
+  account_alias   = var.account_alias
+  vpc_id          = local.vpc_outputs.vpc_id
+  vpc_domain_name = var.vpc_domain_name
+  instance_count  = 1
+  subnet_filters  = { "tag:boc:vpc:subnet_label" = ["apps"] }
+}
diff --git a/examples/vpcN-ec2-test-instance/locals.tf b/examples/vpcN-ec2-test-instance/locals.tf
@@ -0,0 +1,4 @@
+locals {
+  vpc_outputs = data.terraform_remote_state.vpc_SHORTREGION_VPC.outputs
+  vpc_id      = local.vpc_outputs.vpc_id
+}
diff --git a/examples/vpcN-ec2-test-instance/tf-run.data b/examples/vpcN-ec2-test-instance/tf-run.data
@@ -0,0 +1,28 @@
+VERSION 1.2.2
+REMOTE-STATE
+COMMAND tf-directory-setup.py -l none -f
+COMMAND setup-new-directory.sh
+COMMAND tf-init -upgrade
+LINK variables.vpc.auto.tfvars
+LINK variables.vpc.tf
+
+LINKTOP includes.d/variables.account_tags.tf
+LINKTOP includes.d/variables.account_tags.auto.tfvars
+LINKTOP includes.d/variables.infrastructure_tags.tf
+LINKTOP includes.d/variables.infrastructure_tags.auto.tfvars
+LINKTOP includes.d/variables.application_tags.tf
+LINKTOP includes.d/variables.application_tags.auto.tfvars
+
+LINKTOP provider_configs.d/provider.ldap_new.auto.tfvars
+LINKTOP provider_configs.d/provider.ldap_new.tf
+LINKTOP provider_configs.d/provider.ldap_new.variables.tf
+
+ALL
+
+COMMAND tf-directory-setup.py -l s3
+
+COMMENT Execute for create:
+COMMENT   ./setup/manage-git-secret.sh add
+COMMENT Execute for destroy:
+COMMENT   ./setup/manage-git-secret.sh remove
+COMMENT followed by the appropriate git commands to commit and create a PR