ISTI-ansible-roles
/
ansible-roles
4
0
Fork 3
Code Issues Pull Requests Releases Wiki Activity

library/roles: nagios-plugins-contrib is not available on ubuntu 12.04

This commit is contained in:
Andrea Dell'Amico 2016-06-21 14:03:02 +02:00
parent 25045f9606
commit 68f076b334
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nagios/tasks/nagios.yml
View File

@ -9,7 +9,7 @@
with_items: '{{ nagios_plugins_contrib }}'
when:
- is_not_debian_less_than_6
- is_not_ubuntu_less_than_precise
- is_not_ubuntu_less_than_trusty
tags: [ 'nagios', 'nagios_plug_contrib' ]
- name: Create the directory where our local plugins are installed

2
ubuntu-deb-general/defaults/main.yml
View File

@ -128,6 +128,7 @@ is_not_debian6: "'{{ ansible_distribution }}' == 'Debian' and '{{ ansible_distri
is_debian_7_or_older: "'{{ ansible_distribution }}' == 'Debian' and {{ ansible_distribution_major_version }} <= 7"
is_debian_less_than6: "'{{ ansible_distribution }}' == 'Debian' and '{{ ansible_distribution_version }}' != 'lenny/sid' and {{ ansible_distribution_major_version }} < 6"
is_not_debian_less_than_6: "('{{ ansible_distribution }}' != 'Debian') or (('{{ ansible_distribution }}' == 'Debian' or '{{ ansible_distribution }}' == 'Ubuntu') and '{{ ansible_distribution_version }}' != 'lenny/sid' and {{ ansible_distribution_major_version }} >= 6)"
is_not_debian_less_than_7: "('{{ ansible_distribution }}' != 'Debian') or (('{{ ansible_distribution }}' == 'Debian' or '{{ ansible_distribution }}' == 'Ubuntu') and '{{ ansible_distribution_version }}' != 'lenny/sid' and {{ ansible_distribution_major_version }} >= 7)"
is_hardy: "'{{ ansible_distribution_release }}' == 'hardy'"
is_broken_hardy_lts: "'{{ ansible_distribution }}'== 'Debian' and '{{ ansible_distribution_release }}' == 'NA'"
@ -140,6 +141,7 @@ is_ubuntu: "'{{ ansible_distribution }}' == 'Ubuntu'"
is_not_precise: "('{{ ansible_distribution }}' == 'Ubuntu' and {{ ansible_distribution_version }} != 12.04) or '{{ ansible_distribution }}' == 'Debian'"
is_not_trusty: "('{{ ansible_distribution }}' == 'Ubuntu' and {{ ansible_distribution_version }} != 14.04) or '{{ ansible_distribution }}' == 'Debian'"
is_not_ubuntu_less_than_precise: "('{{ ansible_distribution }}' == 'Ubuntu') and ({{ ansible_distribution_major_version }} >= 12)"
is_not_ubuntu_less_than_trusty: "('{{ ansible_distribution }}' == 'Ubuntu') and ({{ ansible_distribution_major_version }} >= 14)"
is_ubuntu_less_than_precise: "('{{ ansible_distribution }}' == 'Ubuntu') and ({{ ansible_distribution_major_version }} < 12)"
is_ubuntu_less_than_trusty: "('{{ ansible_distribution }}' == 'Ubuntu') and ({{ ansible_distribution_major_version }} < 14)"
# Ubuntu < 10.04 or Debian 4

2
ubuntu-deb-general/tasks/main.yml
View File

@ -20,9 +20,9 @@
- include: rsyslogfix.yml
when: is_precise and ansible_kernel != "3.2.0-4-amd64"
- include: unattended-upgrades.yml
- include: pki-basics.yml
- include: install_external_ca_cert.yml
- include: manage_su_limits.yml
- include: pki-basics.yml
- include: disable-unneeded-services.yml