summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-03 16:55:09 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-04 11:37:19 +0000
commita1dfbe101562a4db8c2ef4a44a3a0fd823eb7842 (patch)
treefbce365a9a5391a8f0faeeb4051a20715865353b
parent9cf34eec5edc0a64cda2cc58f98b2bef65e29a46 (diff)
downloadmorph-sam/distbuild-ansible.tar.gz
Improvements to distbuild ansible scriptssam/distbuild-ansible
-rw-r--r--distbuild/ansible/restart.yaml2
-rw-r--r--distbuild/ansible/use-latest-morph.yaml19
2 files changed, 6 insertions, 15 deletions
diff --git a/distbuild/ansible/restart.yaml b/distbuild/ansible/restart.yaml
index 2d16087e..a587a95e 100644
--- a/distbuild/ansible/restart.yaml
+++ b/distbuild/ansible/restart.yaml
@@ -12,6 +12,7 @@
# The order in which the processes are restarted is important! (Sadly).
- hosts: controller
+ gather_facts: false
tasks:
- name: restart controller processes
service: name={{ item }} state=restarted
@@ -20,6 +21,7 @@
- morph-controller-helper.service
- hosts: workers
+ gather_facts: false
tasks:
- name: restart worker processes
service: name={{ item }} state=restarted
diff --git a/distbuild/ansible/use-latest-morph.yaml b/distbuild/ansible/use-latest-morph.yaml
index 24a8157c..9f2716d2 100644
--- a/distbuild/ansible/use-latest-morph.yaml
+++ b/distbuild/ansible/use-latest-morph.yaml
@@ -13,24 +13,13 @@
---
- hosts: all
+ gather_facts: false
vars:
- TROVE_HOST: git.baserock.org
- - MORPH_VERSION: master
+ - MORPH_VERSION: sam/distbuild-build-logs
tasks:
- - name: clone Morph repository
- command: git clone git://{{ TROVE_HOST }}/baserock/baserock/morph /srv/morph
- args:
- creates: /srv/morph
-
- - name: update Morph repository
- command: git remote update origin
- args:
- chdir: /srv/morph
-
- - name: check out specified version of Morph
- command: git checkout {{ MORPH_VERSION }}
- args:
- chdir: /srv/morph
+ - name: check out Morph from Git
+ git: dest=/srv/morph version={{ MORPH_VERSION }} repo=git://{{ TROVE_HOST }}/baserock/baserock/morph accept_hostkey=True
- name: ensure latest Morph is used
template: backup=yes src=run-from-morph-source-tree.sh.template dest=/usr/bin/{{ item }} mode=0755