Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TF-15070] Simplify active-active settings #291

Merged
merged 1 commit into from
May 31, 2024
+11 −13
Merged

[TF-15070] Simplify active-active settings #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@

locals {
disk_device_name = "sdb"
enable_active_active = var.node_count >= 2
enable_airgap = var.airgap_url == null && var.tfe_license_bootstrap_airgap_package_path != null
enable_external = var.operational_mode == "external" || local.enable_active_active
enable_external = var.operational_mode == "external" || var.operational_mode == "active-active"
enable_database_module = local.enable_external
enable_disk = var.operational_mode == "disk" && !local.enable_active_active
enable_disk = var.operational_mode == "disk"
enable_networking_module = var.network == null
enable_object_storage_module = local.enable_external
enable_redis_module = local.enable_active_active
enable_redis_module = var.operational_mode == "active-active"
service_networking_connection = try(module.networking[0].service_networking_connection, { network = var.network })
subnetwork = try(module.networking[0].subnetwork, { self_link = var.subnetwork })

Expand Down
11 changes: 5 additions & 6 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ module "networking" {

count = local.enable_networking_module ? 1 : 0

enable_active_active = local.enable_active_active
enable_active_active = var.operational_mode == "active-active"
is_replicated_deployment = var.is_replicated_deployment
namespace = var.namespace
subnet_range = var.networking_subnet_range
Expand Down Expand Up @@ -121,7 +121,7 @@ module "runtime_container_engine_config" {
disk_path = local.enable_disk ? var.disk_path : null
iact_subnets = join(",", var.iact_subnet_list)
iact_time_limit = var.iact_subnet_time_limit
operational_mode = local.enable_active_active ? "active-active" : var.operational_mode
operational_mode = var.operational_mode
run_pipeline_image = var.run_pipeline_image
tfe_image = var.tfe_image
tfe_license = var.hc_license
Expand Down Expand Up @@ -178,7 +178,7 @@ module "tfe_init_fdo" {
distribution = var.distribution
disk_path = var.disk_path
disk_device_name = local.disk_device_name
operational_mode = local.enable_active_active ? "active-active" : var.operational_mode
operational_mode = var.operational_mode
custom_image_tag = var.custom_image_tag
enable_monitoring = var.enable_monitoring

Expand Down Expand Up @@ -231,7 +231,6 @@ module "settings" {

# Replicated Base Configuration
hostname = local.common_fqdn
enable_active_active = local.enable_active_active
tfe_license_bootstrap_airgap_package_path = var.tfe_license_bootstrap_airgap_package_path
tfe_license_file_location = var.tfe_license_file_location
tls_bootstrap_cert_pathname = var.tls_bootstrap_cert_pathname
Expand Down Expand Up @@ -360,11 +359,11 @@ module "vm_mig" {
name = "https"
port = 443
}],
local.enable_active_active && !var.is_replicated_deployment ? [{
var.operational_mode == "active-active" && !var.is_replicated_deployment ? [{
name = "vault"
port = 8201
}] : [],
!local.enable_active_active && var.is_replicated_deployment ? [{
!(var.operational_mode == "active-active") && var.is_replicated_deployment ? [{
name = "console"
port = 8800
}] : []
Expand Down
6 changes: 3 additions & 3 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,12 +440,12 @@ variable "usage_reporting_opt_out" {

variable "operational_mode" {
default = "external"
description = "A special string to control the operational mode of Terraform Enterprise. Valid values are: 'external' for External Services mode; 'disk' for Mounted Disk mode;."
description = "A special string to control the operational mode of Terraform Enterprise. Valid values are: 'external', 'disk' and 'active-active'."
type = string

validation {
condition = contains(["external", "disk"], var.operational_mode)
error_message = "The operational_mode value must be one of: 'external'; 'disk';."
condition = contains(["external", "disk", "active-active"], var.operational_mode)
error_message = "The operational_mode value must be one of: 'external', 'disk' or 'active-active'."
}
}

Expand Down
Loading