From 879429175e9380942c05a9a771253e6771ebbf1c Mon Sep 17 00:00:00 2001
From: Ernestas Poskus <ernestas.poskus@gmail.com>
Date: Sat, 5 May 2018 10:50:33 +0300
Subject: [PATCH 1/2] Require ansible 2.4

---
 meta/main.yml            | 6 +++---
 tasks/Debian-tarball.yml | 6 +++---
 tasks/RedHat.yml         | 6 +++---
 tasks/main.yml           | 8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/meta/main.yml b/meta/main.yml
index 33cc2d0..6d35903 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -4,10 +4,10 @@ galaxy_info:
   description: Ansible Zookeeper Role
   company: http://michaelhamrah.com
   license: Apache 2
-  min_ansible_version: 1.6
+  min_ansible_version: 2.4
   #
   # Below are all platforms currently available. Just uncomment
-  # the ones that apply to your role. If you don't see your 
+  # the ones that apply to your role. If you don't see your
   # platform on this list, let us know and we'll get it added!
   #
   platforms:
@@ -113,4 +113,4 @@ dependencies: []
   # dependencies available via galaxy should be listed here.
   # Be sure to remove the '[]' above if you add dependencies
   # to this list.
-  
+
diff --git a/tasks/Debian-tarball.yml b/tasks/Debian-tarball.yml
index c36a2eb..c9c1c49 100644
--- a/tasks/Debian-tarball.yml
+++ b/tasks/Debian-tarball.yml
@@ -1,10 +1,10 @@
 ---
-- include: tarball.yml
+- include_tasks: tarball.yml
 
-- include: upstart.yml
+- include_tasks: upstart.yml
   when: not zookeeper_debian_systemd_enabled
   tags: deploy
 
-- include: systemd.yml
+- include_tasks: systemd.yml
   when: zookeeper_debian_systemd_enabled
   tags: deploy
diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml
index 55a9e37..37de821 100644
--- a/tasks/RedHat.yml
+++ b/tasks/RedHat.yml
@@ -4,10 +4,10 @@
   with_items:
     - libselinux-python
 
-- include: tarball.yml
+- include_tasks: tarball.yml
 
-- include: upstart.yml
+- include_tasks: upstart.yml
   tags: deploy
 
-- include: systemd.yml
+- include_tasks: systemd.yml
   tags: deploy
diff --git a/tasks/main.yml b/tasks/main.yml
index 7e15ed0..c347376 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,12 +1,12 @@
 ---
 
-- include: Debian.yml
+- include_tasks: Debian.yml
   when: ansible_os_family == 'Debian' and zookeeper_debian_apt_install
 
-- include: Debian-tarball.yml
+- include_tasks: Debian-tarball.yml
   when: ansible_os_family == 'Debian' and not zookeeper_debian_apt_install
 
-- include: RedHat.yml
+- include_tasks: RedHat.yml
   when: ansible_os_family == 'RedHat'
 
-- include: common-config.yml
+- include_tasks: common-config.yml

From af627934d69d1e7bc1fa3c25b4ad1c11b397ce05 Mon Sep 17 00:00:00 2001
From: Ernestas Poskus <ernestas.poskus@gmail.com>
Date: Sun, 6 May 2018 17:55:18 +0300
Subject: [PATCH 2/2] Bump Zookeeper to 3.14.12

---
 README.md         | 2 +-
 defaults/main.yml | 2 +-
 tests/test.yml    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 202c824..b2cc09e 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Role Variables
 
 ```yaml
 ---
-zookeeper_version: 3.4.11
+zookeeper_version: 3.4.12
 zookeeper_url: http://www.us.apache.org/dist/zookeeper/zookeeper-{{zookeeper_version}}/zookeeper-{{zookeeper_version}}.tar.gz
 
 # Flag that selects if systemd or upstart will be used for the init service:
diff --git a/defaults/main.yml b/defaults/main.yml
index b8feb26..77a98c0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-zookeeper_version: 3.4.11
+zookeeper_version: 3.4.12
 zookeeper_url: http://www.us.apache.org/dist/zookeeper/zookeeper-{{zookeeper_version}}/zookeeper-{{zookeeper_version}}.tar.gz
 
 # Flag that selects if systemd or upstart will be used for the init service:
diff --git a/tests/test.yml b/tests/test.yml
index fec48c8..8950f1a 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -65,7 +65,7 @@
   remote_user: root
   roles:
     - role: role_under_test
-      zookeeper_version: 3.4.11
+      zookeeper_version: 3.4.12
       zookeeper_dir: /opt/zookeeper-{{zookeeper_version}}
       zookeeper_hosts:
         - host: "{{zookeeper_hosts_hostname}}" # the machine running
@@ -76,7 +76,7 @@
   connection: local
   remote_user: root
   vars:
-    zookeeper_version: 3.4.11
+    zookeeper_version: 3.4.12
     zookeeper_dir: /opt/zookeeper-{{zookeeper_version}}
     zookeeper_cluster_ports: "2888:3888"
   tasks: