updates for sumo dev rds provisioning (#657)

mozmeao · Nov 29, 2017 · f19c3c4 · f19c3c4
1 parent 531b60c
commit f19c3c4
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/apps/sumo/infra/multi_region/tf/main.tf b/apps/sumo/infra/multi_region/tf/main.tf
@@ -15,7 +15,7 @@ terraform {
 #########################################
 # Redis
 #########################################
-
+/*
 module "redis-stage" {
     source = "redis"
     redis_name = "stage"
@@ -33,12 +33,29 @@ module "redis-prod" {
     subnets = "${var.subnets}"
     nodes_security_group = "${var.nodes_security_group}"
 }
-
+*/
 
 #########################################
 # MySQL
 #########################################
+module "mysql-dev" {
+    source = "rds"
+    mysql_env     = "dev"
+    # DBName must begin with a letter and contain only alphanumeric characters
+    mysql_db_name = "sumo_dev"
+    mysql_username = "root"
+    mysql_password = "${var.mysql_dev_password}"
+    mysql_identifier = "sumo-dev"
+    mysql_instance_class = "db.t2.small"
+    mysql_backup_retention_days = 0
+    mysql_security_group_name = "sumo_rds_sg_dev"
+    mysql_storage_gb = 250
+    mysql_storage_type = "gp2"
+    vpc_id = "${var.vpc_id}"
+    vpc_cidr = "${var.vpc_cidr}"
+}
 
+/*
 module "mysql-stage" {
     source = "rds"
     mysql_env     = "stage"
@@ -49,8 +66,8 @@ module "mysql-stage" {
     mysql_identifier = "sumo-stage"
     mysql_instance_class = "db.t2.small"
     mysql_backup_retention_days = 0
-    mysql_security_group_name = "sumo_rds_sg"
-    mysql_storage_gb = 100
+    mysql_security_group_name = "sumo_rds_sg_stage"
+    mysql_storage_gb = 250
     mysql_storage_type = "gp2"
     vpc_id = "${var.vpc_id}"
     vpc_cidr = "${var.vpc_cidr}"
@@ -67,9 +84,10 @@ module "mysql-prod" {
     mysql_instance_class = "db.m4.xlarge"
     mysql_backup_retention_days = 7
     mysql_security_group_name = "sumo_rds_sg_prod"
-    mysql_storage_gb = 200
+    mysql_storage_gb = 250
     mysql_storage_type = "gp2"
     vpc_id = "${var.vpc_id}"
     vpc_cidr = "${var.vpc_cidr}"
 }
+*/
 
diff --git a/apps/sumo/infra/multi_region/tf/rds/rds.tf b/apps/sumo/infra/multi_region/tf/rds/rds.tf
@@ -53,7 +53,7 @@ variable "mysql_backup_window" {
 }
 
 variable "mysql_maintenance_window" {
-  default = "Sun:11:30-Sun:11:59"
+  default = "Sun:11:29-Sun:11:59"
 }
 
 variable "mysql_storage_encrypted" {
@@ -121,6 +121,6 @@ resource "aws_security_group" "sumo_rds_sg" {
   }
 
   tags {
-    Name = "sumo_rds_sg"
+    Name = "${var.mysql_security_group_name}"
   }
 }
diff --git a/apps/sumo/infra/multi_region/tf/variables.tf b/apps/sumo/infra/multi_region/tf/variables.tf
@@ -6,9 +6,13 @@ variable "nodes_security_group" {}
 
 variable "vpc_id" {}
 
+variable "mysql_dev_password" {}
+
+/*
 variable "mysql_stage_password" {}
 
 variable "mysql_prod_password" {}
+*/
 
 variable "vpc_cidr" {}