From ac1209cd67ad8b6f992f9e8f2752b5f6329198d2 Mon Sep 17 00:00:00 2001
From: Benoit Carriere <bcarriere@expedia.com>
Date: Sat, 12 Dec 2015 15:38:12 -0500
Subject: [PATCH] Ansible 2.0 compatibility

---
 defaults/main.yml | 20 ++++++++++++++++++++
 tasks/Debian.yml  | 14 ++------------
 tasks/RedHat.yml  | 10 ++--------
 vars/main.yml     |  2 +-
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 3d01417..4e9c884 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -7,3 +7,23 @@ python_base_url: http://www.python.org/ftp/python
 python_package_url: "{{ python_base_url }}/{{ python_version }}/{{ python_file_name }}"
 python_path: /usr/local
 
+python_apt_packages:
+  - build-essential
+  - libreadline-gplv2-dev
+  - libncursesw5-dev
+  - libssl-dev
+  - libsqlite3-dev
+  - tk-dev
+  - libgdbm-dev
+  - libc6-dev
+  - libbz2-dev
+  - wget
+
+python_yum_packages:
+ - "'@Development tools'"
+ - zlib-devel
+ - bzip2-devel 
+ - openssl-devel 
+ - ncurses-devel 
+ - sqlite-devel
+
diff --git a/tasks/Debian.yml b/tasks/Debian.yml
index ff755f5..7922353 100644
--- a/tasks/Debian.yml
+++ b/tasks/Debian.yml
@@ -1,14 +1,4 @@
 ---
 - name: Install os packages
-  apt: pkg={{item}} state=present update_cache=yes
-  with_items: 
-    - build-essential
-    - libreadline-gplv2-dev
-    - libncursesw5-dev
-    - libssl-dev
-    - libsqlite3-dev
-    - tk-dev
-    - libgdbm-dev
-    - libc6-dev
-    - libbz2-dev
-    - wget
+  apt: pkg={{ item }} state=present update_cache=yes
+  with_items: python_apt_packages
diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml
index 2fcded2..3e96e3b 100644
--- a/tasks/RedHat.yml
+++ b/tasks/RedHat.yml
@@ -1,11 +1,5 @@
 ---
 - name: Install os packages
-  yum: name={{ [
-    '"@Development tools"', 
-    'zlib-devel', 
-    'bzip2-devel', 
-    'openssl-devel', 
-    'ncurses-devel', 
-    'sqlite-devel'
-    ] | join(',') }} state=present
+  yum: name={{ item }} state=present
+  with_items: python_yum_packages
 
diff --git a/vars/main.yml b/vars/main.yml
index e99d0c8..07e212e 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,2 @@
 ---
-python_playbook_version: "0.2.0"
+python_playbook_version: "0.2.1"