diff --git a/manifest.yml b/manifest.yml index a8a3e7f2b..e026ea09b 100644 --- a/manifest.yml +++ b/manifest.yml @@ -11,7 +11,7 @@ applications: services: - notify-api-rds-((env)) - - notify-api-redis-v70-((env)) + - notify-api-redis-((env)) - notify-api-csv-upload-bucket-((env)) - name: notify-api-ses-((env)) parameters: diff --git a/terraform/production/main.tf b/terraform/production/main.tf index feadd4833..84c81bb1f 100644 --- a/terraform/production/main.tf +++ b/terraform/production/main.tf @@ -30,20 +30,6 @@ module "redis" { # default v6.2; delete after v7.0 resource is bound redis_plan_name = "redis-3node-large" } -module "redis-v70" { - source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0" - - cf_org_name = local.cf_org_name - cf_space_name = local.cf_space_name - name = "${local.app_name}-redis-v70-${local.env}" - redis_plan_name = "redis-dev" - json_params = jsonencode( - { - "engineVersion" : "7.0", - } - ) -} - module "csv_upload_bucket" { source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0" diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf index 4fdbf9e38..3cc0358a5 100644 --- a/terraform/staging/main.tf +++ b/terraform/staging/main.tf @@ -21,6 +21,15 @@ module "database" { rds_plan_name = "micro-psql" } +module "redis" { # default v6.2; delete after v7.0 resource is bound + source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0" + + cf_org_name = local.cf_org_name + cf_space_name = local.cf_space_name + name = "${local.app_name}-redis-${local.env}" + redis_plan_name = "redis-dev" +} + module "redis-v70" { source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0"