* Added the Xen VM configs on mrhankey.
svn path=/configurations/trunk/tud/; revision=24939
Eelco Dolstra committed
Nov 30, 2010 at 14:17 UTC
eb2125c64f15b92465cc908d625e66af479ea8b4
7 files changed
+82
-25
machines.nix
+4
-4
@@ -145,7 +145,7 @@
145
# The following are Xen VMs hosted on mrhankey.
146
# Note that 00:16:3e is the prefix for Xen MAC addresses.
147
148
- {
148
+ { # OpenSolaris 2009.06 (32 bit).
149
hostName = "tweek";
150
ipAddress = "192.168.1.50";
151
ethernetAddress = "00:16:3e:00:00:01";
@@ -153,7 +153,7 @@
153
maxJobs = 2;
154
}
155
156
- {
156
+ { # NixOS test machine.
157
hostName = "drdoctor";
158
ipAddress = "192.168.1.51";
159
ethernetAddress = "00:16:3e:00:00:02";
@@ -175,11 +175,11 @@
175
systems = [ "i686-freebsd" ];
176
}
177
178
- { # Ubuntu 10.10 machine.
178
+ { # Ubuntu 10.10 test machine.
179
hostName = "meerkat";
180
ipAddress = "192.168.1.54";
181
ethernetAddress = "00:16:3e:00:00:05";
182
systems = [ "i686-linux" ];
183
}
184
-
184
+
185
]
mrhankey.nix
-21
@@ -21,25 +21,4 @@
21
networking.hostName = "";
22
23
services.openssh.enable = true;
24
-
25
-/*
26
- services.tomcat =
27
- {
28
- enable = true;
29
- baseDir = "/data/tomcat";
30
- javaOpts = "-Dshare.dir=/nix/var/nix/profiles/default/share -Xms350m -Xmx2048m -XX:MaxPermSize=512M -XX:PermSize=512M -XX:-UseGCOverheadLimit";
31
- logPerVirtualHost = true;
32
- virtualHosts =
33
- [ { name = "test.researchr.org";}
34
- { name = "test.nixos.org";}
35
- ];
36
- };
37
-
38
- services.mysql =
39
- {
40
- enable = true;
41
- package = pkgs.mysql51;
42
- dataDir = "/data/mysql";
43
- };
44
-*/
24
}
xen-configs/drdoctor
new
+18
@@ -0,0 +1,18 @@
1
+from xen.util.path import *
2
+
3
+name = 'drdoctor'
4
+
5
+memory = 512
6
+
7
+kernel = XENFIRMWAREDIR + '/pv-grub-x86_64.gz'
8
+
9
+extra = '(hd0)/grub/menu.lst'
10
+
11
+disk = [ 'file:/vmdisks/drdoctor-boot.img,xvda1,w'
12
+ , 'file:/vmdisks/drdoctor-root.img,xvda2,w' ]
13
+
14
+vif = [ 'mac=00:16:3e:00:00:02' ]
15
+
16
+vfb = [ 'vnc=2' ]
17
+
18
+tsc_mode = 1 # always emulate TSC
xen-configs/losser
new
+13
@@ -0,0 +1,13 @@
1
+# Losser is a FreeBSD 4 machine.
2
+
3
+kernel = "hvmloader"
4
+
5
+builder = "hvm"
6
+
7
+memory = 384
8
+
9
+disk = [ 'file:/vmdisks/losser-disk1.img,hda,w' ]
10
+
11
+vif = [ 'mac=00:16:3e:00:00:04' ]
12
+
13
+vfb = [ 'vnc=1' ]
xen-configs/meerkat
new
+17
@@ -0,0 +1,17 @@
1
+# Ubuntu 10.10 (Maverick Meerkat)
2
+
3
+kernel = "hvmloader"
4
+
5
+builder = "hvm"
6
+
7
+memory = 1024
8
+
9
+disk = [ 'file:/vmdisks/meerkat-disk1.img,hda,w'
10
+ #, 'file:/root/isos/ubuntu-10.10-desktop-i386.iso,hdc:cdrom,r'
11
+ ]
12
+
13
+boot = "dc"
14
+
15
+vif = [ 'mac=00:16:3e:00:00:05' ]
16
+
17
+vfb = [ 'vnc=1' ]
xen-configs/mrkitty
new
+11
@@ -0,0 +1,11 @@
1
+from xen.util.path import *
2
+
3
+memory = 512
4
+
5
+kernel = XENFIRMWAREDIR + '/pv-grub-x86_64.gz'
6
+
7
+extra = '(hd0)/boot/grub/menu.lst'
8
+
9
+disk = [ 'file:/vmdisks/mrkitty-root.img,xvda1,w' ]
10
+
11
+vif = [ 'mac=00:16:3e:00:00:03' ]
xen-configs/tweek
new
+19
@@ -0,0 +1,19 @@
1
+# Tweek is an OpenSolaris VM.
2
+
3
+kernel = "hvmloader"
4
+
5
+builder = "hvm"
6
+
7
+name = "tweek"
8
+
9
+memory = 1024
10
+
11
+disk = [ 'file:/vmdisks/tweek-disk1.img,hda,w'
12
+ #, 'file:/root/isos/osol-0906-x86.iso,hdc:cdrom,r'
13
+ ]
14
+
15
+#boot = "dc"
16
+
17
+vif = [ 'mac=00:16:3e:00:00:01' ]
18
+
19
+vfb = [ 'vnc=1' ]