From 0a7d8287fc652ebfa5afcbdbc8abe4acf7644038 Mon Sep 17 00:00:00 2001
From: George Sedov <radist.morse@gmail.com>
Date: Thu, 11 Aug 2022 17:03:13 +0200
Subject: [PATCH] update nomad config for tests

---
 config/nomad/authorizer.nmd.in      | 11 ++++++-----
 config/nomad/broker.nmd.in          |  9 +++++----
 config/nomad/file_transfer.nmd.in   | 11 ++++++-----
 config/nomad/monitoring.nmd.in      | 11 ++++++-----
 config/nomad/receiver_fabric.nmd.in | 11 ++++++-----
 config/nomad/receiver_kafka.nmd.in  | 11 ++++++-----
 config/nomad/receiver_tcp.nmd.in    | 11 ++++++-----
 7 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/config/nomad/authorizer.nmd.in b/config/nomad/authorizer.nmd.in
index a8c06827f..60fe82538 100644
--- a/config/nomad/authorizer.nmd.in
+++ b/config/nomad/authorizer.nmd.in
@@ -6,6 +6,12 @@ job "authorizer" {
   group "group" {
     count = 1
 
+    network {
+      port "authorizer" {
+        static = "5007"
+      }
+    }
+
     task "authorizer" {
       driver = "raw_exec"
 
@@ -17,11 +23,6 @@ job "authorizer" {
       resources {
         cpu    = 50 # 50 MHz
         memory = 256 # 256MB
-        network {
-          port "authorizer" {
-            static = "5007"
-          }
-        }
       }
 
       service {
diff --git a/config/nomad/broker.nmd.in b/config/nomad/broker.nmd.in
index debdc0880..45fefdecf 100644
--- a/config/nomad/broker.nmd.in
+++ b/config/nomad/broker.nmd.in
@@ -6,6 +6,11 @@ job "broker" {
   group "group" {
     count = 1
 
+    network {
+      port "broker" {
+      }
+    }
+
     task "broker" {
       driver = "raw_exec"
 
@@ -17,10 +22,6 @@ job "broker" {
       resources {
         cpu    = 50 # 50 MHz
         memory = 256 # 256MB
-        network {
-          port "broker" {
-          }
-        }
       }
 
       service {
diff --git a/config/nomad/file_transfer.nmd.in b/config/nomad/file_transfer.nmd.in
index 90f1833fe..554eb9d00 100644
--- a/config/nomad/file_transfer.nmd.in
+++ b/config/nomad/file_transfer.nmd.in
@@ -6,6 +6,12 @@ job "file_transfer" {
   group "group" {
     count = 1
 
+    network {
+      port "file_transfer" {
+        static = "5008"
+      }
+    }
+
     task "file_transfer" {
       driver = "raw_exec"
 
@@ -17,11 +23,6 @@ job "file_transfer" {
       resources {
         cpu    = 50 # 50 MHz
         memory = 256 # 256MB
-        network {
-          port "file_transfer" {
-            static = "5008"
-          }
-        }
       }
 
       service {
diff --git a/config/nomad/monitoring.nmd.in b/config/nomad/monitoring.nmd.in
index e60d814c3..aa8c52fdf 100644
--- a/config/nomad/monitoring.nmd.in
+++ b/config/nomad/monitoring.nmd.in
@@ -6,6 +6,12 @@ job "monitoring" {
   group "monitoring" {
     count = 1
 
+    network {
+      port "monitoring_server" {
+        static = "5009"
+      }
+    }
+
     task "monitoring-server" {
       driver = "raw_exec"
 
@@ -17,11 +23,6 @@ job "monitoring" {
       resources {
         cpu    = 50 # 50 MHz
         memory = 256 # 256MB
-        network {
-          port "monitoring_server" {
-            static = "5009"
-          }
-        }
       }
 
       service {
diff --git a/config/nomad/receiver_fabric.nmd.in b/config/nomad/receiver_fabric.nmd.in
index a37759b5f..058e5ffea 100644
--- a/config/nomad/receiver_fabric.nmd.in
+++ b/config/nomad/receiver_fabric.nmd.in
@@ -6,6 +6,12 @@ job "receiver" {
   group "group" {
     count = 1
 
+    network {
+      port "recv" {}
+      port "recv_ds" {}
+      port "recv_metrics" {}
+    }
+
     task "receiver" {
       driver = "raw_exec"
 
@@ -17,11 +23,6 @@ job "receiver" {
       resources {
         cpu    = 50 # 50 MHz
         memory = 256 # 256MB
-        network {
-          port "recv" {}
-          port "recv_ds" {}
-          port "recv_metrics" {}
-        }
       }
 
       service {
diff --git a/config/nomad/receiver_kafka.nmd.in b/config/nomad/receiver_kafka.nmd.in
index 6b1047d39..1d736d213 100644
--- a/config/nomad/receiver_kafka.nmd.in
+++ b/config/nomad/receiver_kafka.nmd.in
@@ -10,6 +10,12 @@ job "receiver" {
   group "group" {
     count = 1
 
+    network {
+      port "recv" {}
+      port "recv_ds" {}
+      port "recv_metrics" {}
+    }
+
     task "receiver" {
       driver = "raw_exec"
 
@@ -21,11 +27,6 @@ job "receiver" {
       resources {
         cpu    = 50 # 50 MHz
         memory = 256 # 256MB
-        network {
-          port "recv" {}
-          port "recv_ds" {}
-          port "recv_metrics" {}
-        }
       }
 
       service {
diff --git a/config/nomad/receiver_tcp.nmd.in b/config/nomad/receiver_tcp.nmd.in
index dcf9f9176..b24b12110 100644
--- a/config/nomad/receiver_tcp.nmd.in
+++ b/config/nomad/receiver_tcp.nmd.in
@@ -6,6 +6,12 @@ job "receiver" {
   group "group" {
     count = 1
 
+    network {
+      port "recv" {}
+      port "recv_ds" {}
+      port "recv_metrics" {}
+    }
+
     task "receiver" {
       driver = "raw_exec"
 
@@ -17,11 +23,6 @@ job "receiver" {
       resources {
         cpu    = 50 # 50 MHz
         memory = 256 # 256MB
-        network {
-          port "recv" {}
-          port "recv_ds" {}
-          port "recv_metrics" {}
-        }
       }
 
       service {
-- 
GitLab