lots more raspberry pi ansible improvements

Author: rvagg

doc/non-ansible-configuration-notes.md

@@ -103,21 +103,16 @@ Set up SD card:
 
 Set up running system, steps to execute in `raspi-config`:
 
-* Expand Filesystem
 * Change User Password
-* Internationalisation Options - Change Locale to en_US.UTF8
-* Internationalisation Options - Change Keyboard Layout - Generic non-Intl, English (US)
-* Overclock Pi 1 B+ to Medium
-* Advanced - Hostname, replace `_` with `--`
 * Advanced - Enable SSH
 
 Then, manually:
 
-* Set up .ssh/authorized_keys as appropriate for running Ansible (Insert the `nodejs_build_test` key or the `nodejs_build_release` key as appropriate)
+* Set up ~pi/.ssh/authorized_keys as appropriate for running Ansible (Insert the `nodejs_build_test` key or the `nodejs_build_release` key as appropriate). Set ~pi/.ssh to mode 755 and ~pi/.ssh/authorized_keys to mode 644.
 * Ensure that it can boot on the network and local SSH configuration matches the host (reprovisioned hosts will need a replacement of your `known_hosts` entry for it)
 * Update <https://github.com/nodejs/build/blob/master/setup/ansible-inventory> to include any new hosts under `[iojs-raspbian]`
 * Update <https://github.com/nodejs/build/blob/master/ansible/inventory.yml> to reflect any host additions or changes (this is primarily for automatic .ssh/config setup purposes currently)
-* Run Ansible from <https://github.com/nodejs/build/tree/master/setup/raspberry-pi>
+* Run Ansible from <https://github.com/nodejs/build/tree/master/setup/raspberry-pi> with `ansible-playbook ansible-playbook.yaml -i ../ansible-inventory --limit <hostname>`
 
 
 [`ansible.intro_windows`]: http://docs.ansible.com/ansible/intro_windows.html

setup/ansible-tasks/ccache.yaml

@@ -5,34 +5,43 @@
 - name: CCache | Check ccache --version
   shell: ccache --version
   ignore_errors: True
-  register: ccache_version
+  register: installed_version
+  tags: ccache
 
 - name: CCache | Compare installed version matches
   set_fact:
-    ccache_proceed: ccache_version.stdout.find('{{ version }}') == -1
+    ccache_proceed: "{{ installed_version.stdout.find(version) == -1 }}"
+  tags: ccache
 
 - name: CCache | Download ccache-{{ version }}
   get_url: url=https://www.samba.org/ftp/ccache/ccache-{{ version }}.tar.gz dest=/tmp/
   register: new_archive
   when: ccache_proceed
+  tags: ccache
 
 - name: CCache | Extract ccache-{{ version }}
   unarchive: src=/tmp/ccache-{{ version }}.tar.gz dest=/tmp/ copy=no
   when: ccache_proceed and new_archive|changed
+  tags: ccache
 
 - name: CCache | Prepare for compilation by running configure
   shell: ./configure chdir=/tmp/ccache-{{ version }} >> /dev/null
   when: ccache_proceed
+  tags: ccache
 
 - name: CCache | Compile ccache
-  shell: make chdir=/tmp/ccache-{{ version }} >> /dev/null
+  shell: make -j{{ ansible_processor_vcpus }}
+  args:
+    chdir: /tmp/ccache-{{ version }}
   when: ccache_proceed
+  tags: ccache
 
 - name: CCache | Install generated binary
   command: install -c -m 755 ccache /usr/local/bin
   args:
     chdir: /tmp/ccache-{{ version }}
   when: ccache_proceed
+  tags: ccache
 
 - name: CCache | Create symlinks in /usr/local/bin/
   file: src=/usr/local/bin/ccache dest=/usr/local/bin/{{ item }} state=link
@@ -42,10 +51,12 @@
     - g++
     - c++
   when: ccache_proceed
+  tags: ccache
 
 - name: CCache | Cleanup
   file: path="{{ item }}" state=absent
   with_items:
     - /tmp/ccache-{{ version }}.tar.gz
     - /tmp/ccache-{{ version }}
   when: ccache_proceed
+  tags: ccache

setup/ansible-tasks/git.yaml

@@ -5,7 +5,13 @@
 - name: Git | Check git --version
   shell: git --version
   ignore_errors: True
-  register: git_version
+  register: installed_version
+  tags: git
+
+- name: Git | Compare installed version matches
+  set_fact:
+    git_proceed: "{{ installed_version.stdout.find(version) == -1 }}"
+  tags: git
 
 - name: Git | Install required packages for git compile
   apt: name={{ item }} update_cache=yes state=latest
@@ -15,41 +21,43 @@
     - gettext
     - libcurl4-openssl-dev
     - zlib1g-dev
-  when: git_version.stdout.find('{{ version }}') == -1
+  when: git_proceed
   tags: git
 
 - name: Git | Download git-{{ version }}
   get_url: url=https://www.kernel.org/pub/software/scm/git/git-{{ version }}.tar.xz dest=/tmp/
   register: new_archive
-  when: git_version.stdout.find('{{ version }}') == -1
+  when: git_proceed
   tags: git
 
 - name: Git | Extract git-{{ version }}
   unarchive: src=/tmp/git-{{ version }}.tar.xz dest=/tmp/ copy=no
-  when: git_version.stdout.find('{{ version }}') == -1 and new_archive|changed
+  when: git_proceed and new_archive|changed
   tags: git
 
 - name: Git | Prepare for compilation by running configure
   shell: ./configure --prefix=/usr --with-gitconfig=/etc/gitconfig chdir=/tmp/git-{{ version }} >> /dev/null
-  when: git_version.stdout.find('{{ version }}') == -1
+  when: git_proceed
   tags: git
 
 - name: Git | Compile git
-  shell: make chdir=/tmp/git-{{ version }} >> /dev/null
-  when: git_version.stdout.find('{{ version }}') == -1
+  shell: make -j{{ ansible_processor_vcpus }}
+  args:
+    chdir: /tmp/git-{{ version }}
+  when: git_proceed
   tags: git
 
 - name: Git | Install generated binary
   command: make install
   args:
     chdir: /tmp/git-{{ version }}
-  when: git_version.stdout.find('{{ version }}') == -1
+  when: git_proceed
   tags: git
 
 - name: Git | Cleanup
   file: path="{{ item }}" state=absent
   with_items:
     - /tmp/git-{{ version }}.tar.gz
     - /tmp/git-{{ version }}
-  when: git_version.stdout.find('{{ version }}') == -1
+  when: git_proceed
   tags: git

setup/ansible-tasks/monit.yaml

@@ -2,22 +2,34 @@
 # Installs and configures monit for Debian based systems.
 # @requires: monit_conf_file=../ansible-tasks/resources/monit-jenkins.conf
 
-- name: Monit | Install deb package
-  apt: name=monit update_cache=yes state=latest
+- name: Monit | Install monit
+  apt:
+    name: monit
+    update_cache: yes
+    state: latest
   tags: monit
 
 - name: Monit | Set the cycle length to 15 seconds
-  lineinfile: dest=/etc/monit/monitrc state=present regexp="^(\s*)set(\s+)daemon" line="set daemon 15"
+  lineinfile:
+    dest: /etc/monit/monitrc
+    state: present
+    regexp: "^(\\s*)set(\\s+)daemon"
+    line: "set daemon 15"
   tags: monit
 
 - name: Monit | Copy monit config
-  copy: src={{ monit_conf_file }} dest=/etc/monit/conf.d/jenkins owner=root group=root mode=0644
-  tags: monit
-
-- name: Monit | Copy server user name to monit config
-  replace: dest=/etc/monit/conf.d/jenkins regexp="\{\{server_user\}\}" replace="{{ server_user }}"
+  template:
+    src: "./resources/monit-jenkins.conf.j2"
+    dest: "/etc/monit/conf.d/jenkins"
+    owner: "root"
+    group: "root"
+    mode: 0644
+  register: monit_config
   tags: monit
 
 - name: Monit | Restart service
-  service: name=monit state=restarted
+  service:
+    name: monit
+    state: restarted
+  when: monit_config.changed
   tags: monit

setup/ansible-tasks/resources/monit-jenkins.conf

@@ -0,0 +1,4 @@
+check process jenkins
+  matching slave.jar
+  start program = "/bin/su {{ server_user }} -c 'cd /home/{{ server_user }} && /home/{{ server_user }}/start.sh'"
+  stop program = "/bin/su {{ server_user }} -c 'pkill -f slave.jar'"

setup/ansible-tasks/resources/monit-jenkins.conf.j2

@@ -10,6 +10,17 @@
     - name: Init | Discover Pi type
       set_fact:
         pi_type: "{{ inventory_hostname | regex_replace('^.+_(pi[^-]+)-\\d+$', '\\1') }}"
+      tags: vars
+
+    - name: Init | Discover worker type
+      set_fact:
+        worker_type: "{{ inventory_hostname | regex_replace('^(test|release)-.+$', '\\1') }}"
+      tags: vars
+
+    - name: Init | Generate hostname
+      set_fact:
+        safe_hostname: "{{ inventory_hostname | regex_replace('_', '--') }}"
+      tags: vars
 
     - name: General | Setup APT proxy
       template:
@@ -28,6 +39,7 @@
         owner: "root"
         group: "root"
         mode: 0644
+      when: pi_local is undefined
       tags: general
 
     - name: General | APT update
@@ -56,6 +68,62 @@
       when: ssh_remove_dns.changed
       tags: init
 
+    - name: General | Setup keyboard config
+      template:
+        src: "./resources/keyboard-defaults.j2"
+        dest: "/etc/default/keyboard"
+        owner: "root"
+        group: "root"
+        mode: 0644
+      register: keyboard_config
+      tags: general
+
+    - name: General | Setup keyboard config
+      shell: dpkg-reconfigure -f noninteractive keyboard-configuration && invoke-rc.d keyboard-setup start
+      when: keyboard_config.changed
+      tags: general
+
+    - name: General | Setup locale
+      shell:
+        cmd: |
+          cat << EOF | debconf-set-selections
+          locales   locales/locales_to_be_generated multiselect     en_US.UTF-8 UTF-8
+          EOF
+          rm /etc/locale.gen
+          dpkg-reconfigure -f noninteractive locales
+          update-locale LANG="en_US.UTF-8"
+          cat << EOF | debconf-set-selections
+          locales   locales/default_environment_locale select       en_US.UTF-8
+          EOF
+      tags: general
+
+    - name: General | Expand root disk
+      shell:
+        cmd: |
+          ROOT_PART=$(readlink /dev/root)
+          PART_NUM=${ROOT_PART#mmcblk0p}
+          PART_START=$(parted /dev/mmcblk0 -ms unit s p | grep "^${PART_NUM}" | cut -f 2 -d:)
+          fdisk /dev/mmcblk0 << EOF || true
+          p
+          d
+          $PART_NUM
+          n
+          p
+          $PART_NUM
+          $PART_START
+
+          p
+          w
+          EOF
+      tags: general
+
+    - name: General | Set hostname
+      shell:
+        cmd: |
+          echo {{ safe_hostname }} > /etc/hostname
+          sed -i "s/127.0.1.1.*{{ safe_hostname }}/127.0.1.1\t{{ safe_hostname }}/g" /etc/hosts
+      tags: general
+
     - name: General | Configure 1024M dphys-swapfile
       lineinfile:
         dest: /etc/dphys-swapfile
@@ -191,32 +259,38 @@
         mode: 0755
       tags: jenkins
 
-    - name: ccache | Install ccache
-      import_tasks: ../ansible-tasks/ccache.yaml version=3.3.4
-      tags: ccache
-
-    - name: git | Install git
-      import_tasks: ../ansible-tasks/git.yaml version=2.15.0
-      tags: git
-
-    - name: monit | Install monit
-      import_tasks: ../ansible-tasks/monit.yaml monit_conf_file=../ansible-tasks/resources/monit-jenkins.conf
-      tags: monit
-
     - name: Tunnel | Copy start_tunnel.sh script
-      when: pi_local is defined
       template:
         src: "./resources/start_tunnel.j2"
         dest: "/usr/local/sbin/start_tunnel.sh"
         owner: "{{ server_user }}"
         group: "{{ server_user }}"
         mode: 0755
+      when: pi_local is defined
       tags: tunnel
 
     - name: Tunnel | crontab entry
-      when: pi_local is defined
       cron:
         name: 'start ssh tunnel on reboot'
         special_time: reboot
         job: "/usr/local/sbin/start_tunnel.sh"
+      when: pi_local is defined
       tags: tunnel
+
+    - name: ccache | Install ccache
+      import_tasks: ../ansible-tasks/ccache.yaml
+      vars:
+        version: 3.3.4
+      tags: ccache
+
+    - name: git | Install git
+      import_tasks: ../ansible-tasks/git.yaml
+      vars:
+        version: 2.15.0
+      tags: git
+
+    - name: monit | Install monit
+      import_tasks: ../ansible-tasks/monit.yaml
+      vars:
+        monit_conf_file: ../ansible-tasks/resources/monit-jenkins.conf.j2
+      tags: monit

setup/raspberry-pi/ansible-playbook.yaml

@@ -1,4 +1,4 @@
-arm_freq=800
+arm_freq={{ '700' if worker_type == 'release' else '800' }}
 dtparam=audio=on
 core_freq=250
 sdram_freq=400

setup/raspberry-pi/resources/boot-config.pi1p.txt.j2

@@ -0,0 +1,5 @@
+XKBMODEL="pc104"
+XKBLAYOUT="us"
+XKBVARIANT=""
+XKBOPTIONS=""
+BACKSPACE="guess"

setup/raspberry-pi/resources/do_mount.j2

@@ -1,3 +1,8 @@
 #!/bin/sh
 
-autossh -f -M 0 -o "ServerAliveInterval 30" -o "ServerAliveCountMax 3" [email protected] -L {{ ci_port }}:ci-release.nodejs.org:{{ ci_port }} -N
+autossh -f -M 0 \
+  -o "ServerAliveInterval 30" \
+  -o "ServerAliveCountMax 3" \
+  [email protected] \
+  -L {{ ci_port }}:ci-release.nodejs.org:{{ ci_port }} \
+  -N