Updates

Author: djthorpe

influxdb/nomad/influxdb.hcl

@@ -66,8 +66,11 @@ variable "admin_password" {
   type        = string
 }
 
+///////////////////////////////////////////////////////////////////////////////
+// LOCALS
+
 locals {
-  DATA_PATH = var.data == "" ? "${NOMAD_ALLOC_DIR}/data" : "/var/lib/influxdb/"
+  DATA_PATH = var.data == "" ? "${NOMAD_ALLOC_DIR}/data" : "/var/lib/influxdb"
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -120,14 +123,13 @@ job "influxdb" {
         data_path = local.DATA_PATH
       }
 
-
       template {
         destination = "local/config/config.yml"
         data        = <<-EOF
             secret-store: bolt
             engine-path: {{ env "NOMAD_META_data_path" }}/engine
-            bolt-path:  {{  env "NOMAD_META_data_path"  }}/influxd.bolt
-            sqlite-path:  {{ env "NOMAD_META_data_path" }}/influxd.sqlite
+            bolt-path: {{  env "NOMAD_META_data_path"  }}/influxd.bolt
+            sqlite-path: {{ env "NOMAD_META_data_path" }}/influxd.sqlite
             http-bind-address: :8086
             ui-disabled: false
         EOF

mosquitto/nomad/mosquitto.hcl

@@ -51,6 +51,13 @@ variable "data" {
   default     = ""
 }
 
+///////////////////////////////////////////////////////////////////////////////
+// LOCALS
+
+locals {
+  DATA_PATH = var.data == "" ? "${NOMAD_ALLOC_DIR}/data" : "/mosquitto/data"
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // JOB
 
@@ -90,16 +97,24 @@ job "mosquitto" {
       provider = var.service_provider
     }
 
+    ephemeral_disk {
+      migrate = true
+    }
+
     task "daemon" {
       driver = "docker"
 
+      meta {
+        data_path = local.DATA_PATH
+      }
+
       template {
         destination = "/local/config/mosquitto.conf"
         data        = <<-EOF
           listener             1883
           allow_anonymous      true
           persistence          true
-          persistence_location /mosquitto/data
+          persistence_location {{ env "NOMAD_META_data_path" }}
           log_dest             stderr
         EOF
       }
@@ -108,7 +123,7 @@ job "mosquitto" {
         image      = var.docker_image
         force_pull = var.docker_always_pull
         volumes = compact([
-          format("%s:/mosquitto/data", var.data == "" ? "../alloc/data" : var.data),
+          var.data == "" ? "" : format("%s:/mosquitto/data",var.data),
           "local/config:/mosquitto/config:ro"
         ])
         ports = ["mqtt"]

openldap/nomad/openldap.hcl

@@ -99,18 +99,24 @@ job "openldap" {
       provider = var.service_provider
     }
 
+    ephemeral_disk {
+      migrate = true
+    }
+
     task "daemon" {
       driver = "docker"
 
       config {
         image      = var.docker_image
         force_pull = var.docker_always_pull
         volumes = compact([
-          format("%s:/var/lib/openldap", var.data == "" ? "../alloc/data" : var.data)
+          var.data == "" ? "" : format("%s:/bitnami/openldap",var.data)
         ])
         ports = ["ldap"]
       }
 
+      // TODO: /bitnami/openldap should be /alloc/data when var.data is empty
+
       env {
         LDAP_ADMIN_USERNAME    = "admin"
         LDAP_ADMIN_PASSWORD    = var.admin_password

postgresql/nomad/postgresql.hcl

@@ -61,6 +61,13 @@ variable "database" {
   default     = "default"
 }
 
+///////////////////////////////////////////////////////////////////////////////
+// LOCALS
+
+locals {
+  data_path = var.data == "" ? "${NOMAD_ALLOC_DIR}/data" : "/var/lib/postgresql"
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // JOB
 
@@ -100,6 +107,10 @@ job "postgresql" {
       provider = var.service_provider
     }
 
+    ephemeral_disk {
+      migrate = true
+    }
+
     task "server" {
       driver = "docker"
 
@@ -108,15 +119,15 @@ job "postgresql" {
         force_pull = var.docker_always_pull
         ports = ["postgresql"]
         volumes = compact([
-          format("%s:/var/lib/postgresql", var.data == "" ? "" : var.data)
+          var.data == "" ? "" : format("%s:/var/lib/postgresql",var.data)
         ])
       }
 
       env {
         POSTGRES_USER     = "root"
         POSTGRES_PASSWORD = var.root_password
         POSTGRES_DB       = var.database
-        PGDATA            = var.data == "" ? format("%s/data",NOMAD_ALLOC_DIR) : "/var/lib/postgresql/data"
+        PGDATA            = local.data_path
       }
 
     } // task "server"