From 6c17b24e7bfe5f7c65f9ec550da7206f9ed67b09 Mon Sep 17 00:00:00 2001 From: John Kerry Date: Wed, 3 Apr 2024 10:59:13 -0400 Subject: [PATCH] Removes non-consolidated settings --- main.tf | 19 +++++++-------- tests/private-active-active/main.tf | 1 - tests/private-active-active/variables.tf | 6 ----- tests/private-tcp-active-active/main.tf | 23 +++++++++--------- tests/private-tcp-active-active/variables.tf | 6 ----- tests/public-active-active/main.tf | 22 ++++++++--------- tests/public-active-active/variables.tf | 6 ----- tests/standalone-external/main.tf | 19 +++++++-------- tests/standalone-external/variables.tf | 6 ----- tests/standalone-mounted-disk/main.tf | 25 ++++++++++---------- tests/standalone-mounted-disk/variables.tf | 6 ----- variables.tf | 6 ----- 12 files changed, 51 insertions(+), 94 deletions(-) diff --git a/main.tf b/main.tf index cefb08ed..308fc738 100644 --- a/main.tf +++ b/main.tf @@ -243,16 +243,15 @@ module "settings" { count = var.is_replicated_deployment ? 1 : 0 # TFE Base Configuration - consolidated_services_enabled = var.consolidated_services_enabled - custom_image_tag = var.custom_image_tag - custom_agent_image_tag = var.custom_agent_image_tag - disk_path = var.disk_path - hairpin_addressing = var.hairpin_addressing - iact_subnet_list = var.iact_subnet_list - pg_extra_params = var.pg_extra_params - production_type = var.production_type - release_sequence = var.release_sequence - trusted_proxies = local.trusted_proxies + custom_image_tag = var.custom_image_tag + custom_agent_image_tag = var.custom_agent_image_tag + disk_path = var.disk_path + hairpin_addressing = var.hairpin_addressing + iact_subnet_list = var.iact_subnet_list + pg_extra_params = var.pg_extra_params + production_type = var.production_type + release_sequence = var.release_sequence + trusted_proxies = local.trusted_proxies extra_no_proxy = local.no_proxy diff --git a/tests/private-active-active/main.tf b/tests/private-active-active/main.tf index 12fad690..45f9e0bb 100644 --- a/tests/private-active-active/main.tf +++ b/tests/private-active-active/main.tf @@ -63,7 +63,6 @@ module "private_active_active" { proxy_port = local.proxy_port # Private Active / Active Scenario - consolidated_services_enabled = var.consolidated_services_enabled distribution = "rhel" load_balancer_public = false load_balancer_type = "application_gateway" diff --git a/tests/private-active-active/variables.tf b/tests/private-active-active/variables.tf index c654bf8f..65867c36 100644 --- a/tests/private-active-active/variables.tf +++ b/tests/private-active-active/variables.tf @@ -6,12 +6,6 @@ variable "bastion_public_ssh_key_secret_name" { description = "The name of the public SSH key secret for the bastion." } -variable "consolidated_services_enabled" { - default = true - type = bool - description = "(Required) True if TFE uses consolidated services." -} - variable "domain_name" { type = string description = "Domain to create Terraform Enterprise subdomain within" diff --git a/tests/private-tcp-active-active/main.tf b/tests/private-tcp-active-active/main.tf index 472d654a..7b33f712 100644 --- a/tests/private-tcp-active-active/main.tf +++ b/tests/private-tcp-active-active/main.tf @@ -65,18 +65,17 @@ module "private_tcp_active_active" { proxy_port = local.proxy_port # Private Active / Active Scenario - consolidated_services_enabled = var.consolidated_services_enabled - distribution = "rhel" - load_balancer_public = false - load_balancer_type = "load_balancer" - redis_use_password_auth = true - redis_use_tls = true - redis_rdb_backup_enabled = true - redis_rdb_backup_frequency = 60 - production_type = "external" - vm_node_count = 2 - vm_sku = "Standard_D32a_v4" - vm_image_id = "rhel" + distribution = "rhel" + load_balancer_public = false + load_balancer_type = "load_balancer" + redis_use_password_auth = true + redis_use_tls = true + redis_rdb_backup_enabled = true + redis_rdb_backup_frequency = 60 + production_type = "external" + vm_node_count = 2 + vm_sku = "Standard_D32a_v4" + vm_image_id = "rhel" create_bastion = false tags = local.common_tags diff --git a/tests/private-tcp-active-active/variables.tf b/tests/private-tcp-active-active/variables.tf index fd39de27..4f2acc57 100644 --- a/tests/private-tcp-active-active/variables.tf +++ b/tests/private-tcp-active-active/variables.tf @@ -16,12 +16,6 @@ variable "ca_key_secret_name" { description = "The name of a Key Vault secret which contains the Base64 encoded version of a PEM encoded private key of a certificate authority (CA)." } -variable "consolidated_services_enabled" { - default = true - type = bool - description = "(Required) True if TFE uses consolidated services." -} - variable "domain_name" { type = string description = "Domain to create Terraform Enterprise subdomain within" diff --git a/tests/public-active-active/main.tf b/tests/public-active-active/main.tf index edf82c1e..defbbc9f 100644 --- a/tests/public-active-active/main.tf +++ b/tests/public-active-active/main.tf @@ -25,17 +25,16 @@ module "public_active_active" { tls_bootstrap_key_pathname = "/var/lib/terraform-enterprise/key.pem" # Public Active / Active Scenario - consolidated_services_enabled = var.consolidated_services_enabled - distribution = "ubuntu" - iact_subnet_list = var.iact_subnet_list - load_balancer_public = true - load_balancer_type = "application_gateway" - production_type = "external" - redis_use_password_auth = false - redis_use_tls = false - vm_node_count = 2 - vm_sku = "Standard_D4_v3" - vm_image_id = "ubuntu" + distribution = "ubuntu" + iact_subnet_list = var.iact_subnet_list + load_balancer_public = true + load_balancer_type = "application_gateway" + production_type = "external" + redis_use_password_auth = false + redis_use_tls = false + vm_node_count = 2 + vm_sku = "Standard_D4_v3" + vm_image_id = "ubuntu" tags = local.common_tags @@ -50,4 +49,3 @@ module "public_active_active" { registry_username = var.registry_username tfe_image = "${local.registry}/hashicorp/terraform-enterprise:${var.tfe_image_tag}" } - diff --git a/tests/public-active-active/variables.tf b/tests/public-active-active/variables.tf index 10b53366..112709ea 100644 --- a/tests/public-active-active/variables.tf +++ b/tests/public-active-active/variables.tf @@ -1,12 +1,6 @@ # Copyright (c) HashiCorp, Inc. # SPDX-License-Identifier: MPL-2.0 -variable "consolidated_services_enabled" { - default = true - type = bool - description = "(Required) True if TFE uses consolidated services." -} - variable "domain_name" { type = string description = "Domain to create Terraform Enterprise subdomain within" diff --git a/tests/standalone-external/main.tf b/tests/standalone-external/main.tf index d49aa8fa..4a224711 100644 --- a/tests/standalone-external/main.tf +++ b/tests/standalone-external/main.tf @@ -38,16 +38,15 @@ module "standalone_external" { custom_agent_image_tag = "hashicorp/tfc-agent:latest" # Standalone External Scenario - consolidated_services_enabled = var.consolidated_services_enabled - distribution = "ubuntu" - database_version = var.database_version - iact_subnet_list = ["0.0.0.0/0"] - load_balancer_public = true - load_balancer_type = "load_balancer" - production_type = "external" - vm_node_count = 1 - vm_sku = "Standard_D4_v3" - vm_image_id = "ubuntu" + distribution = "ubuntu" + database_version = var.database_version + iact_subnet_list = ["0.0.0.0/0"] + load_balancer_public = true + load_balancer_type = "load_balancer" + production_type = "external" + vm_node_count = 1 + vm_sku = "Standard_D4_v3" + vm_image_id = "ubuntu" enable_ssh = true create_bastion = false diff --git a/tests/standalone-external/variables.tf b/tests/standalone-external/variables.tf index 1328bb8a..9912ca5a 100644 --- a/tests/standalone-external/variables.tf +++ b/tests/standalone-external/variables.tf @@ -7,12 +7,6 @@ variable "bypass_preflight_checks" { description = "Allow the TFE application to start without preflight checks." } -variable "consolidated_services_enabled" { - default = true - type = bool - description = "(Required) True if TFE uses consolidated services." -} - variable "database_version" { default = 12 type = number diff --git a/tests/standalone-mounted-disk/main.tf b/tests/standalone-mounted-disk/main.tf index bca7e17f..9922544d 100644 --- a/tests/standalone-mounted-disk/main.tf +++ b/tests/standalone-mounted-disk/main.tf @@ -38,19 +38,18 @@ module "standalone_mounted_disk" { bypass_preflight_checks = var.bypass_preflight_checks # Standalone Mounted Disk Mode Scenario - consolidated_services_enabled = var.consolidated_services_enabled - distribution = var.distribution - production_type = "disk" - disk_path = "/opt/hashicorp/data" - load_balancer_public = true - load_balancer_type = "load_balancer" - vm_image_id = local.vm_image_id - vm_image_publisher = local.vm_image_publisher - vm_image_offer = local.vm_image_offer - vm_image_sku = local.vm_image_sku - vm_image_version = local.vm_image_version - vm_node_count = 1 - vm_sku = "Standard_D4_v3" + distribution = var.distribution + production_type = "disk" + disk_path = "/opt/hashicorp/data" + load_balancer_public = true + load_balancer_type = "load_balancer" + vm_image_id = local.vm_image_id + vm_image_publisher = local.vm_image_publisher + vm_image_offer = local.vm_image_offer + vm_image_sku = local.vm_image_sku + vm_image_version = local.vm_image_version + vm_node_count = 1 + vm_sku = "Standard_D4_v3" # VM Data Disk vm_data_disk_caching = "ReadWrite" diff --git a/tests/standalone-mounted-disk/variables.tf b/tests/standalone-mounted-disk/variables.tf index f64ceab2..b160a658 100644 --- a/tests/standalone-mounted-disk/variables.tf +++ b/tests/standalone-mounted-disk/variables.tf @@ -8,12 +8,6 @@ variable "bypass_preflight_checks" { description = "Allow the TFE application to start without preflight checks." } -variable "consolidated_services_enabled" { - default = true - type = bool - description = "(Required) True if TFE uses consolidated services." -} - variable "distribution" { type = string description = "(Required) What is the OS distribution of the instance on which Terraoform Enterprise will be deployed?" diff --git a/variables.tf b/variables.tf index a5a0f4b0..315cc628 100644 --- a/variables.tf +++ b/variables.tf @@ -821,12 +821,6 @@ variable "capacity_memory" { description = "The maximum amount of memory (in megabytes) that a Terraform plan or apply can use on the system; defaults to `512` for replicated mode and `2048` for FDO." } -variable "consolidated_services_enabled" { - default = true - type = bool - description = "(Required if var.is_replicated_deployment is true) True if TFE uses consolidated services." -} - variable "custom_agent_image_tag" { default = null type = string