Merge lp:~dpigott/lava-lab/add-multinode01 into lp:lava-lab

Proposed by Dave Pigott
Status: Merged
Approved by: Dave Pigott
Approved revision: 214
Merged at revision: 214
Proposed branch: lp:~dpigott/lava-lab/add-multinode01
Merge into: lp:lava-lab
Diff against target: 109 lines (+51/-1)
10 files modified
lava/devices/multinode01/multinode/beaglexm04.conf (+5/-0)
lava/devices/multinode01/multinode/imx53-01.conf (+6/-0)
lava/devices/multinode01/multinode/imx53-02.conf (+6/-0)
lava/devices/multinode01/multinode/imx53-03.conf (+6/-0)
lava/devices/multinode01/multinode/imx53-04.conf (+6/-0)
lava/devices/multinode01/multinode/imx53-05.conf (+3/-0)
lava/devices/multinode01/multinode/multinode-arndale01.conf (+5/-0)
lava/devices/multinode01/multinode/panda19.conf (+6/-0)
lava/devices/multinode01/multinode/panda21.conf (+7/-0)
top.sls (+1/-1)
To merge this branch: bzr merge lp:~dpigott/lava-lab/add-multinode01
Reviewer Review Type Date Requested Status
Dave Pigott Approve
Review via email: mp+176631@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dave Pigott (dpigott) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'lava/devices/multinode01'
2=== added directory 'lava/devices/multinode01/multinode'
3=== added file 'lava/devices/multinode01/multinode/beaglexm04.conf'
4--- lava/devices/multinode01/multinode/beaglexm04.conf 1970-01-01 00:00:00 +0000
5+++ lava/devices/multinode01/multinode/beaglexm04.conf 2013-07-24 09:21:36 +0000
6@@ -0,0 +1,5 @@
7+# DO NOTE EDIT - MANAGED BY SALT!
8+device_type = beagle-xm
9+reset_port_command = flock /var/lock/serial1.lock /usr/local/lab-scripts/reset-serial6000 192.168.1.11 15
10+connection_command = telnet 192.168.1.11 7015
11+hard_reset_command = /usr/local/lab-scripts/reboot-ap7952 pdu01 18
12
13=== added file 'lava/devices/multinode01/multinode/imx53-01.conf'
14--- lava/devices/multinode01/multinode/imx53-01.conf 1970-01-01 00:00:00 +0000
15+++ lava/devices/multinode01/multinode/imx53-01.conf 2013-07-24 09:21:36 +0000
16@@ -0,0 +1,6 @@
17+# DO NOT EDIT: MANAGED BY SALT!
18+device_type = mx53loco
19+hostname = imx53-01
20+reset_port_command = flock /var/lock/serial1.lock /usr/local/lab-scripts/reset-serial6000 serial1 9
21+connection_command = telnet serial1 7009
22+hard_reset_command = /usr/local/lab-scripts/reboot-ap7952 pdu01 13
23
24=== added file 'lava/devices/multinode01/multinode/imx53-02.conf'
25--- lava/devices/multinode01/multinode/imx53-02.conf 1970-01-01 00:00:00 +0000
26+++ lava/devices/multinode01/multinode/imx53-02.conf 2013-07-24 09:21:36 +0000
27@@ -0,0 +1,6 @@
28+# DO NOT EDIT: MANAGED BY SALT!
29+device_type = mx53loco
30+hostname = imx53-02
31+reset_port_command = flock /var/lock/serial2.lock /usr/local/lab-scripts/reset-serial5000 serial2 1
32+connection_command = telnet serial2 7001
33+hard_reset_command = /usr/local/lab-scripts/reboot-ap7952 pdu06 01
34
35=== added file 'lava/devices/multinode01/multinode/imx53-03.conf'
36--- lava/devices/multinode01/multinode/imx53-03.conf 1970-01-01 00:00:00 +0000
37+++ lava/devices/multinode01/multinode/imx53-03.conf 2013-07-24 09:21:36 +0000
38@@ -0,0 +1,6 @@
39+# DO NOT EDIT: MANAGED BY SALT!
40+device_type = mx53loco
41+hostname = imx53-03
42+reset_port_command = flock /var/lock/serial2.lock /usr/local/lab-scripts/reset-serial5000 serial2 2
43+connection_command = telnet serial2 7002
44+hard_reset_command = /usr/local/lab-scripts/reboot-ap7952 pdu06 02
45
46=== added file 'lava/devices/multinode01/multinode/imx53-04.conf'
47--- lava/devices/multinode01/multinode/imx53-04.conf 1970-01-01 00:00:00 +0000
48+++ lava/devices/multinode01/multinode/imx53-04.conf 2013-07-24 09:21:36 +0000
49@@ -0,0 +1,6 @@
50+# DO NOT EDIT: MANAGED BY SALT!
51+device_type = mx53loco
52+hostname = imx53-04
53+reset_port_command = flock /var/lock/serial2.lock /usr/local/lab-scripts/reset-serial5000 serial2 3
54+connection_command = telnet serial2 7003
55+hard_reset_command = /usr/local/lab-scripts/reboot-ap7952 pdu06 03
56
57=== added file 'lava/devices/multinode01/multinode/imx53-05.conf'
58--- lava/devices/multinode01/multinode/imx53-05.conf 1970-01-01 00:00:00 +0000
59+++ lava/devices/multinode01/multinode/imx53-05.conf 2013-07-24 09:21:36 +0000
60@@ -0,0 +1,3 @@
61+# DO NOT EDIT: MANAGED BY SALT!
62+device_type = mx53loco
63+hostname = imx53-05
64
65=== added file 'lava/devices/multinode01/multinode/multinode-arndale01.conf'
66--- lava/devices/multinode01/multinode/multinode-arndale01.conf 1970-01-01 00:00:00 +0000
67+++ lava/devices/multinode01/multinode/multinode-arndale01.conf 2013-07-24 09:21:36 +0000
68@@ -0,0 +1,5 @@
69+# DO NOT EDIT: MANAGED BY SALT!
70+device_type = arndale
71+reset_port_command = flock /var/lock/serial4.lock /usr/local/lab-scripts/reset-serial5000 serial4 29
72+connection_command = telnet serial4 7029
73+hard_reset_command = /usr/local/lab-scripts/reboot-ap8959 pdu15 3
74
75=== added file 'lava/devices/multinode01/multinode/panda19.conf'
76--- lava/devices/multinode01/multinode/panda19.conf 1970-01-01 00:00:00 +0000
77+++ lava/devices/multinode01/multinode/panda19.conf 2013-07-24 09:21:36 +0000
78@@ -0,0 +1,6 @@
79+# DO NOT EDIT: MANAGED BY SALT!
80+device_type = panda
81+hostname = panda19
82+reset_port_command = flock /var/lock/serial2.lock /usr/local/lab-scripts/reset-serial5000 serial2 28
83+connection_command = telnet serial2 7028
84+hard_reset_command = /usr/local/lab-scripts/reboot-ap7952 pdu03 04
85
86=== added file 'lava/devices/multinode01/multinode/panda21.conf'
87--- lava/devices/multinode01/multinode/panda21.conf 1970-01-01 00:00:00 +0000
88+++ lava/devices/multinode01/multinode/panda21.conf 2013-07-24 09:21:36 +0000
89@@ -0,0 +1,7 @@
90+# DO NOT EDIT: MANAGED BY SALT!
91+device_type = panda
92+hostname = panda21
93+reset_port_command = flock /var/lock/serial2.lock /usr/local/lab-scripts/reset-serial5000 serial2 30
94+connection_command = telnet serial2 7030
95+hard_reset_command = /usr/local/lab-scripts/reboot-ap7952 pdu03 06
96+image_boot_msg = Starting kernel
97
98=== modified file 'top.sls'
99--- top.sls 2013-07-01 09:17:08 +0000
100+++ top.sls 2013-07-24 09:21:36 +0000
101@@ -4,7 +4,7 @@
102 - lp_users
103 - nagios
104
105- 'control,staging,dogfood,fastmodels01,fastmodels02,fastmodels03,fastmodels04,fastmodels05,fastmodels06,fastmodels07,dispatcher01,dispatcher02,hackbox,multinode':
106+ 'control,staging,dogfood,fastmodels01,fastmodels02,fastmodels03,fastmodels04,fastmodels05,fastmodels06,fastmodels07,dispatcher01,dispatcher02,hackbox,multinode,multinode01':
107 - match: list
108 - instance_manager
109 - nfs

Subscribers

People subscribed via source and target branches