From 3993a014e6c5f35f580bd9a43f7c16af26ea5113 Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Tue, 17 Nov 2015 23:12:52 +0000
Subject: [PATCH] refactor openqa playbook so that base is done before openqa

---
 playbooks/groups/openqa.yml | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml
index c79430a411..544fbc0996 100644
--- a/playbooks/groups/openqa.yml
+++ b/playbooks/groups/openqa.yml
@@ -1,6 +1,6 @@
 - include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=openqa:openqa-stg"
 
-- name: configure openQA
+- name: setup base openqa host 
   hosts: openqa:openqa-stg
   user: root
   gather_facts: True
@@ -18,8 +18,6 @@
    - { role: fas_client, tags: ['fas_client'] }
    - { role: collectd/base, tags: ['collectd_base'] }
    - { role: sudo, tags: ['sudo'] }
-   - { role: openqa/server, tags: ['openqa_server'] }
-   - { role: openqa/dispatcher, tags: ['openqa_dispatcher'] }
    - apache
 
   tasks:
@@ -29,3 +27,20 @@
 
   handlers:
    - include: "{{ handlers }}/restart_services.yml"
+
+- name: configure openQA
+  hosts: openqa:openqa-stg
+  user: root
+  gather_facts: True
+
+  vars_files:
+   - /srv/web/infra/ansible/vars/global.yml
+   - "/srv/private/ansible/vars.yml"
+   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+
+  roles:
+   - { role: openqa/server, tags: ['openqa_server'] }
+   - { role: openqa/dispatcher, tags: ['openqa_dispatcher'] }
+
+  handlers:
+   - include: "{{ handlers }}/restart_services.yml"