X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=terraform-ci-infra%2F1n_nmd%2Fnginx%2Fconf%2Fnomad%2Fnginx.hcl;h=0775a498dac05a0fdd3b0fe43b79a4a38fe626c5;hb=221e2f4da7cb27954525d973d930cb8db4601c8f;hp=9cb5f8ef45e4eccc44f51902d4136d6f5b100975;hpb=fd4d85865e145f12330a4266be48fbdd6e919cf4;p=csit.git

diff --git a/terraform-ci-infra/1n_nmd/nginx/conf/nomad/nginx.hcl b/terraform-ci-infra/1n_nmd/nginx/conf/nomad/nginx.hcl
index 9cb5f8ef45..0775a498da 100644
--- a/terraform-ci-infra/1n_nmd/nginx/conf/nomad/nginx.hcl
+++ b/terraform-ci-infra/1n_nmd/nginx/conf/nomad/nginx.hcl
@@ -87,13 +87,25 @@ job "${job_name}" {
     # to 1.
     count = 1
 
+    # https://www.nomadproject.io/docs/job-specification/volume
+    %{ if use_host_volume }
+    volume "prod-volume1-nginx" {
+      type      = "host"
+      read_only = false
+      source    = "${host_volume}"
+    }
+    %{ endif }
+
     # The restart stanza configures a tasks's behavior on task failure. Restarts
     # happen on the client that is running the task.
+    #
+    # https://www.nomadproject.io/docs/job-specification/restart
+    #
     restart {
-      interval  = "10m"
-      attempts  = 2
+      interval  = "30m"
+      attempts  = 40
       delay     = "15s"
-      mode      = "fail"
+      mode      = "delay"
     }
 
     # The "task" stanza creates an individual unit of work, such as a Docker
@@ -115,7 +127,6 @@ job "${job_name}" {
       # documentation for more information.
       config {
         image        = "nginx:stable"
-        dns_servers  = [ "$${attr.unique.network.ip-address}" ]
         port_map {
           https      = 443
         }
@@ -141,10 +152,9 @@ job "${job_name}" {
       template {
         data = <<EOH
           upstream storage {
-            server storage0.storage.service.consul:9000;
-            server storage1.storage.service.consul:9000;
-            server storage2.storage.service.consul:9000;
-            server storage3.storage.service.consul:9000;
+            {{ range service "storage" }}
+              server {{ .Address }}:{{ .Port }};
+            {{ end }}
           }
         EOH
         destination = "custom/upstream.conf"
@@ -259,8 +269,8 @@ job "${job_name}" {
       #     https://www.nomadproject.io/docs/job-specification/resources.html
       #
       resources {
-        cpu        = 1000
-        memory     = 1024
+        cpu        = 2000
+        memory     = 4096
         network {
           mode     = "bridge"
           port "https" {