From 4f7b3007293b7e02f4930a082332309e5cd7f7b8 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@sevenseas.org>
Date: Sun, 8 Nov 2015 21:56:27 +0100
Subject: [PATCH] library/roles/ubuntu-deb-general: Some fixes. xen/hosts:
 Remove dlib0x. san: Fixes.

---
 nagios/tasks/dell-omsa.yml                        | 10 +---------
 ubuntu-deb-general/tasks/packages.yml             |  9 ++-------
 ubuntu-deb-general/tasks/remove-unneeded-pkgs.yml |  5 +----
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/nagios/tasks/dell-omsa.yml b/nagios/tasks/dell-omsa.yml
index 8dddf23f..893b0d77 100644
--- a/nagios/tasks/dell-omsa.yml
+++ b/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
diff --git a/ubuntu-deb-general/tasks/packages.yml b/ubuntu-deb-general/tasks/packages.yml
index 9dbc4780..78d8236f 100644
--- a/ubuntu-deb-general/tasks/packages.yml
+++ b/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
 
diff --git a/ubuntu-deb-general/tasks/remove-unneeded-pkgs.yml b/ubuntu-deb-general/tasks/remove-unneeded-pkgs.yml
index f2a3a6ea..d90e6f18 100644
--- a/ubuntu-deb-general/tasks/remove-unneeded-pkgs.yml
+++ b/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