From ad439d48f38f7664854b2eaa8107a276f7a93e52 Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Wed, 27 Sep 2023 21:30:22 -0700
Subject: [PATCH] Add waiting for loki and prom dependencies in core

---
 core/loki.tf             | 1 +
 core/main.tf             | 2 ++
 core/metrics.tf          | 2 ++
 services/service/main.tf | 2 ++
 services/service/vars.tf | 6 ++++++
 5 files changed, 13 insertions(+)

diff --git a/core/loki.tf b/core/loki.tf
index b428d90..6af07e3 100644
--- a/core/loki.tf
+++ b/core/loki.tf
@@ -1,5 +1,6 @@
 module "loki" {
   source = "../services/service"
+  detach = false
 
   name  = "loki"
   image = "grafana/loki:2.2.1"
diff --git a/core/main.tf b/core/main.tf
index 81392be..a551a0a 100644
--- a/core/main.tf
+++ b/core/main.tf
@@ -18,6 +18,8 @@ resource "nomad_job" "nomad-client-stalker" {
 
 resource "nomad_job" "syslog-ng" {
   jobspec = file("${path.module}/syslogng.nomad")
+
+  depends_on = [module.loki]
 }
 
 resource "nomad_job" "ddclient" {
diff --git a/core/metrics.tf b/core/metrics.tf
index 8e9ffef..98094ae 100644
--- a/core/metrics.tf
+++ b/core/metrics.tf
@@ -8,6 +8,8 @@ resource "nomad_job" "prometheus" {
   jobspec = templatefile("${path.module}/prometheus.nomad", {
     use_wesher = var.use_wesher,
   })
+
+  detach = false
 }
 
 resource "nomad_job" "grafana" {
diff --git a/services/service/main.tf b/services/service/main.tf
index 44651d5..c23f349 100644
--- a/services/service/main.tf
+++ b/services/service/main.tf
@@ -39,6 +39,8 @@ resource "nomad_job" "service" {
     mysql_bootstrap    = var.mysql_bootstrap
     postgres_bootstrap = var.postgres_bootstrap
   })
+
+  detach = var.detach
 }
 
 resource "nomad_acl_policy" "secrets_mysql" {
diff --git a/services/service/vars.tf b/services/service/vars.tf
index 7d966d4..09d0d4a 100644
--- a/services/service/vars.tf
+++ b/services/service/vars.tf
@@ -3,6 +3,12 @@ variable "name" {
   description = "Name of the service"
 }
 
+variable "detach" {
+  type        = bool
+  default     = true
+  description = "Detach from Nomad and not wait for job to start"
+}
+
 variable "instance_count" {
   type        = number
   default     = 1