From a1dfbe101562a4db8c2ef4a44a3a0fd823eb7842 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 3 Feb 2015 16:55:09 +0000 Subject: Improvements to distbuild ansible scripts --- distbuild/ansible/restart.yaml | 2 ++ distbuild/ansible/use-latest-morph.yaml | 19 ++++--------------- 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 -- cgit v1.2.1