library/roles/ubuntu-deb-general: Some fixes.

xen/hosts: Remove dlib0x.
san: Fixes.

nagios/tasks/dell-omsa.yml

@@ -33,17 +33,10 @@
   template: src={{ item }}.j2 dest=/etc/apt/sources.list.d/{{ item }}
   with_items:
     - linux.dell.com.sources.list
-  when: is_not_debian6
-  register: update_apt_cache
-  tags: [ 'dell', 'nagios' ]
-
-- name: Update apt cache
-  apt: update_cache=yes
-  when: ( update_apt_cache | changed )
   tags: [ 'dell', 'nagios' ]
 
 - name: Install the Dell OMSA packages dependencies
-  apt: pkg={{ item }} state=installed
+  apt: pkg={{ item }} state=installed force=yes update_cache=yes
   with_items: nagios_dell_omsa_deps
   tags: [ 'dell', 'nagios' ]
 
@@ -84,7 +77,6 @@
   apt: pkg={{ item }} state={{ nagios_dell_omsa_pkg_state }} force=yes
   with_items:
     - syscfg
-  when: is_not_debian6
   tags: [ 'dell', 'nagios' ]
 
 - name: Install the Dell OMSA packages

ubuntu-deb-general/tasks/packages.yml

@@ -65,17 +65,12 @@
 - name: apt key for the internal ppa repository
   apt_key: url=http://ppa.research-infrastructures.eu/system/keys/system-archive.asc state=present
   when: is_ubuntu
+  ignore_errors: True
   tags: packages
 
 - name: setup system apt repository
-  apt_repository: repo='deb http://ppa.research-infrastructures.eu/system stable main'
-  register: update_apt_cache
+  apt_repository: repo='deb http://ppa.research-infrastructures.eu/system stable main' update_cache=yes
   when: is_ubuntu
-  tags: packages
-
-- name: Update the apt cache
-  apt: update_cache=yes
-  when: update_apt_cache.changed
   ignore_errors: True
   tags: packages
 

ubuntu-deb-general/tasks/remove-unneeded-pkgs.yml

@@ -29,11 +29,8 @@
   apt: pkg={{ item }} state=removed
   with_items: rpcbind_packages
   when:
-    - "({{ is_precise }}) or ({{ is_debian7 }})"
     - cleanup_rpcbind_packages
-  tags:
-    - packages
-    - pkg_cleanup
+  tags: [ 'packages', 'pkg_cleanup' ]
 
 - name: Remove the exim packages
   apt: name={{ item }} state=removed