Set the ssh host from the machine config

This commit is contained in:
Rodrigo Arias 2020-10-13 14:30:03 +02:00
parent 05b37aa11d
commit 7a37913b4e
3 changed files with 3 additions and 6 deletions

View File

@ -7,7 +7,7 @@
mn4 = { mn4 = {
config = { config = {
name = "mn4"; name = "mn4";
sshHosts = [ "mn1" "mn2" "mn3" ]; sshHost = "mn1";
nixPrefix = "/gpfs/projects/bsc15/nix"; nixPrefix = "/gpfs/projects/bsc15/nix";
cachelineBytes = 64; cachelineBytes = 64;
march = "skylake-avx512"; march = "skylake-avx512";

View File

@ -6,10 +6,7 @@
{ {
nextStage nextStage
, nixPrefix , nixPrefix
, sshHost
# FIXME: These two should be specified in the configuration of the machine
, sshHost ? "mn"
, targetCluster ? "mn4"
}: }:
with garlicTools; with garlicTools;

View File

@ -16,7 +16,7 @@ rec {
/* Takes a list of units and builds an experiment, after executing the /* Takes a list of units and builds an experiment, after executing the
trebuchet, runexp and isolate stages. Returns the trebuchet stage. */ trebuchet, runexp and isolate stages. Returns the trebuchet stage. */
buildTrebuchet = units: stages.trebuchet { buildTrebuchet = units: stages.trebuchet {
inherit (machineConf) nixPrefix; inherit (machineConf) nixPrefix sshHost;
nextStage = stages.runexp { nextStage = stages.runexp {
inherit (machineConf) nixPrefix; inherit (machineConf) nixPrefix;
nextStage = stages.isolate { nextStage = stages.isolate {