@cryptotaxi247 / infra-1 / commits / d25eae3e

* Add the new UPS, and rearrange a bit.

svn path=/configurations/trunk/tud/; revision=31866

Eelco Dolstra committed Jan 26, 2012 at 16:21 UTC d25eae3e82bd8f734ec129fd4a0dde03b1a2ceaa
1 file changed +49 -37
machines.nix
+49 -37
@@ -1,6 +1,7 @@
1 lib: with lib;
2
3 -[
3 +[ /* Physical machines. */
4 +
5 { # Web frontend.
6 hostName = "cartman";
7 ipAddress = "192.168.1.5";
@@ -9,6 +10,12 @@ lib: with lib;
10 maxJobs = 2;
11 }
12
13 + { # APC UPS.
14 + hostName = "ups";
15 + ipAddress = "192.168.1.6";
16 + ethernetAddress = "00:c0:b7:5b:16:56";
17 + }
18 +
19 { # 8-core NixOS build machine.
20 hostName = "kenny";
21 ipAddress = "192.168.1.19";
@@ -71,24 +78,37 @@ lib: with lib;
78 ethernetAddress = "00:1D:09:0E:09:E5";
79 }
80
74 - { # New Hydra server.
81 + { # Hydra server.
82 hostName = "lucifer";
83 ipAddress = "192.168.1.25";
84 ethernetAddress = "84:2B:2B:0B:98:F0";
85 }
86
80 -
81 - # The following are Xen VMs hosted on mrhankey.
82 - # Note that 00:16:3e is the prefix for Xen MAC addresses.
87 + { # 48-core NixOS machine for random hackery.
88 + hostName = "wendy";
89 + ipAddress = "192.168.1.26";
90 + ethernetAddress = "f0:4d:a2:40:1b:be";
91 + systems = [ "x86_64-linux" ];
92 + }
93
84 - { # 32-bit OpenIndiana 151a (in a VM).
85 - hostName = "tweek";
86 - ipAddress = "192.168.1.50";
87 - ethernetAddress = "00:16:3e:00:00:01";
88 - systems = [ "i686-solaris" ];
89 - maxJobs = 1;
94 + { # 48-core NixOS build machine.
95 + hostName = "ike";
96 + ipAddress = "192.168.1.27";
97 + ethernetAddress = "f0:4d:a2:40:1b:91";
98 + systems = [ "x86_64-linux" ];
99 }
100 +
101 + { # 48-core NixOS build machine.
102 + hostName = "shelley";
103 + ipAddress = "192.168.1.28";
104 + ethernetAddress = "f0:4d:a2:40:10:6c";
105 + systems = [ "x86_64-linux" ];
106 + }
107 +
108
109 + /* Xen VMs hosted on mrhankey. Note that 00:16:3e is the prefix for
110 + Xen MAC addresses. */
111 +
112 { # NixOS test machine.
113 hostName = "drdoctor";
114 ipAddress = "192.168.1.51";
@@ -104,6 +124,24 @@ lib: with lib;
124 systems = [ "x86_64-linux" ];
125 }
126
127 + { # Another NixOS test machine.
128 + hostName = "clyde";
129 + ipAddress = "192.168.1.55";
130 + ethernetAddress = "00:16:3e:00:00:06";
131 + systems = [ "x86_64-linux" ];
132 + }
133 +
134 +
135 + /* KVM VMs hosted on stan. */
136 +
137 + { # 32-bit OpenIndiana 151a (in a VM).
138 + hostName = "tweek";
139 + ipAddress = "192.168.1.50";
140 + ethernetAddress = "00:16:3e:00:00:01";
141 + systems = [ "i686-solaris" ];
142 + maxJobs = 1;
143 + }
144 +
145 { # Legacy FreeBSD machine.
146 hostName = "losser";
147 ipAddress = "192.168.1.53";
@@ -118,13 +156,6 @@ lib: with lib;
156 systems = [ "i686-linux" ];
157 }
158
121 - { # Another NixOS test machine.
122 - hostName = "clyde";
123 - ipAddress = "192.168.1.55";
124 - ethernetAddress = "00:16:3e:00:00:06";
125 - systems = [ "x86_64-linux" ];
126 - }
127 -
159 { # 64-bit FreeBSD build machine (in a VM).
160 hostName = "beastie";
161 ipAddress = "192.168.1.56";
@@ -143,23 +174,4 @@ lib: with lib;
174 buildUser = "buildfarm";
175 }
176
146 - { # 48 core powerrrr
147 - hostName = "wendy";
148 - ipAddress = "192.168.1.26";
149 - ethernetAddress = "f0:4d:a2:40:1b:be";
150 - systems = [ "x86_64-linux" ];
151 - }
152 - { # 48 core powerrrr
153 - hostName = "ike";
154 - ipAddress = "192.168.1.27";
155 - ethernetAddress = "f0:4d:a2:40:1b:91";
156 - systems = [ "x86_64-linux" ];
157 - }
158 - { # 48 core powerrrr
159 - hostName = "shelley";
160 - ipAddress = "192.168.1.28";
161 - ethernetAddress = "f0:4d:a2:40:10:6c";
162 - systems = [ "x86_64-linux" ];
163 - }
164 -
177 ]