From 72882b275c4084c417d96ce2fd544ce9b5a14e1f Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@isti.cnr.it>
Date: Wed, 25 Jul 2018 12:23:50 +0200
Subject: [PATCH] Add the role that fixes pip on Trusty as dependency of
 ubuntu-deb-general

---
 deb-apt-setup/tasks/main.yml     | 16 ++++------------
 ubuntu-deb-general/meta/main.yml |  1 +
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/deb-apt-setup/tasks/main.yml b/deb-apt-setup/tasks/main.yml
index 885774fd..599d6e9c 100644
--- a/deb-apt-setup/tasks/main.yml
+++ b/deb-apt-setup/tasks/main.yml
@@ -1,18 +1,10 @@
 ---
 # First things first: install the basic requirements with a raw command
-- name: install python-apt
+- name: Install python 2 and python-apt
   raw: "apt-get update; apt-get install -y python python-apt lsb-release"
-  tags:
-    - pythonapt
+  tags: [ 'python', 'ansible_setup' ]
 
 - name: Install python-software-properties
-  apt: pkg=python-software-properties state=installed
-  tags:
-    - pythonapt
-
-- name: Install software-properties-common on quantal distributions
-  apt: pkg=software-properties-common state=installed
-  when: is_quantal
-  tags:
-    - pythonapt
+  apt: pkg=python-software-properties state=present update_cache=yes cache_valid_time=3600
+  tags: pythonapt
 
diff --git a/ubuntu-deb-general/meta/main.yml b/ubuntu-deb-general/meta/main.yml
index d306f273..efc43e15 100644
--- a/ubuntu-deb-general/meta/main.yml
+++ b/ubuntu-deb-general/meta/main.yml
@@ -1,6 +1,7 @@
 ---
 dependencies:
   - role: '../../library/roles/deb-apt-setup'
+  - role: '../../library/roles/ubuntu-python-setup'
   - role: '../../library/roles/deb-set-hostname'
   - role: '../../library/roles/deb-set-locale'
   - role: '../../library/roles/timezone'