summaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-01-30 15:05:38 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-01-30 15:08:38 +0000
commitc9d4f2c8d87115fe6cd48f586de82b252a357c45 (patch)
tree37d06bfa42de53909810ebbc30002e23bc10c500 /ansible
parent98cf2ab9c80c8efd0df9086353972e7dc73f40b8 (diff)
downloadtrove-setup-c9d4f2c8d87115fe6cd48f586de82b252a357c45.tar.gz
Remove all mention of Mason from trove-setup
The Mason referred to here is the 1st version of the Mason continuous delivery tool. There have been no instances of this for two years. We have made two subsequent Mason implementations since then which don't require coupling in Trove in order to work. As well as removing unneeded configuration, this will fix the misleading warning that users see on Git pushes: remote: [git.baserock.org] Notifying Mason of changes... remote: [git.baserock.org] Notification failed somehow
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/trove-setup/tasks/check.yml6
-rw-r--r--ansible/roles/trove-setup/tasks/gitano-mason-setup.yml16
-rw-r--r--ansible/roles/trove-setup/tasks/users.yml4
3 files changed, 1 insertions, 25 deletions
diff --git a/ansible/roles/trove-setup/tasks/check.yml b/ansible/roles/trove-setup/tasks/check.yml
index 3aeb48a..48e8272 100644
--- a/ansible/roles/trove-setup/tasks/check.yml
+++ b/ansible/roles/trove-setup/tasks/check.yml
@@ -35,12 +35,6 @@
- set_fact: LORRY_CONTROLLER_MINIONS=4
when: LORRY_CONTROLLER_MINIONS is not defined
-- set_fact: MASON_ID=''
- when: MASON_ID is not defined
-
-- set_fact: MASON_PORT='18755'
- when: MASON_PORT is not defined
-
- name: Calculate ESC_PREFIX
shell: echo -n {{ TROVE_ID|quote }} | perl -pe 's/([-+\(\).%*?^$\[\]])/%$1/g'
register: var_esc_prefix
diff --git a/ansible/roles/trove-setup/tasks/gitano-mason-setup.yml b/ansible/roles/trove-setup/tasks/gitano-mason-setup.yml
deleted file mode 100644
index 8439078..0000000
--- a/ansible/roles/trove-setup/tasks/gitano-mason-setup.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-# Depends on:
-# - gitano-setup.yml
----
-- name: Check if mason has a sshkey configured in gitano (This task can fail)
- shell: su git -c 'ssh git@localhost as mason sshkey' 2>&1 | grep WARNING
- register: gitano_mason_key
- changed_when: False
- ignore_errors: True
-
-# If distbuild user doesn't have an sshkey configured
-- file: path=/home/git/keys state=directory owner=git group=git
- when: gitano_mason_key|success
-- copy: src={{ MASON_SSH_PUBKEY }} dest=/home/git/keys/mason.key.pub mode=0644
- when: gitano_mason_key|success
-- shell: su git -c 'ssh git@localhost as mason sshkey add trove < /home/git/keys/mason.key.pub'
- when: gitano_mason_key|success
diff --git a/ansible/roles/trove-setup/tasks/users.yml b/ansible/roles/trove-setup/tasks/users.yml
index c1ab866..e0a27c8 100644
--- a/ansible/roles/trove-setup/tasks/users.yml
+++ b/ansible/roles/trove-setup/tasks/users.yml
@@ -6,12 +6,11 @@
- name: Create the /home/lorry/.ssh folder
file: path=/home/lorry/.ssh state=directory owner=lorry group=lorry mode=0700
-- name: Create users (git, cache, mason) and ssh keys for them.
+- name: Create users (git, cache) and ssh keys for them.
user: name={{ item }} comment="Trove {{ item }} service" shell=/bin/bash generate_ssh_key=yes
with_items:
- git
- cache
- - mason
- name: Create known_hosts for all the users
shell: |
cat /etc/ssh/ssh_host_*_key.pub | cut -d\ -f1,2 | \
@@ -23,7 +22,6 @@
with_items:
- git
- cache
- - mason
- lorry
- name: Copy the lorry ssh private key