diff --git a/services/service/main.tf b/services/service/main.tf index 634fa17..1ffb74d 100644 --- a/services/service/main.tf +++ b/services/service/main.tf @@ -7,8 +7,9 @@ resource "nomad_job" "service" { image_pull_timeout = var.image_pull_timeout args = var.args env = var.env - meta = var.meta + task_meta = var.task_meta group_meta = var.group_meta + job_meta = var.job_meta constraints = var.constraints docker_devices = var.docker_devices diff --git a/services/service/service_template.nomad b/services/service/service_template.nomad index 172b6b4..9bb99b4 100644 --- a/services/service/service_template.nomad +++ b/services/service/service_template.nomad @@ -7,6 +7,13 @@ job "${name}" { group "${name}" { count = ${count} + %{~ if length(job_meta) > 0 } + meta = { + %{ for k, v in job_meta ~} + ${k} = ${jsonencode(v)} + %{ endfor ~} + } + %{~ endif ~} network { mode = "bridge" @@ -97,9 +104,9 @@ job "${name}" { %{~ endfor ~} task "${name}" { driver = "docker" - %{~ if length(meta) > 0 } + %{~ if length(task_meta) > 0 } meta = { - %{ for k, v in meta ~} + %{ for k, v in task_meta ~} ${k} = ${jsonencode(v)} %{ endfor ~} } diff --git a/services/service/vars.tf b/services/service/vars.tf index b55d582..87cb34f 100644 --- a/services/service/vars.tf +++ b/services/service/vars.tf @@ -27,7 +27,7 @@ variable "image_pull_timeout" { description = "A time duration that controls how long Nomad will wait before cancelling an in-progress pull of the Docker image" } -variable "meta" { +variable "task_meta" { type = map(string) default = {} description = "Meta attributes to attach to the task" @@ -39,6 +39,12 @@ variable "group_meta" { description = "Meta attributes to attach to the group" } +variable "job_meta" { + type = map(string) + default = {} + description = "Meta attributes to attach to the task" +} + variable "service_port" { type = number default = null