summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Doan <andy.doan@linaro.org>2016-03-31 16:15:02 -0500
committerAndy Doan <andy.doan@linaro.org>2016-03-31 16:15:13 -0500
commitdc13cd287c23be1c460f2f5441abf949697ad485 (patch)
tree883101895c1b4c07536054e1ac8e58a97c367921
parentda487a48d685c7e8d0c48f887fd21859df28bbbb (diff)
colo: add new softiron servers
-rw-r--r--host_vars/aus-colo.linaro.org22
-rw-r--r--host_vars/r1-x86-1.aus-colo.linaro.org6
-rwxr-xr-xroles/colo-console-server/files/serial-connect-dl3204
3 files changed, 29 insertions, 3 deletions
diff --git a/host_vars/aus-colo.linaro.org b/host_vars/aus-colo.linaro.org
index 0c4bfb8e..1b972960 100644
--- a/host_vars/aus-colo.linaro.org
+++ b/host_vars/aus-colo.linaro.org
@@ -229,7 +229,6 @@ r2_hosts:
mac: 00:00:1a:1b:9f:7d
pxe: true
- # adhoc - seattles aren't supported by ubuntu
- name: r1-a30
ip: 10.20.200.4
mac: 00:00:1a:1b:9f:55
@@ -242,6 +241,27 @@ r2_hosts:
ip: 10.20.200.6
mac: 00:00:1a:1b:9f:89
pxe: true
+ - name: r1-a35
+ ip: 10.20.200.7
+ mac: e0:ff:f7:00:06:80
+ pxe: true
+ - mac: "e0:ff:f7:00:04:11"
+ name: r1-a35-bmc
+ ip: 10.20.200.70
+ - name: r1-a36
+ ip: 10.20.200.8
+ mac: e0:ff:f7:00:06:83
+ pxe: true
+ - mac: "e0:ff:f7:00:03:f9"
+ name: r1-a36-bmc
+ ip: 10.20.200.80
+ - name: r1-a37
+ ip: 10.20.200.9
+ mac: e0:ff:f7:00:06:89
+ pxe: true
+ - mac: "e0:ff:f7:00:03:f7"
+ name: r1-a37-bmc
+ ip: 10.20.200.90
r3_hosts:
# Infrastructure machines
diff --git a/host_vars/r1-x86-1.aus-colo.linaro.org b/host_vars/r1-x86-1.aus-colo.linaro.org
index 115a0205..f342bb06 100644
--- a/host_vars/r1-x86-1.aus-colo.linaro.org
+++ b/host_vars/r1-x86-1.aus-colo.linaro.org
@@ -61,6 +61,12 @@ serial_console_mappings:
port: t2-p9
- host: r1-a34
port: t2-p10
+ - host: r1-a35
+ port: t2-p11
+ - host: r1-a36
+ port: t2-p12
+ - host: r1-a37
+ port: t2-p15
serial_console_admins:
- name: andy.doan
diff --git a/roles/colo-console-server/files/serial-connect-dl320 b/roles/colo-console-server/files/serial-connect-dl320
index 1375a9b3..2c18003e 100755
--- a/roles/colo-console-server/files/serial-connect-dl320
+++ b/roles/colo-console-server/files/serial-connect-dl320
@@ -37,10 +37,10 @@ DEVICES = {
't2-p9': '/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.3/1-1.3.3/1-1.3.3.7/1-1.3.3.7:1.0',
't2-p10': '/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.3/1-1.3.4/1-1.3.4.1/1-1.3.4.1:1.0',
't2-p11': '/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.3/1-1.3.4/1-1.3.4.2/1-1.3.4.2:1.0',
- 't2-p12': '/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.3/1-1.3.4/1-1.3.4.3/1-1.3.4.3:1.0', # broke!
+ 't2-p12': '/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.3/1-1.3.4/1-1.3.4.3/1-1.3.4.3:1.0',
't2-p13': '/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.3/1-1.3.4/1-1.3.4.4/1-1.3.4.4:1.0',
't2-p14': '/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.3/1-1.3.4/1-1.3.4.5/1-1.3.4.5:1.0',
- 't2-p15': '/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.3/1-1.3.4/1-1.3.4.6/1-1.3.4.6:1.0', # broke!
+ 't2-p15': '/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.3/1-1.3.4/1-1.3.4.6/1-1.3.4.6:1.0',
't2-p16': '/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.3/1-1.3.4/1-1.3.4.7/1-1.3.4.7:1.0',
# t3