infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 7 Projects Releases Packages Wiki Activity Actions

Fix handlers, roles, and tasks to be handlers_path, roles_path and tasks_path so as not to conflict with ansible variables.

Browse source 
Fix duplicate definition of become default that was in group_vars/all as well as vars/global.
This commit is contained in:
Kevin Fenzi 2017-04-13 15:46:14 +00:00
parent 87a32844b1
commit 0acfaa2a7e
207 changed files with 785 additions and 788 deletions
Download patch file Download diff file Expand all files Collapse all files

12
playbooks/groups/mdapi.yml
View file

@ -11,7 +11,7 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
pre_tasks:
- include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks_path }}/yumrepos.yml"
roles:
- base
@ -27,11 +27,11 @@
- { role: mod_wsgi, when: env == "staging" }
tasks:
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
- include: "{{ tasks_path }}/2fa_client.yml"
- include: "{{ tasks_path }}/motd.yml"
handlers:
- include: "{{ handlers }}/restart_services.yml"
- include: "{{ handlers_path }}/restart_services.yml"
- name: deploy mdapi itself
hosts: mdapi-stg:mdapi
@ -48,7 +48,7 @@
- { role: plus-plus-service, when: env == "staging" }
handlers:
- include: "{{ handlers }}/restart_services.yml"
- include: "{{ handlers_path }}/restart_services.yml"
- name: set up fedmsg
hosts: mdapi-stg:mdapi
@ -64,4 +64,4 @@
- fedmsg/base
handlers:
- include: "{{ handlers }}/restart_services.yml"
- include: "{{ handlers_path }}/restart_services.yml"