Set deployment.targetHost for TU Delft machines
Required since we're no longer deploying from a machine in the same domain.
Eelco Dolstra committed
Jul 5, 2018 at 13:42 UTC
625f53e2fb7bb78124921249676c2b09c23fc71f
2 files changed
+6
-10
delft/network.nix
+4
-8
@@ -1,11 +1,7 @@
1
{
2
- kenny = import ./build-machines-dell-1950.nix;
3
- kyle = import ./build-machines-dell-1950.nix;
4
- hydra = import ./build-machines-dell-1950.nix;
5
- stan = import ./build-machines-dell-1950.nix;
6
- lucifer = import ./lucifer.nix;
7
- wendy = import ./wendy.nix;
8
- ike = import ./build-machines-dell-r815.nix;
9
- #shelley = import ./build-machines-dell-r815.nix;
2
+ hydra = { deployment.targetHost = "hydra.ewi.tudelft.nl"; imports = [ ./build-machines-dell-1950.nix ]; };
3
+ lucifer = { deployment.targetHost = "lucifer.ewi.tudelft.nl"; imports = [ ./lucifer.nix ]; };
4
+ wendy = { deployment.targetHost = "wendy.ewi.tudelft.nl"; imports = [ ./wendy.nix ]; };
5
+ ike = { deployment.targetHost = "wendy.ewi.tudelft.nl"; imports = [ ./build-machines-dell-r815.nix ]; };
6
chef = import ./chef.nix;
7
}
delft/static-net-config.nix
+2
-2
@@ -1,4 +1,4 @@
1
-{ config, lib, pkgs, ... }:
1
+{ name, config, lib, pkgs, ... }:
2
3
with lib;
4
@@ -6,7 +6,7 @@ let
6
7
machines = import ./machines.nix pkgs.lib;
8
9
- machine = findSingle (m: m.hostName == config.deployment.targetHost or "") {} {} machines;
9
+ machine = findSingle (m: m.hostName == name) {} {} machines;
10
11
iface = "enx" + replaceChars [":"] [""] machine.ethernetAddress;
12