library/roles/nagios: Fix the Dell repository URL. It changed again.

library/roles/nagios/files/check_openmanage: new version of the check, fixes some bugs.
xen/roles/monitoring/templates/xen-nrpe.cfg.j2: Run the newest version of check_openmanage.

nagios/defaults/main.yml

@@ -50,3 +50,19 @@ nagios_psql_db_size_c: 170000000
 nrpe_command_timeout: 420
 nrpe_include_dir: /etc/nagios/nrpe.d/
 
+nagios_dell_omsa_deps:
+  - libnet-snmp-perl
+  - libconfig-tiny-perl
+  - ipmitool
+  - check-openmanage
+
+nagios_dell_omsa_pkg_state: present
+nagios_dell_omsa_pkgs:
+  - srvadmin-base
+  - srvadmin-idrac
+  - srvadmin-storageservices
+
+# We need a more recent version of the check_openmanage executable
+nagios_dell_standalone_checks:
+  - check_dell_warranty.py
+  - check_openmanage

nagios/tasks/dell-omsa.yml

@@ -2,15 +2,10 @@
 # The internal repository is used for the check-openmanage nagios plugin:
 # http://folk.uio.no/trondham/software/check_openmanage.html
 - name: research infrastructures system repository on ubuntu
-  apt_repository: repo='{{ item }}'
-  with_items:
-    - deb http://ppa.research-infrastructures.eu/system stable main
+  apt_repository: repo='deb http://ppa.research-infrastructures.eu/system stable main'
   when: is_ubuntu
   register: update_apt_cache
-  tags:
-    - dell
-    - nagios
-  notify: Update apt cache
+  tags: [ 'dell', 'nagios' ]
 
 - name: research infrastructures system repository on debian
   copy: src={{ item }} dest=/etc/apt/sources.list.d/{{ item }}
@@ -18,9 +13,7 @@
     - research-infrastructures.eu.system.list
   when: is_debian6
   register: update_apt_cache
-  tags:
-    - dell
-    - nagios
+  tags: [ 'dell', 'nagios' ]
 
 - name: Install the Dell apt repository
   template: src={{ item }}.j2 dest=/etc/apt/sources.list.d/{{ item }}
@@ -28,39 +21,26 @@
     - linux.dell.com.sources.list
   when: is_not_debian6
   register: update_apt_cache
-  tags:
-    - dell
-    - nagios
+  tags: [ 'dell', 'nagios' ]
 
-- action: apt_key url=http://ppa.research-infrastructures.eu/system/keys/system-archive.asc state=present
-  tags:
-    - dell
-    - nagios
-  ignore_errors: True
+- name: Install the NeMIS internal repository apt key
+  apt_key: url=http://ppa.research-infrastructures.eu/system/keys/system-archive.asc state=present
+  tags: [ 'dell', 'nagios' ]
 
 #- action: apt_key id=1285491434D8786F state=present
-- shell: gpg --keyserver pool.sks-keyservers.net --recv-key 1285491434D8786F ; gpg -a --export 1285491434D8786F |  apt-key add -
-  tags:
-    - dell
-    - nagios
+- name: Install the Dell OMSA repository apt key
+  apt_key: keyserver=pool.sks-keyservers.net id=1285491434D8786F
+  tags: [ 'dell', 'nagios' ]
 
 - name: Update apt cache
   apt: update_cache=yes
   when: update_apt_cache.changed
-  tags:
-    - dell
-    - nagios
+  tags: [ 'dell', 'nagios' ]
 
 - name: Install the Dell OMSA packages dependencies
   apt: pkg={{ item }} state=installed
-  with_items:
-    - libnet-snmp-perl
-    - libconfig-tiny-perl
-    - ipmitool
-    - check-openmanage
-  tags:
-    - dell
-    - nagios
+  with_items: nagios_dell_omsa_deps
+  tags: [ 'dell', 'nagios' ]
 
 - name: Install the Dell OMSA packages dependencies
   apt: pkg={{ item }} state=installed
@@ -68,77 +48,53 @@
     - python-requests
   register: requests_pkg
   ignore_errors: True
-  tags:
-    - dell
-    - nagios
+  tags: [ 'dell', 'nagios' ]
 
 - name: Install the python-pip package if requests is not available as a package
   apt: pkg={{ item }} state=installed
   with_items:
     - python-pip
   when: requests_pkg|failed
-  tags:
-    - dell
-    - nagios
+  tags: [ 'dell', 'nagios' ]
 
 - name: Install the python-requests package via pip if it s not available as package
   pip: name={{ item }} state=latest use_mirrors=no
   with_items:
     - requests
   when: requests_pkg|failed
-  tags:
-    - dell
-    - nagios
+  tags: [ 'dell', 'nagios' ]
 
 - name: Get the old libssl0.9.8_9.9.8 needed by del Dell OMSA utilities on debian 7
   get_url: url=http://ppa.research-infrastructures.eu/dell-legacy/libssl0.9.8_0.9.8o-4squeeze14_amd64.deb dest=/var/lib/libssl0.9.8_0.9.8o-4squeeze14_amd64.deb
   when: is_debian7
   register: libssl_legacy
-  tags:
-    - dell
-    - nagios
+  tags: [ 'dell', 'nagios' ]
 
 - name: Install libssl0.9.8_0.9.8o-4squeeze14_amd64.deb on debian 7
   shell: /usr/bin/dpkg -i /var/lib/libssl0.9.8_0.9.8o-4squeeze14_amd64.deb
-  when: libssl_legacy.changed
-  tags:
-    - dell
-    - nagios
+  when: ( libssl_legacy | changed )
+  tags: [ 'dell', 'nagios' ]
 
 - name: Install the Dell OMSA packages
   apt: pkg={{ item }} state=installed force=yes
   with_items:
     - syscfg
   when: is_not_debian6
-  tags:
-    - dell
-    - nagios
+  tags: [ 'dell', 'nagios' ]
 
 - name: Install the Dell OMSA packages
-  apt: pkg={{ item }} state=installed force=yes
-  with_items:
-    - srvadmin-base
-    - srvadmin-idrac
-    - srvadmin-storageservices
-  notify:
-    Start Dell OMSA
-  tags:
-    - dell
-    - nagios
+  apt: pkg={{ item }} state={{ nagios_dell_omsa_pkg_state }} force=yes
+  with_items: nagios_dell_omsa_pkgs
+  notify: Start Dell OMSA
+  tags: [ 'dell', 'nagios' ]
 
-- name: Install the check_warranty plugin for dell systems
+- name: Install some standalone plugins
   copy: src={{ item }} dest={{ nagios_isti_plugdir }}/{{ item }} owner=root group=nagios mode=0750
-  with_items:
-    - check_dell_warranty.py
-  tags:
-    - dell
-    - nagios
+  with_items: nagios_dell_standalone_checks
+  tags: [ 'dell', 'nagios' ]
 
 - name: Install a cron job that removes the leaked semaphores created by the nagios check of Dell hardware status
   copy: src={{ item }} dest=/etc/cron.daily/{{ item }} owner=root group=root mode=0555
   with_items:
     - cleanup-leaked-ipvsems.sh
-  tags:
-    - dell
-    - nagios
-
+  tags: [ 'dell', 'nagios' ]

nagios/templates/linux.dell.com.sources.list.j2

@@ -1 +1,5 @@
-deb http://linux.dell.com/repo/community/ubuntu {{ ansible_distribution_version }} openmanage
+{% if ( is_debian8 ) or ( is_debian7 ) %}
+deb http://linux.dell.com/repo/community/ubuntu wheezy openmanage
+{% else %}
+deb http://linux.dell.com/repo/community/ubuntu {{ ansible_distribution_release }} openmanage
+{% endif %}