From 7a37913b4e02e44e66ffd4aff0bf58801459d4cb Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Tue, 13 Oct 2020 14:30:03 +0200
Subject: [PATCH] Set the ssh host from the machine config

---
 garlic/machines.nix         | 2 +-
 garlic/stages/trebuchet.nix | 5 +----
 garlic/stdexp.nix           | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/garlic/machines.nix b/garlic/machines.nix
index 77df966..d5a0af2 100644
--- a/garlic/machines.nix
+++ b/garlic/machines.nix
@@ -7,7 +7,7 @@
   mn4 = {
     config = {
       name = "mn4";
-      sshHosts = [ "mn1" "mn2" "mn3" ];
+      sshHost = "mn1";
       nixPrefix = "/gpfs/projects/bsc15/nix";
       cachelineBytes = 64;
       march = "skylake-avx512";
diff --git a/garlic/stages/trebuchet.nix b/garlic/stages/trebuchet.nix
index 045ab51..83e0dac 100644
--- a/garlic/stages/trebuchet.nix
+++ b/garlic/stages/trebuchet.nix
@@ -6,10 +6,7 @@
 {
   nextStage
 , nixPrefix
-
-# FIXME: These two should be specified in the configuration of the machine
-, sshHost ? "mn"
-, targetCluster ? "mn4"
+, sshHost
 }:
 
 with garlicTools;
diff --git a/garlic/stdexp.nix b/garlic/stdexp.nix
index 880cdcd..7a584de 100644
--- a/garlic/stdexp.nix
+++ b/garlic/stdexp.nix
@@ -16,7 +16,7 @@ rec {
   /* Takes a list of units and builds an experiment, after executing the
   trebuchet, runexp and isolate stages. Returns the trebuchet stage. */
   buildTrebuchet = units: stages.trebuchet {
-    inherit (machineConf) nixPrefix;
+    inherit (machineConf) nixPrefix sshHost;
     nextStage = stages.runexp {
       inherit (machineConf) nixPrefix;
       nextStage = stages.isolate {