Skip to content

Commit

Permalink
Removes non-consolidated settings
Browse files Browse the repository at this point in the history
  • Loading branch information
@jkerry
jkerry committed Apr 3, 2024
1 parent 8126442 commit 6c17b24
Show file tree
Hide file tree
Showing 12 changed files with 51 additions and 94 deletions.
19 changes: 9 additions & 10 deletions main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion tests/private-active-active/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 0 additions & 6 deletions tests/private-active-active/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
23 changes: 11 additions & 12 deletions tests/private-tcp-active-active/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions tests/private-tcp-active-active/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
22 changes: 10 additions & 12 deletions tests/public-active-active/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -50,4 +49,3 @@ module "public_active_active" {
registry_username = var.registry_username
tfe_image = "${local.registry}/hashicorp/terraform-enterprise:${var.tfe_image_tag}"
}

6 changes: 0 additions & 6 deletions tests/public-active-active/variables.tf
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
19 changes: 9 additions & 10 deletions tests/standalone-external/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions tests/standalone-external/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 12 additions & 13 deletions tests/standalone-mounted-disk/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 0 additions & 6 deletions tests/standalone-mounted-disk/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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?"
Expand Down
6 changes: 0 additions & 6 deletions variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6c17b24

Please sign in to comment.