From 95a1ab01f6ec9de565dd28ad36a698c7b396523e Mon Sep 17 00:00:00 2001
From: Ben Kochie <superq@gmail.com>
Date: Mon, 1 Jul 2019 20:52:19 +0200
Subject: [PATCH] Fix deprecation warnings.

---
 tasks/main.yml       |  6 +++---
 tasks/python_sni.yml | 20 +++++++++-----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 4abb3ca..f49d6da 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,14 +1,14 @@
 ---
 
 - name: Add sni support to legacy python installations
-  include: python_sni.yml
+  include_tasks: python_sni.yml
   when:
     - ansible_os_family == 'Debian'
     - ansible_python_version is version_compare('2.6.0', '>=')
     - ansible_python_version is version_compare('2.7.9', '<')
 
-- include: install-server.yml
+- include_tasks: install-server.yml
   when: minio_install_server
 
-- include: install-client.yml
+- include_tasks: install-client.yml
   when: minio_install_client
diff --git a/tasks/python_sni.yml b/tasks/python_sni.yml
index 21e462e..c131e20 100644
--- a/tasks/python_sni.yml
+++ b/tasks/python_sni.yml
@@ -2,30 +2,28 @@
 
 - name: install python-pip and SNI support packages
   package:
-    name: "{{ item }}"
+    name:
+      - python-pip
+      - python-dev
+      - libssl-dev
+      - libffi-dev
     state: present
   register: _install_python_packages
   until: _install_python_packages is succeeded
   retries: 5
   delay: 2
-  with_items:
-    - python-pip
-    - python-dev
-    - libssl-dev
-    - libffi-dev
 
 # There extra pip dependencies are needed to add SSL SNI support to
 # Python version prior to 2.7.9. SNI support is needed by the Ansible
 # get_url module in server.yml and client.yml.
 - name: install the Python SNI python-pip dependencies.
   pip:
-    name: "{{ item }}"
+    name:
+      - pyopenssl
+      - ndg-httpsclient
+      - pyasn1
     state: present
   register: _install_pip_packages
   until: _install_pip_packages is succeeded
   retries: 5
   delay: 2
-  with_items:
-    - pyopenssl
-    - ndg-httpsclient
-    - pyasn1