Allow Debian hosts to run Ubuntu stuff

Sometimes we mean Ubuntu, other times we mean Debian family. Use
ansible_os_family where we mean Debian family.

Signed-off-by: Alan Orth <alan.orth@gmail.com>
This commit is contained in:
Alan Orth 2015-08-22 22:51:19 +03:00
parent dc24285ec6
commit b4310cfc89
2 changed files with 6 additions and 6 deletions

12
web.yml
View File

@ -6,13 +6,13 @@
user: provisioning user: provisioning
sudo: yes sudo: yes
roles: roles:
- { role: common, when: ansible_distribution == 'Ubuntu' } - { role: common, when: ansible_os_family == 'Debian' }
- { role: mariadb, when: ansible_distribution == 'Ubuntu' } - { role: mariadb, when: ansible_os_family == 'Debian' }
- { role: nginx, when: ansible_distribution == 'Ubuntu' } - { role: nginx, when: ansible_os_family == 'Debian' }
- { role: php5-fpm, when: ansible_distribution == 'Ubuntu' } - { role: php5-fpm, when: ansible_os_family == 'Debian' }
- { role: munin, when: ansible_distribution == 'Ubuntu' } - { role: munin, when: ansible_os_family == 'Debian' }
vars_files: vars_files:
- vars/ipsets.yml - vars/ipsets.yml
- "vars/{{ ansible_distribution }}.yml" - "vars/{{ ansible_os_family }}.yml"
# vim: set sw=2 ts=2: # vim: set sw=2 ts=2: