From 80a4b408b1bec92f51813c5b758d7b2739f665ed Mon Sep 17 00:00:00 2001 From: pmikus Date: Tue, 7 Sep 2021 07:01:36 +0000 Subject: Terraform: Cleanup + Use terraform fmt to format Signed-off-by: pmikus Change-Id: I32bd2f81c5838722506d44a8ff8ab48da204643a --- fdio.infra.terraform/1n_nmd/minio/main.tf | 20 ++++++++++---------- fdio.infra.terraform/1n_nmd/minio/variables.tf | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'fdio.infra.terraform/1n_nmd/minio') diff --git a/fdio.infra.terraform/1n_nmd/minio/main.tf b/fdio.infra.terraform/1n_nmd/minio/main.tf index 62d143f4b1..6954cc2f05 100644 --- a/fdio.infra.terraform/1n_nmd/minio/main.tf +++ b/fdio.infra.terraform/1n_nmd/minio/main.tf @@ -1,15 +1,15 @@ locals { - datacenters = join(",", var.nomad_datacenters) - minio_env_vars = join("\n", + datacenters = join(",", var.nomad_datacenters) + minio_env_vars = join("\n", concat([ ], var.minio_envs) ) - mc_env_vars = join("\n", + mc_env_vars = join("\n", concat([ ], var.mc_envs) ) mc_formatted_bucket_list = formatlist("LOCALMINIO/%s", var.minio_buckets) - mc_add_config_command = concat( + mc_add_config_command = concat( [ "mc", "config", @@ -25,8 +25,8 @@ locals { } data "template_file" "nomad_job_minio" { - template = file("${path.module}/conf/nomad/minio.hcl") - vars = { + template = file("${path.module}/conf/nomad/minio.hcl") + vars = { job_name = var.minio_job_name datacenters = local.datacenters use_canary = var.minio_use_canary @@ -51,8 +51,8 @@ data "template_file" "nomad_job_minio" { } data "template_file" "nomad_job_mc" { - template = file("${path.module}/conf/nomad/mc.hcl") - vars = { + template = file("${path.module}/conf/nomad/mc.hcl") + vars = { job_name = var.mc_job_name service_name = var.mc_service_name datacenters = local.datacenters @@ -68,8 +68,8 @@ data "template_file" "nomad_job_mc" { } resource "nomad_job" "nomad_job_minio" { - jobspec = data.template_file.nomad_job_minio.rendered - detach = false + jobspec = data.template_file.nomad_job_minio.rendered + detach = false } #resource "nomad_job" "nomad_job_mc" { diff --git a/fdio.infra.terraform/1n_nmd/minio/variables.tf b/fdio.infra.terraform/1n_nmd/minio/variables.tf index dbac3465ee..ab9d07f0d7 100644 --- a/fdio.infra.terraform/1n_nmd/minio/variables.tf +++ b/fdio.infra.terraform/1n_nmd/minio/variables.tf @@ -2,7 +2,7 @@ variable "nomad_datacenters" { description = "Nomad data centers" type = list(string) - default = [ "dc1" ] + default = ["dc1"] } variable "nomad_host_volume" { @@ -98,7 +98,7 @@ variable "minio_use_canary" { variable "minio_vault_secret" { description = "Set of properties to be able to fetch secret from vault" - type = object({ + type = object({ use_vault_provider = bool, vault_kv_policy_name = string, vault_kv_path = string, @@ -109,13 +109,13 @@ variable "minio_vault_secret" { variable "minio_resource_proxy" { description = "Minio proxy resources" - type = object({ - cpu = number, - memory = number + type = object({ + cpu = number, + memory = number }) - default = { - cpu = 200, - memory = 128 + default = { + cpu = 200, + memory = 128 } validation { condition = var.minio_resource_proxy.cpu >= 200 && var.minio_resource_proxy.memory >= 128 @@ -156,11 +156,11 @@ variable "minio_buckets" { variable "minio_upstreams" { description = "List of upstream services (list of object with service_name, port)" - type = list(object({ + type = list(object({ service_name = string, port = number, })) - default = [] + default = [] } variable "mc_extra_commands" { -- cgit 1.2.3-korg