update samples for labs

slalom · May 8, 2020 · b4c59dc · b4c59dc
1 parent 2be0783
commit b4c59dc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/samples/mysql-on-aws/01_rds_mysql.tf b/samples/mysql-on-aws/01_rds_mysql.tf
@@ -1,7 +1,8 @@
 # NOTE: Requires AWS policy 'AmazonRDSFullAccess' on the terraform account
 
+output "summary" { value = module.rds_mysql.summary }
 module "rds_mysql" {
-  # source    = "git::https://github.com/slalom-ggp/dataops-infra.git//catalog/aws/rds?ref=master"
+  # source    = "git::https://github.com/slalom-ggp/dataops-infra.git//catalog/aws/mysql?ref=master"
   source        = "../../catalog/aws/mysql"
   name_prefix   = "${local.project_shortname}-"
   environment   = module.env.environment
@@ -12,7 +13,7 @@ module "rds_mysql" {
   identifier          = "rds-db"
   admin_username      = "mysqladmin"
   admin_password      = "asdfASDF12"
-  skip_final_snapshot = true  # allows simple DB deletion for POC environments
+  skip_final_snapshot = true # allows simple DB deletion for POC environments
 
   /* OPTIONALLY, COPY-PASTE ADDITIONAL SETTINGS FROM BELOW:
 
@@ -24,7 +25,3 @@ module "rds_mysql" {
   */
 
 }
-
-
-output "summary" { value = module.rds_mysql.summary }
-
diff --git a/samples/postgres-on-aws/01_rds_postgres.tf b/samples/postgres-on-aws/01_rds_postgres.tf
@@ -1,7 +1,8 @@
 # NOTE: Requires AWS policy 'AmazonRDSFullAccess' on the terraform account
 
+output "summary" { value = module.rds_postgres.summary }
 module "rds_postgres" {
-  # source    = "git::https://github.com/slalom-ggp/dataops-infra.git//catalog/aws/rds?ref=master"
+  # source    = "git::https://github.com/slalom-ggp/dataops-infra.git//catalog/aws/postgres?ref=master"
   source        = "../../catalog/aws/postgres"
   name_prefix   = "${local.project_shortname}-"
   environment   = module.env.environment
@@ -26,5 +27,4 @@ module "rds_postgres" {
 
 #OPTIONAL CONFIGURATION HERE
 
-output "summary" { value = module.rds_postgres.summary }
 
diff --git a/samples/redshift-dw/02_redshift.tf b/samples/redshift-dw/02_redshift.tf
@@ -1,7 +1,8 @@
 # NOTE: Requires AWS policy 'AmazonRedshiftFullAccess' on the terraform account
 
+output "summary" { value = module.redshift_dw.summary }
 module "redshift_dw" {
-  # source            = "git::https://github.com/slalom-ggp/dataops-infra.git//catalog/aws/redshift?ref=master"
+  # source      = "git::https://github.com/slalom-ggp/dataops-infra.git//catalog/aws/redshift?ref=master"
   source        = "../../catalog/aws/redshift"
   name_prefix   = "${local.project_shortname}-"
   environment   = module.env.environment
@@ -18,8 +19,5 @@ module "redshift_dw" {
   num_nodes         = 1
 
   admin_password    = "asdfAS12"
-  aws_region        = local.aws_region
   */
 }
-
-output "summary" { value = module.redshift_dw.summary }