From ab3d32a54dfe9f3f5ccbfa12d0cbf709c192dfa1 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@isti.cnr.it>
Date: Fri, 21 Jul 2017 11:08:34 +0200
Subject: [PATCH] The infrascience ppa repository is now optional and disabled
 by default.

---
 ubuntu-deb-general/defaults/main.yml  | 3 +++
 ubuntu-deb-general/tasks/packages.yml | 9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ubuntu-deb-general/defaults/main.yml b/ubuntu-deb-general/defaults/main.yml
index 0e1afd4..3f87b17 100644
--- a/ubuntu-deb-general/defaults/main.yml
+++ b/ubuntu-deb-general/defaults/main.yml
@@ -121,6 +121,9 @@ default_security_limits:
 #   - ':msg, contains, "icmp6_send: no reply to icmp error" ~'
 #   - ':msg, contains, "[PYTHON] Can\'t call the metric handler function for" ~'
 
+#
+infrascience_internal_ppa: False
+
 #
 # debian/ubuntu distributions controllers
 #
diff --git a/ubuntu-deb-general/tasks/packages.yml b/ubuntu-deb-general/tasks/packages.yml
index 79dd5ad..a0b129d 100644
--- a/ubuntu-deb-general/tasks/packages.yml
+++ b/ubuntu-deb-general/tasks/packages.yml
@@ -47,6 +47,7 @@
   when:
     - is_ubuntu
     - egi_image is not defined or not egi_image
+    - infrascience_internal_ppa
   ignore_errors: True
   tags: packages
 
@@ -58,7 +59,9 @@
 
 - name: setup system apt repository
   apt_repository: repo='deb [arch=amd64] http://ppa.research-infrastructures.eu/system stable main' update_cache=yes
-  when: is_ubuntu
+  when:
+    - is_ubuntu
+    - infrascience_internal_ppa
   ignore_errors: True
   tags: packages
 
@@ -70,7 +73,9 @@
 
 - name: setup system apt repository for specific distributions
   apt_repository: repo='deb [arch=amd64] http://ppa.research-infrastructures.eu/system {{ ansible_distribution_release }} main' update_cache=yes
-  when: is_trusty
+  when:
+    - is_trusty
+    - infrascience_internal_ppa
   ignore_errors: True
   tags: packages