updates for ansible 2.6 and ubuntu 18.04

dhellmann · dhellmann · commit a9c08d70860b · 2018-11-07T13:46:21.000-05:00
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,17 +1,20 @@
 ---
 - name: Install tools for adding PPA repositories
   become: true
-  apt: name='{{ item }}' state=latest
-  with_items:
-    - python-software-properties
-    - software-properties-common
+  apt:
+    name: software-properties-common
+    state: latest
 
 - name: Install Python dependencies
   become: true
-  apt: name='{{ item }}' state=latest update_cache=true
-  with_items:
-    - libffi-dev
-    - gcc
+  apt:
+    name:
+      - libffi-dev
+      - gcc
+      - openssl
+      - libssl-dev
+    state: latest
+    update_cache: true
 
 - include: deadsnakes.yml
 - include: pypy.yml
@@ -52,13 +55,6 @@
   template: src=pip.conf
             dest={{ansible_env.HOME}}/.pip/pip.conf
 
-- name: Install OpenSSL
-  become: true
-  apt: name='{{item}}'
-  with_items:
-    - openssl
-    - libssl-dev
-
 - name: Install pip tools
   pip: name='{{ item[1] }}' executable=pip{{item[0].version}}
   become: true
diff --git a/tasks/pypy.yml b/tasks/pypy.yml
@@ -4,10 +4,11 @@
   apt_repository: repo=ppa:pypy/ppa state=present
   when: python_dev_install_pypy
 - name: Install PyPy
-  apt: name={{ item }} state=latest
+  apt:
+    name:
+      - pypy
+      - pypy-dev
+      - python-cffi
+    state: latest
   become: true
-  with_items:
-    - pypy
-    - pypy-dev
-    - python-cffi
   when: python_dev_install_pypy
