From 2f3b904603adcc829af1b6bbd423624055d717fa Mon Sep 17 00:00:00 2001 From: Annie Hedgpeth Date: Wed, 15 Nov 2023 09:24:47 -0700 Subject: [PATCH 1/3] add disk_mode to docker_compose --- main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/main.tf b/main.tf index 7b5cde60..e26c86bf 100644 --- a/main.tf +++ b/main.tf @@ -181,6 +181,7 @@ module "docker_compose_config" { capacity_concurrency = var.capacity_concurrency capacity_cpu = var.capacity_cpu capacity_memory = var.capacity_memory + disk_path = local.disk_mode ? var.disk_path : null iact_subnets = join(",", var.iact_subnet_list) iact_time_limit = var.iact_subnet_time_limit operational_mode = local.active_active ? "active-active" : var.production_type From 7b76bb002ffa163ee60be62220124cd293b6081d Mon Sep 17 00:00:00 2001 From: Annie Hedgpeth Date: Wed, 15 Nov 2023 09:33:33 -0700 Subject: [PATCH 2/3] test path --- main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index e26c86bf..830d90c0 100644 --- a/main.tf +++ b/main.tf @@ -137,7 +137,7 @@ module "database" { # Azure user data / cloud init used to install and configure TFE on instance(s) using Flexible Deployment Options # --------------------------------------------------------------------------------------------------------------- module "tfe_init_fdo" { - source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/tfe_init?ref=main" + source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/tfe_init?ref=ah/disk_path" count = var.is_replicated_deployment ? 0 : 1 cloud = "azurerm" @@ -173,7 +173,7 @@ module "tfe_init_fdo" { # Docker Compose File Config for TFE on instance(s) using Flexible Deployment Options # ------------------------------------------------------------------------------------ module "docker_compose_config" { - source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/docker_compose_config?ref=main" + source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/docker_compose_config?ref=ah/disk_path" count = var.is_replicated_deployment ? 0 : 1 license_reporting_opt_out = var.license_reporting_opt_out From 9f94081ebb5834ceafe6ed362495463adba1186a Mon Sep 17 00:00:00 2001 From: Annie Hedgpeth Date: Wed, 15 Nov 2023 10:38:58 -0700 Subject: [PATCH 3/3] revert refs to main --- main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index 830d90c0..e26c86bf 100644 --- a/main.tf +++ b/main.tf @@ -137,7 +137,7 @@ module "database" { # Azure user data / cloud init used to install and configure TFE on instance(s) using Flexible Deployment Options # --------------------------------------------------------------------------------------------------------------- module "tfe_init_fdo" { - source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/tfe_init?ref=ah/disk_path" + source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/tfe_init?ref=main" count = var.is_replicated_deployment ? 0 : 1 cloud = "azurerm" @@ -173,7 +173,7 @@ module "tfe_init_fdo" { # Docker Compose File Config for TFE on instance(s) using Flexible Deployment Options # ------------------------------------------------------------------------------------ module "docker_compose_config" { - source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/docker_compose_config?ref=ah/disk_path" + source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/docker_compose_config?ref=main" count = var.is_replicated_deployment ? 0 : 1 license_reporting_opt_out = var.license_reporting_opt_out