updating readme; reverting test directory to upstream master

Author: mhamrah

README.md

@@ -1,24 +1,26 @@
 ansible-mesos
 =============
 
-Mesos Playbook for Ansible, with multi-master zookeeper support and docker and native mesos executors configured.  Install this on Ubuntu 14.04 LTS or RHEL/Centos 6.5. RHEL/Centos 7 will fail with zookeeper issues. [Read the blog post](http://blog.michaelhamrah.com/2014/06/setting-up-a-multi-node-mesos-cluster-running-docker-haproxy-and-marathon-with-ansible/) for a descriptive overview of how this relates to running the [mhamrah/ansible-mesos-playbook](https://github.com/mhamrah/ansible-mesos-playbook).
+## Requirements
+  
+  - ansible-zookeeper, or a zookeeper server
 
-NOTE: This role requires the following roles:
+## Overview
 
-  - ansible-java, or java already installed on the host.
+The ansible-mesos role supports the installation and configuration of a mesos cluster with roles for master, slave or a master-slave configuration. 
 
-## Overview
+It optionally supports the installation of docker with slave containerizers configured for both docker and native mesos execution. 
+
+## Configuration
+
+Combined with [Ansible groups](http://docs.ansible.com/intro_inventory.html#hosts-and-groups) this role makes it easy to specify a multi-node Mesos master for high availability. There is one variable in your playbook to override:
 
-- Installs Docker
-- Works in conjuction with Ansible groups and group_vars to configure a multi-node cluster for masters and zookeeper.
-- Supports master, slave, and master-slave installations per node
-- Configures slave containerizers as docker,mesos for docker and native mesos support
-- Puts configuration in /etc/default/mesos, /etc/default/mesos-master and /etc/default/mesos-slave as per [Mesos documentation](http://mesos.apache.org/documentation/latest/configuration/).
-- Removes the default mesosphere /etc/mesos, /etc/mesos-master and /etc/mesos-slave configuration files (favors environment variables, /etc/defaults)
-- Uses upstart to launch /usr/bin/mesos-init-wrapper
+* ```zookeeper_hostnames``` specifies the list of zookeeper nodes used by Mesos for HA. By default this is the current node hostname and the default zookeeper port ```localhost:2181```. It can be constructed in your playbook by combining all nodes in your zookeeper group:
 
-See [mhamrah/ansible-mesos-playbook](https://github.com/mhamrah/ansible-mesos-playbook) for an example playbook which sets up a multi-node mesos cluster. The example also includes [Ansible-Marathon](https://github.com/mhamrah/ansible-marathon) for running applications on Mesos.
+     - { role: 'ansible-mesos', zookeeper_hostnames: "{{ groups.zookeeper_hosts | join(':' + zookeeper_client_port + ',')  }}:{{ zookeeper_client_port  }}" }
 
-## Notes
+which produces ```zookeeper1:2181,zookeeper2:2181,zookeeper3:2181```. This gets merged into the mesos_zookeeper_masters uri. 
+ 
+You may also want to specify a ```mesos_quorum``` value of ```n/2 + 1```, where n is the number of nodes, as Mesos uses a ```replicated_log``` by default.
 
-Currently defaults to Mesos 0.20.1.
+See the ```vars/main.yml``` file for specific role settings and [the Mesos configuration page for Mesos settings](http://mesos.apache.org/documentation/latest/configuration/).

Vagrantfile

@@ -5,26 +5,37 @@ Vagrant.configure("2") do |config|
   config.ssh.forward_agent = true
   config.vm.synced_folder Dir.getwd, "/home/vagrant/roles/ansible-mesos", nfs: true
 
-  # ubuntu
-  config.vm.define 'ubuntu', primary: true do |c|
+  # ubuntu 12.04 that Travis CI is using
+  config.vm.define 'travis', primary: true do |c|
     c.vm.network "private_network", ip: "192.168.100.2"
+    c.vm.box = "precise-server-cloudimg-amd64-vagrant-disk1"
+    c.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"
+    c.vm.provision "shell" do |s|
+      s.inline = "apt-get update -y; apt-get install python-software-properties; add-apt-repository ppa:rquillo/ansible; apt-get update -y; apt-get install ansible -y"
+      s.privileged = true
+    end
+  end
+
+  # ubuntu 14.04
+  config.vm.define 'ubuntu', primary: true do |c|
+    c.vm.network "private_network", ip: "192.168.100.3"
     c.vm.box = "trusty-server-cloudimg-amd64-vagrant-disk1"
-  	c.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
-  	c.vm.provision "shell" do |s|
-		  s.inline = "apt-get update -y; apt-get install ansible -y;"
-		  s.privileged = true
+    c.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
+    c.vm.provision "shell" do |s|
+      s.inline = "apt-get update -y; apt-get install python-software-properties; add-apt-repository ppa:voronov84/andreyv; apt-get update -y; apt-get install ansible -y"
+      s.privileged = true
     end
   end
 
-  # centos:
-  # config.vm.define 'centos' do |c|
-  # 	c.vm.network "private_network", ip: "192.168.100.3"
-  #   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.privileged = true
-	  # end
-  # end
+  # centos 6:
+  config.vm.define 'centos' do |c|
+    c.vm.network "private_network", ip: "192.168.100.4"
+    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 = "yum update gmp; yum install ansible -y"
+      s.privileged = true
+    end
+  end
 
 end

meta/main.yml

@@ -1,7 +1,7 @@
 ---
 galaxy_info:
   author: Jason Giedymin
-  description: Ansible NodeJS Playbook Role
+  description: Ansible Mesos Playbook Role
   company: http://jasongiedymin.com
   license: Apache 2
   min_ansible_version: 1.2

tests/inventory

@@ -1,2 +1,2 @@
-[mesos_masters]
-localhost zoo_id=1
+[localhost]
+localhost

tests/main.yml

@@ -3,17 +3,25 @@
   connection: local
   sudo: yes
   tasks:
-    # Tests
+    # Check service status for Mesos Master
     - name: Check mesos-master service
       shell: service mesos-master status | grep "running"
       register: master_service_status
       ignore_errors: yes
+
+    - name: Doing status only
+      shell: service mesos-master status
+      register: master_service_status_only
+      ignore_errors: yes
+
     - fail: msg="mesos-master service is not running."
       when: master_service_status.stdout == ""
 
+    # Check service status for Mesos Slave
     - name: Check mesos-slave service
       shell: service mesos-slave status | grep "running"
       register: slave_service_status
       ignore_errors: yes
+
     - fail: msg="mesos-slave service is not running."
       when: slave_service_status.stdout == ""

tests/packer.json

@@ -7,6 +7,6 @@
   connection: local
   sudo: yes
   roles:
-    - {role: ../../, mesos_quroum: "1", mesos_cluster_name: "test", mesos_ip: "{{ ansible_eth1.ipv4.address }}", mesos_install_mode: "master-slave"}
+    - {role: ../../, mesos_install_mode: "master-slave"}
 
 - include: main.yml

tests/playbook.yml

@@ -4,12 +4,6 @@ mesos_playbook_version: "0.3.0"
 mesos_install_mode: "master" # {master|slave|master-slave}
 mesos_version: "0.20.1"
 
-# exec info
-mesos_bin_name: mesos
-mesos_local_bin: "{{mesos_bin_name}}-local"
-mesos_master_bin: "{{mesos_bin_name}}-master"
-mesos_slave_bin: "{{mesos_bin_name}}-slave"
-
 # conf file settings
 mesos_cluster_name: "mesos_cluster"
 mesos_ip: "{{ansible_default_ipv4.address}}"
@@ -18,7 +12,8 @@ mesos_log_location: "/var/log/mesos"
 mesos_ulimit: "-n 8192"
 mesos_options: "--log_dir=$LOGS"
 mesos_work_dir: "/var/mesos"
-mesos_quorum: "2"
+mesos_quorum: "1"
+zookeeper_client_port: "2181"
 zookeeper_hostnames: "{{ mesos_hostname }}:{{ zookeeper_client_port }}"
 mesos_zookeeper_masters: "zk://{{ zookeeper_hostnames }}/mesos"