Skip to content

Commit 9dd39a9

Browse files
Merge pull request #85 from ernestas-poskus/features/require_ansible_2_4
Require ansible 2.4
2 parents 87bbce5 + af62793 commit 9dd39a9

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Role Variables
3030

3131
```yaml
3232
---
33-
zookeeper_version: 3.4.11
33+
zookeeper_version: 3.4.12
3434
zookeeper_url: http://www.us.apache.org/dist/zookeeper/zookeeper-{{zookeeper_version}}/zookeeper-{{zookeeper_version}}.tar.gz
3535

3636
# Flag that selects if systemd or upstart will be used for the init service:

defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
zookeeper_version: 3.4.11
2+
zookeeper_version: 3.4.12
33
zookeeper_url: http://www.us.apache.org/dist/zookeeper/zookeeper-{{zookeeper_version}}/zookeeper-{{zookeeper_version}}.tar.gz
44

55
# Flag that selects if systemd or upstart will be used for the init service:

meta/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ galaxy_info:
44
description: Ansible Zookeeper Role
55
company: http://michaelhamrah.com
66
license: Apache 2
7-
min_ansible_version: 1.6
7+
min_ansible_version: 2.4
88
#
99
# Below are all platforms currently available. Just uncomment
10-
# the ones that apply to your role. If you don't see your
10+
# the ones that apply to your role. If you don't see your
1111
# platform on this list, let us know and we'll get it added!
1212
#
1313
platforms:
@@ -113,4 +113,4 @@ dependencies: []
113113
# dependencies available via galaxy should be listed here.
114114
# Be sure to remove the '[]' above if you add dependencies
115115
# to this list.
116-
116+

tasks/Debian-tarball.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
2-
- include: tarball.yml
2+
- include_tasks: tarball.yml
33

4-
- include: upstart.yml
4+
- include_tasks: upstart.yml
55
when: not zookeeper_debian_systemd_enabled
66
tags: deploy
77

8-
- include: systemd.yml
8+
- include_tasks: systemd.yml
99
when: zookeeper_debian_systemd_enabled
1010
tags: deploy

tasks/RedHat.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
with_items:
55
- libselinux-python
66

7-
- include: tarball.yml
7+
- include_tasks: tarball.yml
88

9-
- include: upstart.yml
9+
- include_tasks: upstart.yml
1010
tags: deploy
1111

12-
- include: systemd.yml
12+
- include_tasks: systemd.yml
1313
tags: deploy

tasks/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22

3-
- include: Debian.yml
3+
- include_tasks: Debian.yml
44
when: ansible_os_family == 'Debian' and zookeeper_debian_apt_install
55

6-
- include: Debian-tarball.yml
6+
- include_tasks: Debian-tarball.yml
77
when: ansible_os_family == 'Debian' and not zookeeper_debian_apt_install
88

9-
- include: RedHat.yml
9+
- include_tasks: RedHat.yml
1010
when: ansible_os_family == 'RedHat'
1111

12-
- include: common-config.yml
12+
- include_tasks: common-config.yml

tests/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
remote_user: root
6666
roles:
6767
- role: role_under_test
68-
zookeeper_version: 3.4.11
68+
zookeeper_version: 3.4.12
6969
zookeeper_dir: /opt/zookeeper-{{zookeeper_version}}
7070
zookeeper_hosts:
7171
- host: "{{zookeeper_hosts_hostname}}" # the machine running
@@ -76,7 +76,7 @@
7676
connection: local
7777
remote_user: root
7878
vars:
79-
zookeeper_version: 3.4.11
79+
zookeeper_version: 3.4.12
8080
zookeeper_dir: /opt/zookeeper-{{zookeeper_version}}
8181
zookeeper_cluster_ports: "2888:3888"
8282
tasks:

0 commit comments

Comments
 (0)