setup: remove github/pubkey mechanism

The majority of our machines now use shared keys that are accessed through a encrypted github repo. Additionally, the list of users were out of date. PR-URL: #380 Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: João Reis <reis@janeasystems.com> Reviewed-By: Rod Vagg <rod@vagg.org>
nodejs · Apr 15, 2016 · 89da2d1 · 89da2d1
1 parent 6ae85b8
commit 89da2d1
Show file tree

Hide file tree

Showing 36 changed files with 4 additions and 383 deletions.
diff --git a/setup/aix61/ansible-playbook.yaml b/setup/aix61/ansible-playbook.yaml
@@ -16,22 +16,6 @@
       user: name="{{ server_user }}" shell=/bin/bash
       tags: user
 
-    - name: User | Download pubkey(s)
-      get_url: url=https://github.com/{{ item }}.keys dest=/tmp/{{ item }}.keys
-      delegate_to: 127.0.0.1
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for root
-      authorized_key: user="root" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for {{ server_user }}
-      authorized_key: user="{{ server_user }}" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
     - name: Jenkins | Download Jenkins slave.jar
       get_url: url=https://ci.nodejs.org/jnlpJars/slave.jar dest=/home/{{ server_user }}/slave.jar validate_certs=no
       tags: jenkins

diff --git a/setup/aix61/ansible-vars.yaml b/setup/aix61/ansible-vars.yaml
@@ -1,8 +1,2 @@
 ---
 server_user: iojs
-ssh_users:
-  - rvagg
-  - wblankenship
-  - ryanstevens
-  - joaocgreis
-  - mhdawson
diff --git a/setup/armv7-wheezy/ansible-playbook.yaml b/setup/armv7-wheezy/ansible-playbook.yaml
@@ -69,22 +69,6 @@
       user: name="{{ server_user }}" shell=/bin/bash
       tags: user
 
-    - name: User | Download pubkey(s)
-      get_url: url=https://github.com/{{ item }}.keys dest=/tmp/{{ item }}.keys
-      delegate_to: 127.0.0.1
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for root
-      authorized_key: user="root" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for {{ server_user }}
-      authorized_key: user="{{ server_user }}" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
     - name: Jenkins | Download Jenkins' slave.jar
       command: curl -sL https://ci.nodejs.org/jnlpJars/slave.jar -o /home/{{ server_user }}/slave.jar
       tags: jenkins

diff --git a/setup/armv7-wheezy/ansible-vars.yaml b/setup/armv7-wheezy/ansible-vars.yaml
@@ -1,9 +1,5 @@
 ---
 server_user: iojs
-ssh_users:
-  - rvagg
-  - jbergstroem
-  - orangemocha
 packages:
   - openjdk-7-jre
   - python-all

diff --git a/setup/centos5/ansible-playbook.yaml b/setup/centos5/ansible-playbook.yaml
@@ -84,22 +84,6 @@
       user: name="{{ server_user }}" shell=/bin/bash
       tags: user
 
-    - name: User | Download pubkey(s)
-      get_url: url=https://github.com/{{ item }}.keys dest=/tmp/{{ item }}.keys
-      delegate_to: 127.0.0.1
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for root
-      authorized_key: user="root" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for {{ server_user }}
-      authorized_key: user="{{ server_user }}" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
     - name: General | Create python26 symlink
       file: src=/usr/bin/python26 dest=/usr/local/bin/python owner={{ server_user }} state=link
       tags: jenkins

diff --git a/setup/centos5/ansible-vars.yaml b/setup/centos5/ansible-vars.yaml
@@ -1,11 +1,5 @@
 ---
 server_user: iojs
-ssh_users:
-  - rvagg
-  - wblankenship
-  - ryanstevens
-  - jbergstroem
-  - joaocgreis
 packages:
   - git
   - java-1.7.0-openjdk

diff --git a/setup/centos6/ansible-playbook.yaml b/setup/centos6/ansible-playbook.yaml
@@ -54,22 +54,6 @@
       user: name="{{ server_user }}" shell=/bin/bash
       tags: user
 
-    - name: User | Download pubkey(s)
-      get_url: url=https://github.com/{{ item }}.keys dest=/tmp/{{ item }}.keys
-      delegate_to: 127.0.0.1
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for root
-      authorized_key: user="root" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for {{ server_user }}
-      authorized_key: user="{{ server_user }}" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
     - name: Jenkins | Download Jenkins' slave.jar
       command: curl -sL https://ci.nodejs.org/jnlpJars/slave.jar -o /home/{{ server_user }}/slave.jar
       tags: jenkins

diff --git a/setup/centos6/ansible-vars.yaml b/setup/centos6/ansible-vars.yaml
@@ -1,11 +1,5 @@
 ---
 server_user: iojs
-ssh_users:
-  - rvagg
-  - wblankenship
-  - ryanstevens
-  - jbergstroem
-  - joaocgreis
 packages:
   - git
   - java-1.8.0-openjdk

diff --git a/setup/centos7/ansible-playbook.yaml b/setup/centos7/ansible-playbook.yaml
@@ -42,22 +42,6 @@
       user: name="{{ server_user }}" shell=/bin/bash
       tags: user
 
-    - name: User | Download pubkey(s)
-      get_url: url=https://github.com/{{ item }}.keys dest=/tmp/{{ item }}.keys
-      delegate_to: 127.0.0.1
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for root
-      authorized_key: user="root" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for {{ server_user }}
-      authorized_key: user="{{ server_user }}" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
     - name: Jenkins | Download Jenkins' slave.jar
       command: curl -sL https://ci.nodejs.org/jnlpJars/slave.jar -o /home/{{ server_user }}/slave.jar
       tags: jenkins
@@ -77,7 +61,7 @@
     - name: Jenkins | Copy server ids to jenkins.service
       replace: dest=/usr/lib/systemd/system/jenkins.service regexp="\{\{id\}\}" replace="{{ inventory_hostname }}"
       tags: jenkins
-      
+
     - name: Jenkins | Start service
       service: name=jenkins state=started
       tags: jenkins
diff --git a/setup/centos7/ansible-vars.yaml b/setup/centos7/ansible-vars.yaml
@@ -1,11 +1,5 @@
 ---
 server_user: iojs
-ssh_users:
-  - rvagg
-  - wblankenship
-  - ryanstevens
-  - jbergstroem
-  - joaocgreis
 packages:
   - java-1.7.0-openjdk
   - git

diff --git a/setup/containers/ansible-playbook.yaml b/setup/containers/ansible-playbook.yaml
@@ -40,22 +40,6 @@
       user: name="{{ server_user }}" shell=/bin/bash
       tags: user
 
-    - name: User | Download pubkey(s)
-      get_url: url=https://github.com/{{ item }}.keys dest=/tmp/{{ item }}.keys
-      delegate_to: 127.0.0.1
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for root
-      authorized_key: user="root" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for {{ server_user }}
-      authorized_key: user="{{ server_user }}" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
     - name: Docker | Set up docker.io
       command: sh -c 'curl -sL http://get.docker.io/ | bash -'
       tags: docker
@@ -76,12 +60,11 @@
       copy: src=./resources/start.sh dest=/home/{{ server_user }}/start.sh owner={{ server_user }} group={{ server_user }} mode=0755
       tags: jenkins
 
-    - name: Jenkins | Copy secrets to start.sh script 
+    - name: Jenkins | Copy secrets to start.sh script
       replace: dest=/home/{{ server_user }}/start.sh regexp="\{\{iojs-{{ item.key }}-secret\}\}" replace="{{ item.value.secret }}"
       with_dict: distributions
       tags: jenkins
 
-    - name: Jenkins | Copy server ids to start.sh script 
+    - name: Jenkins | Copy server ids to start.sh script
       replace: dest=/home/{{ server_user }}/start.sh regexp="\{\{id\}\}" replace="{{ server_id }}"
       tags: jenkins
-
diff --git a/setup/containers/ansible-vars.yaml b/setup/containers/ansible-vars.yaml
@@ -1,10 +1,5 @@
 ---
 server_user: iojs
-ssh_users:
-  - rvagg
-  - wblankenship
-  - ghostbar
-  - joaocgreis
 packages:
   - nodejs
   - openjdk-7-jre
diff --git a/setup/debian8/ansible-playbook.yaml b/setup/debian8/ansible-playbook.yaml
@@ -21,22 +21,6 @@
       user: name="{{ server_user }}" shell=/bin/bash
       tags: user
 
-    - name: User | Download pubkey(s)
-      get_url: url=https://github.com/{{ item }}.keys dest=/tmp/{{ item }}.keys
-      delegate_to: 127.0.0.1
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for root
-      authorized_key: user="root" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for {{ server_user }}
-      authorized_key: user="{{ server_user }}" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
     - name: Jenkins | Download Jenkins slave.jar
       get_url: url=https://ci.nodejs.org/jnlpJars/slave.jar dest=/home/{{ server_user }}/slave.jar
       tags: jenkins

diff --git a/setup/debian8/ansible-vars.yaml b/setup/debian8/ansible-vars.yaml
@@ -1,11 +1,5 @@
 ---
 server_user: iojs
-ssh_users:
-  - rvagg
-  - wblankenship
-  - jbergstroem
-  - kenperkins
-  - joaocgreis
 packages:
   - ntp
   - openjdk-7-jre

diff --git a/setup/fedora20/ansible-playbook.yaml b/setup/fedora20/ansible-playbook.yaml
@@ -33,22 +33,6 @@
       user: name="{{ server_user }}" shell=/bin/bash
       tags: user
 
-    - name: User | Download pubkey(s)
-      get_url: url=https://github.com/{{ item }}.keys dest=/tmp/{{ item }}.keys
-      delegate_to: 127.0.0.1
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for root
-      authorized_key: user="root" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for {{ server_user }}
-      authorized_key: user="{{ server_user }}" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
     - name: Jenkins | Download Jenkins' slave.jar
       command: curl -sL https://ci.nodejs.org/jnlpJars/slave.jar -o /home/{{ server_user }}/slave.jar
       tags: jenkins

diff --git a/setup/fedora20/ansible-vars.yaml b/setup/fedora20/ansible-vars.yaml
@@ -1,10 +1,5 @@
 ---
 server_user: iojs
-ssh_users:
-  - rvagg
-  - wblankenship
-  - jbergstroem
-  - mhdawson
 packages:
   - java-1.8.0-openjdk
   - git

diff --git a/setup/fedora21/ansible-playbook.yaml b/setup/fedora21/ansible-playbook.yaml
@@ -42,22 +42,6 @@
       user: name="{{ server_user }}" shell=/bin/bash
       tags: user
 
-    - name: User | Download pubkey(s)
-      get_url: url=https://github.com/{{ item }}.keys dest=/tmp/{{ item }}.keys
-      delegate_to: 127.0.0.1
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for root
-      authorized_key: user="root" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for {{ server_user }}
-      authorized_key: user="{{ server_user }}" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
     - name: Jenkins | Download Jenkins' slave.jar
       command: curl -sL https://ci.nodejs.org/jnlpJars/slave.jar -o /home/{{ server_user }}/slave.jar
       tags: jenkins

diff --git a/setup/fedora21/ansible-vars.yaml b/setup/fedora21/ansible-vars.yaml
@@ -1,10 +1,5 @@
 ---
 server_user: iojs
-ssh_users:
-  - rvagg
-  - wblankenship
-  - jbergstroem
-  - joaocgreis
 packages:
   - java-1.8.0-openjdk
   - git

diff --git a/setup/fedora22/ansible-playbook.yaml b/setup/fedora22/ansible-playbook.yaml
@@ -42,22 +42,6 @@
       user: name="{{ server_user }}" shell=/bin/bash
       tags: user
 
-    - name: User | Download pubkey(s)
-      get_url: url=https://github.com/{{ item }}.keys dest=/tmp/{{ item }}.keys
-      delegate_to: 127.0.0.1
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for root
-      authorized_key: user="root" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for {{ server_user }}
-      authorized_key: user="{{ server_user }}" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
     - name: Jenkins | Download Jenkins' slave.jar
       command: curl -sL https://ci.nodejs.org/jnlpJars/slave.jar -o /home/{{ server_user }}/slave.jar
       tags: jenkins

diff --git a/setup/fedora22/ansible-vars.yaml b/setup/fedora22/ansible-vars.yaml
@@ -1,10 +1,5 @@
 ---
 server_user: iojs
-ssh_users:
-  - rvagg
-  - wblankenship
-  - jbergstroem
-  - joaocgreis
 packages:
   - java-1.8.0-openjdk
   - git

diff --git a/setup/freebsd/ansible-playbook.yaml b/setup/freebsd/ansible-playbook.yaml
@@ -29,21 +29,6 @@
       user: name="{{ server_user }}" shell=/bin/sh append=yes groups={{ server_user }}
       tags: user
 
-    - name: User | Download pubkey(s)
-      get_url: url=https://github.com/{{ item }}.keys dest=/tmp/{{ item }}.keys
-      delegate_to: 127.0.0.1
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for root
-      authorized_key: user="root" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
-
-    - name: General | Create authorized_keys for {{ server_user }}
-      authorized_key: user="{{ server_user }}" key="{{ lookup('file', '/tmp/' + item + '.keys') }}"
-      with_items: ssh_users
-      tags: user
 
     - name: Jenkins | Download Jenkins' slave.jar
       command: curl -sL https://ci.nodejs.org/jnlpJars/slave.jar -o /home/{{ server_user }}/slave.jar

diff --git a/setup/freebsd/ansible-vars.yaml b/setup/freebsd/ansible-vars.yaml
@@ -1,9 +1,6 @@
 ---
 server_user: iojs
 init_script_path: /usr/local/etc/rc.d/jenkins
-ssh_users:
-  - rvagg
-  - jbergstroem
 packages:
   - openjdk-jre
   - git