diff --git a/backups/backups.tf b/backups/backups.tf index b46b57b..5cb45c7 100644 --- a/backups/backups.tf +++ b/backups/backups.tf @@ -1,8 +1,4 @@ resource "nomad_job" "backup" { - hcl2 { - enabled = true - } - jobspec = templatefile("${path.module}/backup.nomad", { module_path = path.module, batch_node = null, @@ -18,10 +14,6 @@ resource "nomad_job" "backup-oneoff" { # node.node_name # ]) - hcl2 { - enabled = true - } - jobspec = templatefile("${path.module}/backup.nomad", { module_path = path.module, batch_node = each.key, diff --git a/core/blocky/blocky.tf b/core/blocky/blocky.tf index c446556..94348aa 100644 --- a/core/blocky/blocky.tf +++ b/core/blocky/blocky.tf @@ -4,7 +4,6 @@ locals { resource "nomad_job" "blocky" { hcl2 { - enabled = true vars = { "config_data" = local.config_data, } diff --git a/core/metrics.tf b/core/metrics.tf index 8c7342a..5a2271a 100644 --- a/core/metrics.tf +++ b/core/metrics.tf @@ -1,28 +1,16 @@ resource "nomad_job" "exporters" { - hcl2 { - enabled = true - } - jobspec = templatefile("${path.module}/exporters.nomad", { use_wesher = var.use_wesher, }) } resource "nomad_job" "prometheus" { - hcl2 { - enabled = true - } - jobspec = templatefile("${path.module}/prometheus.nomad", { use_wesher = var.use_wesher, }) } resource "nomad_job" "grafana" { - hcl2 { - enabled = true - } - jobspec = templatefile("${path.module}/grafana.nomad", { module_path = path.module use_wesher = var.use_wesher diff --git a/core/traefik/traefik.tf b/core/traefik/traefik.tf index e0a8f44..dcd8ed6 100644 --- a/core/traefik/traefik.tf +++ b/core/traefik/traefik.tf @@ -1,7 +1,3 @@ resource "nomad_job" "traefik" { - hcl2 { - enabled = true - } - jobspec = file("${path.module}/traefik.nomad") } diff --git a/databases/main.tf b/databases/main.tf index f8c61a2..631ceb0 100644 --- a/databases/main.tf +++ b/databases/main.tf @@ -1,8 +1,4 @@ resource "nomad_job" "mysql-server" { - hcl2 { - enabled = true - } - jobspec = file("${path.module}/mysql.nomad") # Block until deployed as there are servics dependent on this one @@ -28,10 +24,6 @@ EOH } resource "nomad_job" "postgres-server" { - hcl2 { - enabled = true - } - jobspec = file("${path.module}/postgres.nomad") # Block until deployed as there are servics dependent on this one @@ -59,10 +51,6 @@ EOH resource "nomad_job" "redis" { for_each = toset(["blocky", "authelia"]) - hcl2 { - enabled = true - } - jobspec = templatefile("${path.module}/redis.nomad", { name = each.key, diff --git a/services/whoami.tf b/services/whoami.tf index e087065..0d21f15 100644 --- a/services/whoami.tf +++ b/services/whoami.tf @@ -1,6 +1,5 @@ resource "nomad_job" "whoami" { hcl2 { - enabled = true vars = { "count" = 4, } diff --git a/storage_plugins/democratic-csi.tf b/storage_plugins/democratic-csi.tf index a4d12b0..848dd07 100644 --- a/storage_plugins/democratic-csi.tf +++ b/storage_plugins/democratic-csi.tf @@ -14,7 +14,6 @@ locals { # resource "nomad_job" "nfs-monolith" { # hcl2 { -# enabled = true # vars = { # "image_name" = "${var.image_name}", # "csi_version" = "${var.csi_version}", @@ -26,7 +25,6 @@ locals { resource "nomad_job" "storage-controller" { hcl2 { - enabled = true vars = { "image_name" = var.image_name, "csi_version" = var.csi_version, @@ -39,7 +37,6 @@ resource "nomad_job" "storage-controller" { resource "nomad_job" "storage-node" { hcl2 { - enabled = true vars = { "image_name" = var.image_name, "csi_version" = var.csi_version,