more network fix attempts

input-output-hk · Jan 18, 2021 · 0833549 · 0833549
1 parent bca128f
commit 0833549
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/jobs/catalyst-dryrun.nix b/jobs/catalyst-dryrun.nix
@@ -35,11 +35,12 @@ let
         };
 
         networks = [{
-          # mode = "bridge";
+          mode = "host";
           ports = {
             prometheus.to = 6000;
-            rest.to = localRestPort;
-            rpc.to = localRpcPort;
+            rest.to = 7000;
+            rpc.to = 8000;
+            promtail.to = 9000;
           };
         }];
 
@@ -65,6 +66,7 @@ let
         });
 
         services."${namespace}-${name}-jormungandr" = {
+          addressMode = "host";
           portLabel = "rpc";
           task = "jormungandr";
           tags = [ name role ] ++ (lib.optional public "ingress");
@@ -82,19 +84,22 @@ let
         };
 
         services."${namespace}-jormungandr" = {
+          addressMode = "host";
           portLabel = "rpc";
           task = "jormungandr";
           tags = [ name "peer" role ];
         };
 
         services."${namespace}-jormungandr-internal" =
           lib.mkIf (role != "backup") {
+            addressMode = "host";
             portLabel = "rpc";
             task = "jormungandr";
             tags = [ name "peer" role ];
           };
 
         services."${namespace}-${name}-jormungandr-rest" = {
+          addressMode = "host";
           portLabel = "rest";
           task = "jormungandr";
           tags = [ name role ];

diff --git a/jobs/tasks/monitor.nix b/jobs/tasks/monitor.nix
@@ -16,8 +16,8 @@
   templates = [{
     data = ''
       SLEEP_TIME="10"
-      PORT="{{ env "NOMAD_PORT_prometheus" }}"
-      JORMUNGANDR_API="http://{{ env "NOMAD_ADDR_rest" }}/api"
+      PORT="{{ env "NOMAD_HOST_PORT_prometheus" }}"
+      JORMUNGANDR_API="http://{{ env "NOMAD_HOST_ADDR_rest" }}/api"
     '';
     env = true;
     destination = "local/env.txt";

diff --git a/jobs/tasks/promtail.nix b/jobs/tasks/promtail.nix
@@ -10,7 +10,7 @@
   templates = [{
     data = ''
       server:
-        http_listen_port: 9080
+        http_listen_port: {{ env "NOMAD_PORT_promtail" }}
         grpc_listen_port: 0
 
       positions: