Explorar el Código

Runnign with the terminated idea, I add a 'todo' module

No point in having idle jira instances that don't do anything, but we'll
probably want them someday.

I really don't know if this is better than just not having
Fred Damstra hace 4 años
padre
commit
3c86e5de28

+ 15 - 14
test/aws-us-gov/mdr-test-c2/210-rds-jira/terragrunt.hcl

@@ -15,7 +15,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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/jira/rds_jira?ref=v1.21.4"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/todo?ref=v1.21.7"
 }
 
 # Include all settings from the root terragrunt.hcl file
@@ -23,20 +23,21 @@ include {
   path = find_in_parent_folders()
 }
 
-dependency "vpc" {
-  config_path = "../010-vpc-public"
-}
+#dependency "vpc" {
+#  config_path = "../010-vpc-public"
+#}
 
 # These are the variables we have to pass in to use the module specified in the terragrunt source above
 inputs = {
-  # All of the inputs from the inherited hcl files are available automatically
-  # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
-  # will be more flexible if you specify particular input values.
-  tags = {
-    Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
-  }
-  identifier = "jira2"
-  instance_type = local.account_vars.locals.instance_types["jira-rds"]
-  vpc_id = dependency.vpc.outputs.vpc_id
-  subnets = dependency.vpc.outputs.private_subnets
+#  # All of the inputs from the inherited hcl files are available automatically
+#  # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
+#  # will be more flexible if you specify particular input values.
+#  tags = {
+#    Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
+#  }
+#  identifier = "jira2"
+#  instance_type = local.account_vars.locals.instance_types["jira-rds"]
+#  vpc_id = dependency.vpc.outputs.vpc_id
+#  subnets = dependency.vpc.outputs.private_subnets
+   notes = "Jira has been implemented by hand in prod, and no test instance exists."
 }

+ 23 - 22
test/aws-us-gov/mdr-test-c2/220-instance-jira/terragrunt.hcl

@@ -13,16 +13,16 @@ 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.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/jira/instance_jira?ref=v1.21.6"
+  source = "git@github.xdr.accenturefederalcyber.com:mdr-engineering/xdr-terraform-modules.git//base/todo?ref=v1.21.7"
 }
 
-dependency "vpc" {
-  config_path = "../010-vpc-public"
-}
-
-dependency "rds" {
-  config_path = "../210-rds-jira"
-}
+#dependency "vpc" {
+#  config_path = "../010-vpc-public"
+#}
+#
+#dependency "rds" {
+#  config_path = "../210-rds-jira"
+#}
 
 # Include all settings from the root terragrunt.hcl file
 include {
@@ -31,18 +31,19 @@ include {
 
 # These are the variables we have to pass in to use the module specified in the terragrunt source above
 inputs = {
-  # All of the inputs from the inherited hcl files are available automatically
-  # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
-  # will be more flexible if you specify particular input values.
-  tags = {
-    Purpose = "Jira Ticketing"
-    Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
-  }
-  instance_count = local.account_vars.locals.github_instance_count
-  instance_type = local.account_vars.locals.instance_types["jira-server"]
-  vpc_id = dependency.vpc.outputs.vpc_id
-  azs = dependency.vpc.outputs.azs
-  public_subnets = dependency.vpc.outputs.public_subnets
-  private_subnets = dependency.vpc.outputs.private_subnets
-  rds_sg = dependency.rds.outputs.security_group_id
+#  # All of the inputs from the inherited hcl files are available automatically
+#  # (via the `inputs` section of the root `terragrunt.hcl`). However, modules
+#  # will be more flexible if you specify particular input values.
+#  tags = {
+#    Purpose = "Jira Ticketing"
+#    Terraform = "aws/${basename(get_parent_terragrunt_dir())}/${path_relative_to_include()}/"
+#  }
+#  instance_count = local.account_vars.locals.github_instance_count
+#  instance_type = local.account_vars.locals.instance_types["jira-server"]
+#  vpc_id = dependency.vpc.outputs.vpc_id
+#  azs = dependency.vpc.outputs.azs
+#  public_subnets = dependency.vpc.outputs.public_subnets
+#  private_subnets = dependency.vpc.outputs.private_subnets
+#  rds_sg = dependency.rds.outputs.security_group_id
+   notes = "Jira has been implemented by hand in prod, and no test instance exists."
 }