zookeeper_url split into two vars, Easy to change the download address

.gitignore

@@ -53,3 +53,4 @@ coverage.xml
 # Sphinx documentation
 docs/_build/
 
+*.iml

.travis.yml

@@ -0,0 +1,68 @@
+sudo: required
+
+env:
+  matrix:
+    - distro: ernestasposkus/centos7
+      init: /usr/lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    - distro: ernestasposkus/centos6
+      init: /sbin/init
+      run_opts: ""
+    - distro: ernestasposkus/ubuntu1604
+      init: /lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    - distro: ernestasposkus/ubuntu1404
+      init: /sbin/init
+      run_opts: ""
+
+services:
+  - docker
+
+before_install:
+  # Pull container.
+  - 'sudo docker pull ${distro}:latest'
+
+script:
+  - container_id=$(mktemp)
+    # Run container in detached state.
+  - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distro}:latest "${init}" > "${container_id}"'
+
+  # Inspect docker container
+  - 'sudo docker inspect $(cat ${container_id})'
+
+  # Print ansible version
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible --version'
+
+  # Check Ansible host setup
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible all -i "localhost," -c local -m setup'
+
+  # Install dependencies
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-galaxy install geerlingguy.java'
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/dependencies.yml'
+
+  # Ansible syntax check.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/playbook.yml --syntax-check'
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/playbook.yml'
+
+  # Test role idempotence.
+  - idempotence=$(mktemp)
+  - sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/playbook.yml | tee -a ${idempotence}
+  - >
+    tail ${idempotence}
+    | grep -q 'changed=0.*failed=0'
+    && (echo 'Idempotence test: pass' && exit 0)
+    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Test role.
+  - 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml'
+
+  # View container logs
+  - 'sudo docker logs "$(cat ${container_id})"'
+
+  # Clean up.
+  - 'sudo docker stop "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/

README.md

@@ -1,23 +1,175 @@
 ansible-zookeeper
 =================
 
+[![Build Status](https://travis-ci.org/AnsibleShipyard/ansible-zookeeper.svg?branch=master)](https://travis-ci.org/AnsibleShipyard/ansible-zookeeper)
+
 ZooKeeper playbook for Ansible
 
-Support open source!
+Installation
+-----------
+
+```bash
+ansible-galaxy install AnsibleShipyard.ansible-zookeeper
+```
+
+Dependencies
+------------
+
+Java
+
+ - https://github.com/AnsibleShipyard/ansible-java
+ - https://github.com/geerlingguy/ansible-role-java
+
+Requirements
+------------
+
+Ansible version at least 1.6
+
+Role Variables
+--------------
+
+```yaml
+---
+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:
+# Note: by default Ubuntu 15.04 and later use systemd (but support switch to upstart)
+zookeeper_debian_systemd_enabled: "{{ ansible_distribution_version|version_compare(15.04, '>=') }}"
+zookeeper_debian_apt_install: false
+# (Optional:) add custom 'ppa' repositories depending on the distro version (only with debian_apt_install=true)
+# Example: to use a community zookeeper v3.4.8 deb pkg for Ubuntu 14.04 (where latest official is v3.4.5)
+zookeeper_debian_apt_repositories:
+  - repository_url: "ppa:ufscar/zookeeper"
+    distro_version: "14.04"
+
+apt_cache_timeout: 3600
+zookeeper_register_path_env: false
+
+client_port: 2181
+init_limit: 5
+sync_limit: 2
+tick_time: 2000
+zookeeper_autopurge_purgeInterval: 0
+zookeeper_autopurge_snapRetainCount: 10
+zookeeper_cluster_ports: "2888:3888"
+zookeeper_max_client_connections: 60
+
+data_dir: /var/lib/zookeeper
+log_dir: /var/log/zookeeper
+zookeeper_dir: /opt/zookeeper-{{zookeeper_version}} # or /usr/share/zookeeper when zookeeper_debian_apt_install is true
+zookeeper_conf_dir: {{zookeeper_dir}} # or /etc/zookeeper when zookeeper_debian_apt_install is true
+zookeeper_tarball_dir: /opt/src
+
+zookeeper_hosts_hostname: "{{inventory_hostname}}"
+# List of dict (i.e. {zookeeper_hosts:[{host:,id:},{host:,id:},...]})
+zookeeper_hosts:
+  - host: "{{zookeeper_hosts_hostname}}" # the machine running
+    id: 1
+
+# Dict of ENV settings to be written into the (optional) conf/zookeeper-env.sh
+zookeeper_env: {}
+
+# Controls Zookeeper myid generation
+zookeeper_force_myid: yes
+```
+
+Example Playbook
+----------------
 
-NOTE: This role requires the following roles:
-  - ansible-java
+```yaml
+- name: Installing ZooKeeper
+  hosts: all
+  sudo: yes
+  roles:
+    - role: AnsibleShipyard.ansible-zookeeper
+```
 
-## How to use this playbook?
+Example Retrieving Tarball From S3
+----------------------------------
+
+```yaml
+- name: Installing ZooKeeper
+  hosts: all
+  sudo: yes
+  vars:
+    zookeeper_archive_s3_bucket: my-s3-bucket
+    zookeeper_archive_s3_object: my/s3/directory/zookeeper-{{zookeeper_version}}.tar.gz
+  roles:
+    - role: AnsibleShipyard.ansible-zookeeper
+```
+
+Cluster Example
+----------------
+
+```yaml
+- name: Zookeeper cluster setup
+  hosts: zookeepers
+  sudo: yes
+  roles:
+    - role: AnsibleShipyard.ansible-zookeeper
+      zookeeper_hosts: "{{groups['zookeepers']}}"
+```
+
+Assuming ```zookeepers``` is a [hosts group](http://docs.ansible.com/ansible/intro_inventory.html#group-variables) defined in inventory file.
+
+```inventory
+[zookeepers]
+server[1:3]
+```
+
+Custom IP per host group
+
+```
+zookeeper_hosts: "
+    {%- set ips = [] %}
+    {%- for host in groups['zookeepers'] %}
+    {{- ips.append(dict(id=loop.index, host=host, ip=hostvars[host]['ansible_default_ipv4'].address)) }}
+    {%- endfor %}
+    {{- ips -}}"
+```
 
 See this sample [playbook](https://github.com/AnsibleShipyard/ansible-galaxy-roles/blob/master/playbook.yml)
 which shows how to use this playbook as well as others. It is part of [ansible-galaxy-roles](https://github.com/AnsibleShipyard/ansible-galaxy-roles) and
 serves as a curation (and thus an example) of all our ansible playbooks.
 
-## Our Other Mesos related playbooks
+License
+-------
+
+The MIT License (MIT)
+
+Copyright (c) 2014 Kien Pham
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+AnsibleShipyard
+-------
+
+Our related playbooks
 
 1. [ansible-mesos](https://github.com/AnsibleShipyard/ansible-mesos)
 1. [ansible-marathon](https://github.com/AnsibleShipyard/ansible-marathon)
 1. [ansible-chronos](https://github.com/AnsibleShipyard/ansible-chronos)
-1. [ansible-mesos-docker](https://github.com/AnsibleShipyard/ansible-mesos-docker)
-1. [ansible-zookeeper](https://github.com/AnsibleShipyard/ansible-zookeeper)
+1. [ansible-zookeeper](https://github.com/AnsibleShipyard/ansible-zookeeper)
+
+Author Information
+------------------
+
+@AnsibleShipyard/developers and others.

Vagrantfile

@@ -22,7 +22,17 @@ Vagrant.configure("2") do |config|
     c.vm.box = "centos65-x86_64-20140116"
   	c.vm.box_url = "https://github.com/2creatives/vagrant-centos/releases/download/v6.5.3/centos65-x86_64-20140116.box"
   	c.vm.provision "shell" do |s|
-      s.inline = "/bin/true"
+      s.inline = "yum install -y nc java-1.7.0-openjdk-devel ansible"
+		  s.privileged = true
+	  end
+  end
+
+  # centos 7
+  config.vm.define 'centos7' do |c|
+  	c.vm.network "private_network", ip: "192.168.100.4"
+    c.vm.box = "centos/7"
+  	c.vm.provision "shell" do |s|
+      s.inline = "yum install -y epel-release; yum install -y nc java-1.7.0-openjdk-devel ansible"
 		  s.privileged = true
 	  end
   end

build.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+
+DOCKERNAME="ansibleshipyard/ansible-zookeeper"
+DOCKER_DIR="dockerfiles"
+# TAGS=(ubuntu centos)
+TAGS=(ubuntu)
+CONTEXT=.
+
+usage() {
+  local tag=$1
+
+  echo
+  echo "To pull it"
+  echo "    docker pull $DOCKERNAME:$tag"
+  echo
+  echo "To use this docker:"
+  echo "    docker run -d -P $DOCKERNAME:$tag"
+  echo
+  echo "To run in interactive mode for debug:"
+  echo "    docker run -t -i $DOCKERNAME:$tag bash"
+  echo
+}
+
+build() {
+  local tag=$1
+
+  # pushd $tag
+
+  # Builds the image
+  cmd="docker build -f $DOCKER_DIR/$tag/Dockerfile --force-rm -t $DOCKERNAME:$tag $CONTEXT"
+
+  echo "Command to execute: [$cmd]"
+
+  $cmd
+
+  if [ $? == 0 ]; then
+    echo "$tag build successful!"
+    usage $tag
+    return 0
+  else
+    return 1
+  fi;
+}
+
+main() {
+  # pushd $DOCKER_DIR
+  for tag in ${TAGS[@]}; do
+    build ${tag}
+    if [ $? != 0 ]; then
+      echo "$tag build failed!"
+    fi;
+  done
+}
+
+main

defaults/main.yml

@@ -1,11 +1,45 @@
 ---
-zookeeper_playbook_version: "0.0.1"
-zookeeper_version: 3.4.6
+zookeeper_version: 3.4.12
 zookeeper_url: http://www.us.apache.org/dist/zookeeper/zookeeper-{{zookeeper_version}}/zookeeper-{{zookeeper_version}}.tar.gz
-zookeeper_dir: /opt/zookeeper-{{zookeeper_version}}
-zookeeper_data: /var/lib/zookeeper
-zookeeper_logs: /var/log/zookeeper
 
-zookeeper_myid: 1
-zookeeper_servers:
-  - { id: 1, host: localhost }
+# Flag that selects if systemd or upstart will be used for the init service:
+# Note: by default Ubuntu 15.04 and later use systemd (but support switch to upstart)
+_ubuntu_1504: "{{ ansible_distribution == 'Ubuntu' and ansible_distribution_version|version_compare(15.04, '>=') }}"
+_debian_8: "{{ ansible_distribution == 'Debian' and ansible_distribution_version|version_compare(8.0, '>=') }}"
+zookeeper_debian_systemd_enabled: "{{ _ubuntu_1504 or _debian_8 }}"
+
+zookeeper_debian_apt_install: false
+zookeeper_debian_apt_repositories: []
+apt_cache_timeout: 3600
+zookeeper_register_path_env: false
+
+client_port: 2181
+init_limit: 5
+sync_limit: 2
+tick_time: 2000
+zookeeper_autopurge_purgeInterval: 0
+zookeeper_autopurge_snapRetainCount: 10
+zookeeper_cluster_ports: "2888:3888"
+zookeeper_max_client_connections: 60
+
+data_dir: /var/lib/zookeeper
+log_dir: /var/log/zookeeper
+zookeeper_dir: "{{ zookeeper_debian_apt_install | ternary('/usr/share/zookeeper', '/opt/zookeeper-' + zookeeper_version) }}"
+zookeeper_conf_dir: "{{ zookeeper_debian_apt_install | ternary('/etc/zookeeper', zookeeper_dir) }}"
+zookeeper_tarball_dir: /opt/src
+
+# Rolling file appender setttings
+zookeeper_rolling_log_file_max_size: 10MB
+zookeeper_max_rolling_log_file_count: 10
+
+zookeeper_hosts_hostname: "{{inventory_hostname}}"
+# List of dict (i.e. {zookeeper_hosts:[{host:,id:},{host:,id:},...]})
+zookeeper_hosts:
+  - host: "{{zookeeper_hosts_hostname}}" # the machine running
+    id: 1
+
+# Dict of ENV settings to be written into the (optional) conf/zookeeper-env.sh
+zookeeper_env: {}
+
+# Controls Zookeeper myid generation
+zookeeper_force_myid: yes

handlers/main.yml

@@ -1,3 +1,7 @@
 ---
+- name: Reload systemctl daemon
+  command: systemctl daemon-reload
+  when: ansible_service_mgr == 'systemd'
+
 - name: Restart zookeeper
-  service: name=zookeeper state=restarted enabled=yes
+  service: name=zookeeper state=restarted