From ff19c52fd1b873297c1bd136c30ff29e5512bf97 Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@tromso.serit.no>
Date: Wed, 24 Aug 2022 13:25:04 +0200
Subject: [PATCH] enable beegfs on /work

---
 nixops/ekman/cluster.nix | 14 ++++++++++----
 nixops/ekman/default.nix | 12 ++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/nixops/ekman/cluster.nix b/nixops/ekman/cluster.nix
index ef0c2b7..23b0020 100644
--- a/nixops/ekman/cluster.nix
+++ b/nixops/ekman/cluster.nix
@@ -140,6 +140,12 @@ let
   };
 
   compute = {
+    system.activationScripts = {
+        work.text = ''
+            mkdir -p /work
+        '';
+    };
+
     features = {
       hpc = {
         enable = true;
@@ -158,13 +164,13 @@ let
           ];
         };
         beegfs = {
-          enable = false;
+          enable = true;
           beegfs = {
-            bee0-0 = {
-              mgmtdHost = "beegfs0";
+            beegfs0 = {
+              mgmtdHost = "ibbeegfs0";
               connAuthFile = "/etc/beegfs/connauthfile";
               client = {
-                enable = false;
+                enable = true;
                 mountPoint = "/work";
               };
             };
diff --git a/nixops/ekman/default.nix b/nixops/ekman/default.nix
index 0a01f10..9c9695b 100644
--- a/nixops/ekman/default.nix
+++ b/nixops/ekman/default.nix
@@ -8,11 +8,6 @@ let
 
   nodes = import ./nodes.nix;
 
-  cluster = {
-    compute = true;
-    k8sNode = true;
-  };
-
   compute = {
     # deployment.tags = [ "compute" ];
 
@@ -43,6 +38,11 @@ let
     hw = ./hw + "/${host.name}.nix";
   in {
     "${host.name}" = {
+      cluster = {
+        compute = true;
+        k8sNode = true;
+      };
+
       features = {
         host = {
           name = host.name;
@@ -70,7 +70,7 @@ let
           ipv4.routes = [ {
             address = "10.255.242.2";
             prefixLength = 32;
-            via = "10.1.241.100";
+            via = "10.255.241.100";
           } ];
 
         };