refactor openqa playbook so that base is done before openqa

This commit is contained in:
Tim Flink 2015-11-17 23:12:52 +00:00
parent 2f874a4a9d
commit 3993a014e6

View file

@ -1,6 +1,6 @@
- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=openqa:openqa-stg" - 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 hosts: openqa:openqa-stg
user: root user: root
gather_facts: True gather_facts: True
@ -18,8 +18,6 @@
- { role: fas_client, tags: ['fas_client'] } - { role: fas_client, tags: ['fas_client'] }
- { role: collectd/base, tags: ['collectd_base'] } - { role: collectd/base, tags: ['collectd_base'] }
- { role: sudo, tags: ['sudo'] } - { role: sudo, tags: ['sudo'] }
- { role: openqa/server, tags: ['openqa_server'] }
- { role: openqa/dispatcher, tags: ['openqa_dispatcher'] }
- apache - apache
tasks: tasks:
@ -29,3 +27,20 @@
handlers: handlers:
- include: "{{ handlers }}/restart_services.yml" - 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"