Merge seankelly/buildbot-infra:bslave1 (PR #96)

buildbot · May 4, 2015 · b8cdb5c · b8cdb5c
2 parents 87db5b9 + 58acc0e
commit b8cdb5c
Show file tree

Hide file tree

Showing 8 changed files with 519 additions and 447 deletions.
diff --git a/group_vars/all b/group_vars/all
@@ -108,3 +108,10 @@ track_config:
   author_email: "sysadmin@buildbot.net"
   default_author_name: "Unknown"
   default_author_email: "sysadmin@buildbot.net"
+
+# SSH host keys for each host that needs something to connect to it.
+ssh_host_keys:
+  "[ftp.int.buildbot.net]:2200":
+    - "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMYtZrTzjDDtQa5DUGkuad+oi3N75cdb3iw0rLohuHBBL+iOxDBR6gdmOARNNqB2WKyN7inN3j965p335cy+BRc="
+    - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMvwDVNIL/7bA6rqCZZlgckn2ws1+r7PtLSDo3cDeBUr"
+    - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEemfRZouB2MSDecG6SnHxLPcYvqmfDx+poIhnH5bJ1SrGJSK45fRdqDlJCgUeXxwTnz3qUwRSU6muXEziVbFZMLg8nRw8JauLZHwq/4oIKioXqtohLZ4dG70cs5rlZVvyimChsJ5F+15myBIlq9HusM4Ov0l023r53OaB8ZkdN2glSCqdHt6k6KyJulVsJjk51ug0e9y+yGWkmFG0WJpoOVlL3aRw7hs9CISZF4W3VouuAQ4tS9DsM3PuquH6wF8NEkzKez2v3zcykpng+1nUOimsAuSCvL3opX4ncDkaB8zMEZOqtCtJoBT28mZfmp9zbuSqMwHO8L2L8MPbga0b"
diff --git a/jail-bslave1.yml b/jail-bslave1.yml
@@ -24,6 +24,14 @@
     user_id: "{{ worker_account }}"
     user_name: Buildbot Worker Account
 
+  - role: ssh-client/key
+    ssh_private_key: "{{ ssh_keys['bslave1.int.buildbot.net'][0].private }}"
+    ssh_private_key_file: "{{ ssh_keys['bslave1.int.buildbot.net'][0].name }}"
+
+  - role: ssh-client/known_hosts
+    ssh_client_hosts:
+      - "[ftp.int.buildbot.net]:2200"
+
   # Slave for bslave1, connected to nine.buildbot.net.
   - role: virtualenv
     venv_user: "{{ worker_account }}"
@@ -45,19 +53,24 @@
   # Slave for buildbot.net, connected to buildbot.buildbot.net.
   - role: virtualenv
     venv_user: "{{ worker_account }}"
-    venv_home_dir: "{{ getent_passwd[worker_account].4 }}/{{ buildbot_net.bb_slave_name }}"
-    venv_name: "{{ env_name }}"
+    venv_home_dir: "{{ getent_passwd[worker_account].4 }}"
+    venv_name: "{{ buildbot_net.bb_slave_name }}/{{ buildbot_net.env_name }}"
+    venv_packages:
+      - python  # Install a 'python' wrapper.
+      - sqlite3
+      - node
+      - npm
     venv_python_packages:
     - buildbot-slave    # Install the latest released version
   - role: bb-slave
     bb_user: "{{ worker_account }}"
     bb_slave_name: "{{ buildbot_net.bb_slave_name }}"
-    bb_env_dir: "{{ getent_passwd[worker_account].4 }}/{{ buildbot_net.bb_slave_name }}/{{ env_name }}"
-    bb_slave_dir: "{{ getent_passwd[worker_account].4 }}/{{ buildbot_net.bb_slave_name }}/{{ buildbot_net.bb_slave_dir }}"
+    bb_env_dir: "{{ getent_passwd[worker_account].4 }}/{{ buildbot_net.bb_slave_name }}/{{ buildbot_net.env_name }}"
+    bb_slave_dir: "{{ getent_passwd[worker_account].4 }}/{{ buildbot_net.bb_slave_name }}/{{ buildbot_net.slave_dir }}"
   - role: supervisor-service
     service_name: "{{ buildbot_net.slave_service_name }}"
-    service_dir: "{{ getent_passwd[worker_account].4 }}/{{ buildbot_net.bb_slave_name }}/{{ buildbot_net.bb_slave_dir }}"
-    service_command: "{{ getent_passwd[worker_account].4 }}/{{ buildbot_net.bb_slave_name }}/{{ env_name }}/bin/buildslave start --nodaemon"
+    service_dir: "{{ getent_passwd[worker_account].4 }}/{{ buildbot_net.bb_slave_name }}/{{ buildbot_net.slave_dir }}"
+    service_command: "{{ getent_passwd[worker_account].4 }}/{{ buildbot_net.bb_slave_name }}/{{ buildbot_net.env_name }}/bin/buildslave start --nodaemon"
     service_user: "{{ worker_account }}"
 
 # vim:ts=2:sw=2:noai:nosi
diff --git a/jail-ftp.yml b/jail-ftp.yml
@@ -23,7 +23,7 @@
   - role: user
     user_id: buildbot
     user_name: Buildbot Uploader
-    authorized_key: >
-      ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC7YoNGKRZJxVbvxQpGBX1FuhWC0Nq2+fe+wVD16cgaOk4iDjeKdQ4eZACIlcMi5REXfTO+e9Hzmr85DUmy+BAKx0PqzLj6BhmnZnoQbQe3WAsmWSIuUSqKqilM4RnkDUWrDvhdyMGIH4ELfrebJt5ZnNLbOTk6BAQiygF/1xNeYPvcjxfUG1NXUHlKJ9qnf1cph7Pw6YOe8SF8kJTxwDiSJSG0aGsfas4zLVgmcPHdjsFRuOFOxFlVpFKzu3toaZyXPSeTOAaoaIHkfaEahBExXyd7b8L/0fcFumWK6qwIA5dFDWGkIaEMBdX6/giV+gvz9UJQ75gxVtn0y8MbFEMD9iduGbIX5FSOFNmbEkNubW5M74G7igMtqk+dUbVSMOoy4NO2vPnXH0iBMPkkzPEmAro3/q/J5QTEbIB39H99dbGnOR1iwbBhCqVJERAAECteoHsXKHsNhL9IYqDp2KKPVHmxZybqtJo4SKSzNvjfK50ojYcIAAVlBsFZ+9p0Aj8CADA3L0Ont7RPs9Dcoad1la9kkC1v6Bol5O1huRM8qjXRPOT1W01JH+UvM8r1EKNKRgV/uVr+Zl1Ln84GvPMX4cdz+ky2L5mlE9w6RonBqJnJg16i7eQXCE6iwOjQ2XHK+TBeoQDGHmww+ACUmVx9NR+I4Q9cWMjteLx3Q+YMtQ== buildbot@ftp.buildbot.net
+    authorized_key: |
+      ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNZ3JHrBueI3OvmDTIJXMcUxyjadRYb2+44n8kBgxgU9Da6mQv2j02OH3MbOhLZoMhxqRC5GVeqmDYjcEw+vcIQ= bbinfra@bslave1.int.buildbot.net
 
 # vim:ts=2:sw=2:noai:nosi
diff --git a/roles/ssh-client/key/tasks/main.yml b/roles/ssh-client/key/tasks/main.yml
@@ -0,0 +1,5 @@
+---
+- name: Set ssh keys
+  copy:
+    content: "{{ ssh_private_key }}"
+    dest: "{{ getent_passwd[worker_account].4 }}/.ssh/{{ ssh_private_key_file }}"
diff --git a/roles/ssh-client/known_hosts/defaults/main.yml b/roles/ssh-client/known_hosts/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+ssh_client_hosts: []
diff --git a/roles/ssh-client/known_hosts/tasks/main.yml b/roles/ssh-client/known_hosts/tasks/main.yml
@@ -0,0 +1,6 @@
+---
+# Uses the ssh_client_hosts role variable and ssh_host_keys group variable.
+- name: Set host keys
+  template:
+    src: known_hosts.j2
+    dest: "{{ getent_passwd[worker_account].4 }}/.ssh/known_hosts"
diff --git a/roles/ssh-client/known_hosts/templates/known_hosts.j2 b/roles/ssh-client/known_hosts/templates/known_hosts.j2
@@ -0,0 +1,7 @@
+{% for ssh_host in ssh_client_hosts %}
+{% if ssh_host in ssh_host_keys %}
+{% for host_key in ssh_host_keys[ssh_host] %}
+{{ ssh_host }} {{ host_key }}
+{% endfor %}
+{% endif %}
+{% endfor %}