summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Doan <andy.doan@linaro.org>2016-11-17 16:58:22 -0600
committerAndy Doan <andy.doan@linaro.org>2016-11-17 17:06:40 -0600
commit74f1733aca0c9c9569d69a7ea3a55eef8cbd5dde (patch)
treeb46c4e045bbec903f4601f5282a6f604e861c6a9
parent8b6aaab124cae304b3e2597d1d647b9363bd1669 (diff)
downloadansible-playbooks-74f1733aca0c9c9569d69a7ea3a55eef8cbd5dde.tar.gz
colo: update conserver to export switch connections
Makes life a lot easier Change-Id: I25f3c6741e71a6a6599af18947fa4c655d16df1e
-rw-r--r--host_vars/r1-x86-1.aus-colo.linaro.org8
-rw-r--r--host_vars/r2-x86-1.aus-colo.linaro.org9
-rw-r--r--host_vars/r3-x86-1.aus-colo.linaro.org7
-rw-r--r--roles/colo-console-server/templates/conserver.cf.j24
4 files changed, 18 insertions, 10 deletions
diff --git a/host_vars/r1-x86-1.aus-colo.linaro.org b/host_vars/r1-x86-1.aus-colo.linaro.org
index 2196f74..4200beb 100644
--- a/host_vars/r1-x86-1.aus-colo.linaro.org
+++ b/host_vars/r1-x86-1.aus-colo.linaro.org
@@ -1,6 +1,11 @@
serial_console_script: serial-connect-dl320
serial_console_mappings:
+ - host: r1-s1
+ port: t1-p16
+ - host: r1-s2
+ port: t1-p15
+
- host: r1-a1
port: t1-p1
- host: r1-a2
@@ -61,8 +66,5 @@ serial_console_mappings:
serial_console_admins:
- name: andy.doan
- - name: david.mandala
- name: paul.sokolovsky
- name: ben.copeland
- - name: matthew.hart
- - name: jon.masters
diff --git a/host_vars/r2-x86-1.aus-colo.linaro.org b/host_vars/r2-x86-1.aus-colo.linaro.org
index f41c7b2..2205126 100644
--- a/host_vars/r2-x86-1.aus-colo.linaro.org
+++ b/host_vars/r2-x86-1.aus-colo.linaro.org
@@ -1,6 +1,11 @@
serial_console_script: serial-connect-dl320
serial_console_mappings:
+ - host: r2-s1
+ port: t1-p16
+ - host: r2-s2
+ port: t1-p15
+
- host: r2-a1
port: t1-p1
- host: r2-a2
@@ -67,9 +72,5 @@ serial_console_mappings:
serial_console_admins:
- name: andy.doan
- - name: david.mandala
- name: paul.sokolovsky
- name: ben.copeland
- # redhat users that help manage rack2
- - name: jon.masters
- - name: paul.whalen
diff --git a/host_vars/r3-x86-1.aus-colo.linaro.org b/host_vars/r3-x86-1.aus-colo.linaro.org
index 6ca9046..e664a09 100644
--- a/host_vars/r3-x86-1.aus-colo.linaro.org
+++ b/host_vars/r3-x86-1.aus-colo.linaro.org
@@ -1,6 +1,12 @@
serial_console_script: serial-connect-dl120
serial_console_mappings:
+ - host: r3-s1
+ port: t1-p16
+ - host: r3-s3
+ port: t1-p5
+ baud: 9600
+
- host: r3-a1
port: t1-p1
- host: r3-a2
@@ -33,6 +39,5 @@ serial_console_mappings:
serial_console_admins:
- name: andy.doan
- - name: david.mandala
- name: paul.sokolovsky
- name: ben.copeland
diff --git a/roles/colo-console-server/templates/conserver.cf.j2 b/roles/colo-console-server/templates/conserver.cf.j2
index cb2a03f..e9a3f29 100644
--- a/roles/colo-console-server/templates/conserver.cf.j2
+++ b/roles/colo-console-server/templates/conserver.cf.j2
@@ -17,7 +17,7 @@ access * {
console {{mapping.host}} {
master localhost;
type exec;
- exec /usr/local/bin/serial-connect {{mapping.port}};
+ exec /usr/local/bin/serial-connect {% if mapping.baud is defined %}-b {{mapping.baud}} {% endif %}{{mapping.port}};
rw {% for user in serial_console_admins%}{{user.name}}{% if not loop.last %},{% endif %}{% endfor %};
}
{% endfor %}
@@ -31,7 +31,7 @@ console {{ host }} {
master localhost;
type exec;
rw {% for user in entry.users %}{{user}}{% if not loop.last %},{% endif %}{% endfor %};
- exec /usr/local/bin/serial-connect {{mapping.port}};
+ exec /usr/local/bin/serial-connect {% if mapping.baud is defined %}-b {{mapping.baud}} {% endif %}{{mapping.port}};
}
{% endif %}
{% endfor %}