Skip to content

Commit 2af9efd

Browse files
authored
revert not reviewed changes (#356)
* revert * revert
1 parent 76ad4d7 commit 2af9efd

22 files changed

+4
-892
lines changed

examples/standalone-redis/README.md

Lines changed: 0 additions & 55 deletions
This file was deleted.

examples/standalone-redis/data.tf

Lines changed: 0 additions & 18 deletions
This file was deleted.

examples/standalone-redis/locals.tf

Lines changed: 0 additions & 7 deletions
This file was deleted.

examples/standalone-redis/main.tf

Lines changed: 0 additions & 62 deletions
This file was deleted.

examples/standalone-redis/outputs.tf

Lines changed: 0 additions & 3 deletions
This file was deleted.

examples/standalone-redis/terraform.tfvars.example

Lines changed: 0 additions & 9 deletions
This file was deleted.

examples/standalone-redis/variables.tf

Lines changed: 0 additions & 70 deletions
This file was deleted.

examples/standalone-redis/versions.tf

Lines changed: 0 additions & 16 deletions
This file was deleted.

locals.tf

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,7 @@ locals {
6565
aws_elasticache_subnet_group_name = null
6666
aws_security_group_redis = null
6767
}
68-
) : var.enable_redis_mtls ? try(
69-
module.redis_mtls[0],
70-
{
71-
hostname = null
72-
password = null
73-
username = null
74-
redis_port = null
75-
use_password_auth = null
76-
use_tls = null
77-
sentinel_enabled = var.enable_redis_sentinel
78-
sentinel_hosts = []
79-
sentinel_leader = null
80-
sentinel_username = null
81-
sentinel_password = null
82-
aws_elasticache_subnet_group_name = null
83-
aws_security_group_redis = null
84-
}
85-
) : try(
68+
) : try(
8669
module.redis[0],
8770
{
8871
hostname = null

main.tf

Lines changed: 3 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -115,33 +115,6 @@ module "redis_sentinel" {
115115
network_private_subnet_cidrs = local.network_private_subnet_cidrs
116116
}
117117

118-
# -----------------------------------------------------------------------------
119-
# Redis Sentinel
120-
# -----------------------------------------------------------------------------
121-
122-
module "redis_mtls" {
123-
count = var.enable_redis_mtls ? 1 : 0
124-
source = "./modules/redis-standalone-mtls"
125-
# This module is used to deploy a Redis instance with mTLS enabled.
126-
127-
domain_name = var.domain_name
128-
ca_cert = var.redis_client_ca
129-
fullchain = var.redis_client_cert
130-
privkey = var.redis_client_key
131-
redis_authentication_mode = "NONE" # mTLS does not use password authentication
132-
aws_iam_instance_profile = module.service_accounts.iam_instance_profile.name
133-
asg_tags = var.asg_tags
134-
ec2_launch_template_tag_specifications = var.ec2_launch_template_tag_specifications
135-
friendly_name_prefix = var.friendly_name_prefix
136-
health_check_grace_period = var.health_check_grace_period
137-
health_check_type = var.health_check_type
138-
instance_type = var.instance_type
139-
key_name = var.key_name
140-
network_id = local.network_id
141-
network_subnets_private = local.network_private_subnets
142-
network_private_subnet_cidrs = local.network_private_subnet_cidrs
143-
}
144-
145118
# -----------------------------------------------------------------------------
146119
# AWS PostreSQL Database
147120
# -----------------------------------------------------------------------------
@@ -197,7 +170,7 @@ module "aurora_database" {
197170
# Docker Compose File Config for TFE on instance(s) using Flexible Deployment Options
198171
# ------------------------------------------------------------------------------------
199172
module "runtime_container_engine_config" {
200-
source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/runtime_container_engine_config?ref=redis-standalone"
173+
source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/runtime_container_engine_config?ref=main"
201174
count = var.is_replicated_deployment ? 0 : 1
202175

203176
tfe_license = var.hc_license
@@ -255,11 +228,6 @@ module "runtime_container_engine_config" {
255228
redis_sentinel_leader_name = local.redis.sentinel_leader
256229
redis_sentinel_user = local.redis.sentinel_username
257230
redis_sentinel_password = local.redis.sentinel_password
258-
redis_use_mtls = var.enable_redis_mtls
259-
redis_ca_cert_path = "/etc/ssl/private/terraform-enterprise/redis/ca_cert.pem"
260-
redis_client_cert_path = "/etc/ssl/private/terraform-enterprise/redis/cert.pem"
261-
redis_client_key_path = "/etc/ssl/private/terraform-enterprise/redis/key.pem"
262-
263231

264232
trusted_proxies = local.trusted_proxies
265233

@@ -275,7 +243,7 @@ module "runtime_container_engine_config" {
275243
# AWS cloud init used to install and configure TFE on instance(s) using Flexible Deployment Options
276244
# --------------------------------------------------------------------------------------------------
277245
module "tfe_init_fdo" {
278-
source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/tfe_init?ref=redis-standalone"
246+
source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/tfe_init?ref=main"
279247
count = var.is_replicated_deployment ? 0 : 1
280248

281249
cloud = "aws"
@@ -290,11 +258,6 @@ module "tfe_init_fdo" {
290258
ca_certificate_secret_id = var.ca_certificate_secret_id == null ? null : var.ca_certificate_secret_id
291259
certificate_secret_id = var.vm_certificate_secret_id == null ? null : var.vm_certificate_secret_id
292260
key_secret_id = var.vm_key_secret_id == null ? null : var.vm_key_secret_id
293-
294-
# redis_use_mtls = var.enable_redis_mtls
295-
# redis_ca_certificate_secret_id = var.redis_ca_certificate_secret_id == null ? null : var.redis_ca_certificate_secret_id
296-
# redis_certificate_secret_id = var.redis_vm_certificate_secret_id == null ? null : var.redis_vm_certificate_secret_id
297-
# redis_key_secret_id = var.redis_vm_key_secret_id == null ? null : var.redis_vm_key_secret_id
298261

299262
proxy_ip = var.proxy_ip != null ? var.proxy_ip : null
300263
proxy_port = var.proxy_ip != null ? var.proxy_port : null
@@ -314,7 +277,7 @@ module "tfe_init_fdo" {
314277
# TFE and Replicated settings to pass to the tfe_init_replicated module for replicated deployment
315278
# --------------------------------------------------------------------------------------------
316279
module "settings" {
317-
source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/settings?ref=redis-standalone"
280+
source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/settings?ref=main"
318281
count = var.is_replicated_deployment ? 1 : 0
319282

320283
# TFE Base Configuration

modules/redis-standalone-mtls/files/compose.yaml

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)