You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2016/10/01 23:46:47 UTC

[25/49] airavata git commit: Added mesos master and slave yum install ansible

Added mesos master and slave yum install ansible


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/03db1dfe
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/03db1dfe
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/03db1dfe

Branch: refs/heads/lahiru/AIRAVATA-2107
Commit: 03db1dfe3dfaf2aca18547b58cdaa82d3f3acf6c
Parents: 8868abc
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Sat Sep 10 19:15:35 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Sat Sep 10 19:15:35 2016 -0400

----------------------------------------------------------------------
 .gitignore                                     |   3 +-
 group_vars/all.yml                             |  31 ++++++
 hosts                                          |   9 +-
 roles/ec2/tasks/main.yml                       |  30 +++++
 roles/ec2/vars/aws-credential.yml              |   3 +
 roles/ec2/vars/main.yml                        |   8 ++
 roles/group_vars/all.yml                       |  13 ---
 roles/mesos-master/tasks/backup_main.yml       | 117 ++++++++++++++++++++
 roles/mesos-master/tasks/main.yml              | 101 +++++++++++++++++
 roles/mesos-master/templates/myid.j2           |   1 +
 roles/mesos-master/templates/quorum.j2         |   1 +
 roles/mesos-master/templates/zk.j2             |   1 +
 roles/mesos-master/templates/zoo.cfg.j2        |  32 ++++++
 roles/mesos-slave/tasks/main.yml               |  66 +++++++++++
 roles/mesos-slave/templates/zk.j2              |   1 +
 roles/mesos/tasks/RedHat.yml                   |  18 ---
 roles/mesos/tasks/main.yml                     |  84 --------------
 roles/test/tasks/main.yml                      |   2 +
 roles/zookeeper/handlers/main.yml              |  12 --
 roles/zookeeper/tasks/main.yml                 |  34 ------
 roles/zookeeper/templates/zoo.cfg.j2           |  28 -----
 roles/zookeeper/templates/zookeeper.service.j2 |  15 ---
 roles/zookeeper/vars/main.yml                  |  17 ---
 site.yml                                       |  10 +-
 24 files changed, 409 insertions(+), 228 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index c996e50..e1f821f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-*.key
+jetcloud.*
+shameera-*

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/group_vars/all.yml
----------------------------------------------------------------------
diff --git a/group_vars/all.yml b/group_vars/all.yml
new file mode 100644
index 0000000..b0a6cf2
--- /dev/null
+++ b/group_vars/all.yml
@@ -0,0 +1,31 @@
+---
+ansible_connection: ssh
+#ansible_ssh_user: root
+ansible_ssh_user: centos
+#ansible_ssh_private_key_file: /Users/syodage/Projects/mesos-deployment/jetcloud.key
+ansible_ssh_private_key_file: /Users/syodage/Projects/airavata-ansible/shameera-aws.pem.txt
+
+user: centos
+group: centos
+user_home: "/home/{{user}}"
+
+# Mesos related properties
+#mesos_version: "1.0.1"
+# mesos_version: "0.28.2"
+# mesos_name: "mesos"
+# mesos_url: "http://www.apache.org/dist/mesos/{{mesos_version}}/{{mesos_name}}-{{mesos_version}}.tar.gz"
+# mesos_deploy_dir: "{{user_home}}/{{mesos_name}}-{{mesos_version}}"
+# mesos_build_dir: "{{mesos_deploy_dir}}/build"
+
+
+#Zookeeper related properties
+zk_client_port: 2181
+# zookeeper_servers:
+#   - { index: 1, ip: "", ports: "2888:3888"}
+#   - { index: 2, ip: "", ports: "2888:3888"}
+#   - { index: 3, ip: "", ports: "2888:3888"}
+zk_1: "{{ groups['mesos-master'][0] }}"
+zk_2: "{{ groups['mesos-master'][1] }}"
+zk_3: "{{ groups['mesos-master'][2] }}"
+
+zk_quorum: 2

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/hosts
----------------------------------------------------------------------
diff --git a/hosts b/hosts
index 949fb79..7ceb1f7 100644
--- a/hosts
+++ b/hosts
@@ -1,8 +1,9 @@
 ---
-[localhost]
-127.0.0.1
+# inventory fie: production
+#[localhost]
+#127.0.0.1
 
 [mesos-master]
+52.91.222.138
 
-
-[mesos-agent]
+#[mesos-agent]

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/ec2/tasks/main.yml
----------------------------------------------------------------------
diff --git a/roles/ec2/tasks/main.yml b/roles/ec2/tasks/main.yml
new file mode 100644
index 0000000..7a6eb3d
--- /dev/null
+++ b/roles/ec2/tasks/main.yml
@@ -0,0 +1,30 @@
+---
+- name: include credentials
+  include_vars: vars/aws-credential.yml
+
+- name: create a aws instace/s
+  ec2:
+    key_name: "{{ key_name }}"
+    region: us-east-1
+    instance_type: t2.small
+    image: "{{centos_ami_7_2}}"
+    group: "{{ security_group }}"
+    instance_tags:
+      Name: "{{ item }}"
+    assign_public_ip: yes
+    state: present
+    count: 1
+    vpc_subnet_id: subnet-54f8f70c
+    volumes:
+      - device_name: /dev/sda1
+        volume_type: io1
+        iops: 200
+        volume_size: 50
+        delete_on_termination: true
+    wait: yes
+  with_items:
+    - Mesos-master-1
+    - Mesos-master-2
+    - Mesos-master-3
+    - Mesos-slave-1
+  register: ec2

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/ec2/vars/aws-credential.yml
----------------------------------------------------------------------
diff --git a/roles/ec2/vars/aws-credential.yml b/roles/ec2/vars/aws-credential.yml
new file mode 100644
index 0000000..687cfbb
--- /dev/null
+++ b/roles/ec2/vars/aws-credential.yml
@@ -0,0 +1,3 @@
+---
+aws_access_key: AKIAIKBSNQUKEZN2VLYA
+aws_secret_key: 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

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/ec2/vars/main.yml
----------------------------------------------------------------------
diff --git a/roles/ec2/vars/main.yml b/roles/ec2/vars/main.yml
new file mode 100644
index 0000000..1f7d77a
--- /dev/null
+++ b/roles/ec2/vars/main.yml
@@ -0,0 +1,8 @@
+---
+
+key_name: shameera
+ec2_name: Mesos28
+centos_ami_7_2: ami-6d1c2007
+ubutntu_ami_16_04: ami-29f96d3e
+
+security_group: Mesos-sec

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/group_vars/all.yml
----------------------------------------------------------------------
diff --git a/roles/group_vars/all.yml b/roles/group_vars/all.yml
deleted file mode 100644
index c041787..0000000
--- a/roles/group_vars/all.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-
-user: centos
-group: centos
-user_home: "home/{{user}}"
-
-# Mesos related properties
-mesos_dir: "{{user_home}}/mesos"
-mesos_build_dir: "{{mesos_dir}}/build"
-
-
-#Zookeeper related properties
-zookeeper_client_port: 2181

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/mesos-master/tasks/backup_main.yml
----------------------------------------------------------------------
diff --git a/roles/mesos-master/tasks/backup_main.yml b/roles/mesos-master/tasks/backup_main.yml
new file mode 100644
index 0000000..1d0abd1
--- /dev/null
+++ b/roles/mesos-master/tasks/backup_main.yml
@@ -0,0 +1,117 @@
+---
+
+- name: wait untill instance is up and running
+  local_action: wait_for port=22
+                host="{{ ansible_ssh_host | default(inventory_hostname) }}"
+                search_regex=OpenSSH delay=10
+- name: create group
+  group: name="{{group}}"
+  become: yes
+
+- name: create user
+  user: name="{{user}}"
+  become: yes
+
+# RedHat related things
+- name: install required packages
+  yum: name="{{item}}" state=latest
+  with_items:
+    - wget
+    - tar
+    - git
+    - epel-release
+    - firewalld
+  become: yes
+
+- name: updage systemd
+  yum: name=systemd state=latest
+  become: yes
+
+- name: get apache maven
+  get_url:
+    url: http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-maven.repo
+    dest: /etc/yum.repos.d/epel-apache-maven.repo
+  become: yes
+
+- name: copy svn repo file
+  copy:
+    src: wandisco-svn.repo
+    dest: /etc/yum.repos.d/wandisco-svn.repo
+  become: yes
+
+- name: install development tools
+  yum: name="@Development tools" state=present
+  become: yes
+
+#Install other Mesos dependencies.
+- name: install mesos dependencies
+  yum: name="{{item}}" state=latest
+  with_items:
+    - apache-maven
+    - python-devel
+    - java-1.8.0-openjdk-devel
+    - zlib-devel
+    - libcurl-devel
+    - openssl-devel
+    - cyrus-sasl-devel
+    - cyrus-sasl-md5
+    - apr-devel
+    - apr-util-devel
+    - subversion-devel
+  become: yes
+
+- name: start firewall service
+  service: name=firewalld state=started enabled=yes
+  become: yes
+
+- name: download and unarchive mesos latest
+  unarchive:
+      src="{{mesos_url}}"
+      dest="{{user_home}}"
+      remote_src=yes
+      copy=no
+      creates="{{mesos_deploy_dir}}/configure"
+      owner="{{user}}"
+      group="{{group}}"
+
+  # Bootstrap (Only required if building from git repository).
+  # $ ./bootstrap
+
+- name: make build dir
+  file: path="{{mesos_build_dir}}" state=directory owner={{user}} group={{group}}
+
+# - name: create simlink to configure script
+#   file: src="{{mesos_deploy_dir}}/configure"
+#         dest="{{mesos_build_dir}}/configure"
+#         state=link
+#         owner={{user}}
+#         group={{group}}
+#   tags: test
+
+- name: configure and build mesos
+  command: ../configure  chdir="{{mesos_build_dir}}"
+  register: build
+
+- name: run make
+  command: make chdir="{{mesos_build_dir}}"
+  when: build|success
+  register: make
+
+# - name: run make tests
+#   command: make check chdir="{{mesos_build_dir}}"
+#   when: make|success
+
+- name: open firewall port
+  firewalld: port=5050/tcp zone=public permanent=true state=enabled immediate=yes
+  become: yes
+
+- name: create working dir
+  file: path="{{mesos_work_dir}}" state=directory user={{user}} group={{group}}
+
+- name: start mesos master
+  command: ./bin/mesos-master.sh --ip={{inventory_hostname}} --work_dir={{mesos_work_dir}} &
+      chdir={{mesos_build_dir}}
+
+- name: start mesos agent
+  command: /bin/mesos-agent.sh --master={{inventory_hostname}}:5050 --work_dir={{mesos_work_dir}} &
+      chdir={{mesos_build_dir}}

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/mesos-master/tasks/main.yml
----------------------------------------------------------------------
diff --git a/roles/mesos-master/tasks/main.yml b/roles/mesos-master/tasks/main.yml
new file mode 100644
index 0000000..e132915
--- /dev/null
+++ b/roles/mesos-master/tasks/main.yml
@@ -0,0 +1,101 @@
+---
+# reference: https://open.mesosphere.com/getting-started/install/
+- name: install firewalld
+  yum:
+    name: firewalld
+    state: latest
+  become: yes
+
+- name: start firewalld
+  service:
+    name: firewalld
+    state: started
+    enabled: yes
+  become: yes
+
+- name: open ports
+  firewalld:
+    port: "{{ item }}"
+    zone: public
+    permanent: true
+    state: enabled
+    immediate: yes
+  with_items:
+    - "{{ zk_client_port }}/tcp"
+    - "2888/tcp"
+    - "3888/tcp"
+    - "5050/tcp"
+    # - "marathon/tcp"
+  become: yes
+
+# Setup repository
+- name: add mesosphere rpm
+  yum:
+    name: http://repos.mesosphere.com/el/7/noarch/RPMS/mesosphere-el-repo-7-1.noarch.rpm
+    state: present
+  become: yes
+
+- name: install mesos , marathon and mesosphere-zookeeper
+  yum:
+    name: "{{ item }}"
+    state: latest
+  with_items:
+    - mesos
+    - marathon
+    - mesosphere-zookeeper
+  become: yes
+
+# configurations
+#setting ID
+- name: copy myid file
+  template:
+    src: myid.j2
+    dest: /var/lib/zookeeper/myid
+    force: yes
+  become: yes
+
+- name: append zookeeper ring ips
+  template:
+    src: zoo.cfg.j2
+    dest: /etc/zookeeper/conf/zoo.cfg
+    force: yes
+  become: yes
+
+- name: start Zookeeper
+  service:
+    name: zookeeper
+    state: started
+  become: yes
+
+- name: set zk file for mesos master and marathon
+  template:
+    src: zk.j2
+    dest: /etc/mesos/zk
+    force: yes
+  become: yes
+
+- name: set zookeeper quorum
+  template:
+    src: quorum.j2
+    dest: /etc/mesos-master/quorum
+    force: yes
+  become: yes
+
+- name: stop and disable mesos slave
+  service:
+    name: mesos-slave
+    enabled: no
+    state: stopped
+  become: yes
+
+- name: restart mesos master
+  service:
+    name: mesos-master
+    state: restarted
+  become: yes
+
+- name: restart marathon
+  service:
+    name: marathon
+    state: restarted
+  become: yes

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/mesos-master/templates/myid.j2
----------------------------------------------------------------------
diff --git a/roles/mesos-master/templates/myid.j2 b/roles/mesos-master/templates/myid.j2
new file mode 100644
index 0000000..78a0bd7
--- /dev/null
+++ b/roles/mesos-master/templates/myid.j2
@@ -0,0 +1 @@
+{{ my_id }}

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/mesos-master/templates/quorum.j2
----------------------------------------------------------------------
diff --git a/roles/mesos-master/templates/quorum.j2 b/roles/mesos-master/templates/quorum.j2
new file mode 100644
index 0000000..c1d54ef
--- /dev/null
+++ b/roles/mesos-master/templates/quorum.j2
@@ -0,0 +1 @@
+{{zk_quorum}}

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/mesos-master/templates/zk.j2
----------------------------------------------------------------------
diff --git a/roles/mesos-master/templates/zk.j2 b/roles/mesos-master/templates/zk.j2
new file mode 100644
index 0000000..9c7747b
--- /dev/null
+++ b/roles/mesos-master/templates/zk.j2
@@ -0,0 +1 @@
+zk://{{zk_1}}:{{zk_client_port}},{{zk_2}}:{{zk_client_port}},{{zk_3}}:{{zk_client_port}}/mesos

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/mesos-master/templates/zoo.cfg.j2
----------------------------------------------------------------------
diff --git a/roles/mesos-master/templates/zoo.cfg.j2 b/roles/mesos-master/templates/zoo.cfg.j2
new file mode 100644
index 0000000..922d0b2
--- /dev/null
+++ b/roles/mesos-master/templates/zoo.cfg.j2
@@ -0,0 +1,32 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+maxClientCnxns=50
+# The number of milliseconds of each tick
+tickTime=2000
+# The number of ticks that the initial
+# synchronization phase can take
+initLimit=10
+# The number of ticks that can pass between
+# sending a request and getting an acknowledgement
+syncLimit=5
+# the directory where the snapshot is stored.
+dataDir=/var/lib/zookeeper
+# the port at which the clients will connect
+clientPort={{ zk_client_port }}
+
+server.1={{zk_1}}:2888:3888
+server.2={{zk_2}}:2888:3888
+server.3={{zk_3}}:2888:3888

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/mesos-slave/tasks/main.yml
----------------------------------------------------------------------
diff --git a/roles/mesos-slave/tasks/main.yml b/roles/mesos-slave/tasks/main.yml
new file mode 100644
index 0000000..f6890fe
--- /dev/null
+++ b/roles/mesos-slave/tasks/main.yml
@@ -0,0 +1,66 @@
+---
+- name: install firewalld
+  yum:
+    name: firewalld
+    state: latest
+    update_cache: yes
+  become: yes
+
+- name: start firewalld
+  service:
+    name: firewalld
+    state: started
+    enabled: yes
+  become: yes
+
+- name: open ports
+  firewalld:
+    port: "{{ item }}"
+    zone: public
+    permanent: true
+    state: enabled
+    immediate: yes
+  with_items:
+    - "5051/tcp"
+  become: yes
+
+# setup mesos slave
+- name: add mesosphere rpm
+  yum:
+    name: http://repos.mesosphere.com/el/7/noarch/RPMS/mesosphere-el-repo-7-1.noarch.rpm
+    state: present
+  become: yes
+
+- name: install mesos
+  yum:
+    name: mesos
+    state: latest
+  become: yes
+
+# zookeeper will be pulled in and isntall as a depencency automatically
+# - name: disable zookeeper
+#   service:
+#     name: mesosphere-zookeeper
+#     state: stopped
+#     enabled: no
+#   become: yes
+
+- name: set zk file for mesos master and marathon
+  template:
+    src: zk.j2
+    dest: /etc/mesos/zk
+    force: yes
+  become: yes
+
+- name: disable mesos-master
+  service:
+    name: mesos-master
+    state: stopped
+    enabled: no
+  become: yes
+
+- name: restart mesos slave
+  service:
+    name: mesos-slave
+    state: restarted
+  become: yes

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/mesos-slave/templates/zk.j2
----------------------------------------------------------------------
diff --git a/roles/mesos-slave/templates/zk.j2 b/roles/mesos-slave/templates/zk.j2
new file mode 100644
index 0000000..9c7747b
--- /dev/null
+++ b/roles/mesos-slave/templates/zk.j2
@@ -0,0 +1 @@
+zk://{{zk_1}}:{{zk_client_port}},{{zk_2}}:{{zk_client_port}},{{zk_3}}:{{zk_client_port}}/mesos

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/mesos/tasks/RedHat.yml
----------------------------------------------------------------------
diff --git a/roles/mesos/tasks/RedHat.yml b/roles/mesos/tasks/RedHat.yml
deleted file mode 100644
index 4c7ace9..0000000
--- a/roles/mesos/tasks/RedHat.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: create group
-  group: name="{{group}}"
-  become: yes
-
-- name: create user
-  user: name="{{user}}"
-  become: yes
-
-- name: install required packages
-  yum: name="{{item}}" state=latest
-  with_item:
-    - wget
-    - tar
-    - git
-    - epel-release
-    - subversion
-    - firewalld

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/mesos/tasks/main.yml
----------------------------------------------------------------------
diff --git a/roles/mesos/tasks/main.yml b/roles/mesos/tasks/main.yml
deleted file mode 100644
index f0fa90c..0000000
--- a/roles/mesos/tasks/main.yml
+++ /dev/null
@@ -1,84 +0,0 @@
----
-- name: create group
-  group: name="{{group}}"
-  become: yes
-
-- name: create user
-  user: name="{{user}}"
-  become: yes
-
-# RedHat related things
-- name: install required packages
-  yum: name="{{item}}" state=latest
-  with_items:
-    - wget
-    - tar
-    - git
-    - epel-release
-    - firewalld
-  become: yes
-
-- name: updage systemd
-  yum: name=systemd state=latest enabled=yes
-  become: yes
-
-- name: install development tools
-  yum: name="@Development tools" state=latest
-  become: yes
-
-  # Install other Mesos dependencies.
-- name: install mesos dependencies
-  yum: name="{{item}}" state=latest
-  with_items:
-    - apache-maven
-    - python-devel
-    - java-1.8.0-openjdk-devel
-    - zlib-devel
-    - libcurl-devel
-    - openssl-devel
-    - cyrus-sasl-devel
-    - cyrus-sasl-md5
-    - apr-devel
-    - apr-util-devel
-    - subversion-devel
-
-- name: start firewall service
-  service: name=firewalld state=started enabled=yes
-  become: yes
-
-- name: download and unarchive mesos latest
-  unarchive:
-      src=http://www.apache.org/dist/mesos/1.0.1/mesos-1.0.1.tar.gz
-      dest="{{mesos_dir}}"
-      owner="{{user}}"
-      group="{{group}}"
-
-  # Bootstrap (Only required if building from git repository).
-  # $ ./bootstrap
-
-- name: make build dir
-  file: path="{{mesos_dir}}/build" state=directory user={{user}} group={{group}}
-
-- name: configure and build mesos
-  command: ../configure  chdir="{{mesos_build_dir}}"
-  register: build
-
-- name: run make
-  command: make chdir="{{mesos_build_dir}}"
-  when: build|success
-  register: make
-
-- name: run make tests
-  command: make check chdir="{{mesos_build_dir}}"
-  when: make|success
-
-- name: create working dir
-  file: path="{{mesos_work_dir}}" state=directory user={{user}} group={{group}}
-
-- name: start mesos master
-  command: ./bin/mesos-master.sh --ip={{inventory_hostname}} --work_dir={{mesos_work_dir}} &
-      chdir={{mesos_build_dir}}
-
-- name: start mesos agent
-  command: /bin/mesos-agent.sh --master={{inventory_hostname}}:5050 --work_dir={{mesos_work_dir}} &
-      chdir={{mesos_build_dir}}

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/test/tasks/main.yml
----------------------------------------------------------------------
diff --git a/roles/test/tasks/main.yml b/roles/test/tasks/main.yml
index b3cb5ca..f0548b1 100644
--- a/roles/test/tasks/main.yml
+++ b/roles/test/tasks/main.yml
@@ -1 +1,3 @@
 - debug: msg="ding {{ inventory_hostname }}"
+
+- debug: msg="{{ inventory }}"

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/zookeeper/handlers/main.yml
----------------------------------------------------------------------
diff --git a/roles/zookeeper/handlers/main.yml b/roles/zookeeper/handlers/main.yml
deleted file mode 100644
index daefebe..0000000
--- a/roles/zookeeper/handlers/main.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- name: start zookeeper
-  service: name=zookeeper state=started enabled=yes
-  become: yes
-
-- name: stop zookeeper
-  service: name=zookeeper state=stopped
-  become: yes
-
-- name: restart zookeeper
-  service: name=zookeeper state=restarted enabled=yes
-  become: yes

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/zookeeper/tasks/main.yml
----------------------------------------------------------------------
diff --git a/roles/zookeeper/tasks/main.yml b/roles/zookeeper/tasks/main.yml
deleted file mode 100644
index 78bcec2..0000000
--- a/roles/zookeeper/tasks/main.yml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-################################################################################
-# Setup and run Zookeeper
-- name: Download and unarchive zookeeper
-  unarchive: src="{{ zookeeper_url }}"
-      dest="{{ user_home }}"
-      copy=no
-      owner="{{ user }}"
-      group="{{ group }}"
-
-- name: open zookeeper port
-  firewalld: port=2181/tcp zone=public permanent=true state=enabled immediate=yes
-  become: yes
-
-- name: Copy zoo.cfg file
-  template: src=zoo.cfg.j2 dest="{{ zookeeper_dir }}/conf/zoo.cfg" owner="{{ user }}" group="{{ group }}" mode="u=rw,g=r,o=r"
-  notify:
-    - restart zookeeper
-
-- name: Check if systemd exists
-  stat: path=/usr/lib/systemd/system/
-  register: systemd_check
-
-- name: Systemd script.
-  template: src=zookeeper.service.j2 dest=/usr/lib/systemd/system/zookeeper.service
-  when: systemd_check.stat.exists == true
-  notify:
-    - restart zookeeper
-  become: yes
-
-- name: reload systemd daemons
-  command: systemctl daemon-reload
-  become: yes
-...

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/zookeeper/templates/zoo.cfg.j2
----------------------------------------------------------------------
diff --git a/roles/zookeeper/templates/zoo.cfg.j2 b/roles/zookeeper/templates/zoo.cfg.j2
deleted file mode 100644
index 8426b98..0000000
--- a/roles/zookeeper/templates/zoo.cfg.j2
+++ /dev/null
@@ -1,28 +0,0 @@
-# The number of milliseconds of each tick
-tickTime={{tick_time}}
-# The number of ticks that the initial
-# synchronization phase can take
-initLimit={{init_limit}}
-# The number of ticks that can pass between
-# sending a request and getting an acknowledgement
-syncLimit={{sync_limit}}
-# the directory where the snapshot is stored.
-# do not use /tmp for storage, /tmp here is just
-# example sakes.
-dataDir={{zookeeper_data_dir}}
-# the port at which the clients will connect
-clientPort={{ client_port }}
-# the maximum number of client connections.
-# increase this if you need to handle more clients
-#maxClientCnxns=60
-#
-# Be sure to read the maintenance section of the
-# administrator guide before turning on autopurge.
-#
-# http://zookeeper.apache.org/doc/current/zookeeperAdmin.html#sc_maintenance
-#
-# The number of snapshots to retain in dataDir
-#autopurge.snapRetainCount=3
-# Purge task interval in hours
-# Set to "0" to disable auto purge feature
-#autopurge.purgeInterval=1

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/zookeeper/templates/zookeeper.service.j2
----------------------------------------------------------------------
diff --git a/roles/zookeeper/templates/zookeeper.service.j2 b/roles/zookeeper/templates/zookeeper.service.j2
deleted file mode 100644
index 19c3718..0000000
--- a/roles/zookeeper/templates/zookeeper.service.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-# {{ansible_managed}}
-
-[Unit]
-Description=ZooKeeper
-
-
-[Service]
-Type=forking
-ExecStart={{zookeeper_dir}}/bin/zkServer.sh start
-ExecStop={{ zookeeper_dir }}/bin/zkServer.sh stop
-Restart=always
-TimeoutSec=300
-
-[Install]
-WantedBy=multi-user.target

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/roles/zookeeper/vars/main.yml
----------------------------------------------------------------------
diff --git a/roles/zookeeper/vars/main.yml b/roles/zookeeper/vars/main.yml
deleted file mode 100644
index a3e10db..0000000
--- a/roles/zookeeper/vars/main.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-#Variables associated with this role
-# zookeeper related variable
-zookeeper_version: 3.4.8
-zookeeper_url: http://www.us.apache.org/dist/zookeeper/zookeeper-{{zookeeper_version}}/zookeeper-{{zookeeper_version}}.tar.gz
-
-apt_cache_timeout: 3600
-client_port: "{{ zookeeper_client_port }}" 
-init_limit: 5
-sync_limit: 2
-tick_time: 2000
-data_dir: /var/lib/zookeeper
-log_dir: /var/log/zookeeper
-zookeeper_dir: "{{ user_home }}/zookeeper-{{zookeeper_version}}"
-zookeeper_data_dir: "{{ zookeeper_dir }}/data"
-
-...

http://git-wip-us.apache.org/repos/asf/airavata/blob/03db1dfe/site.yml
----------------------------------------------------------------------
diff --git a/site.yml b/site.yml
index 2fc7293..4020f15 100644
--- a/site.yml
+++ b/site.yml
@@ -4,8 +4,14 @@
   roles:
     - test
 
-
 - hosts: mesos-master
-  tags: mesos-master
+  tags: mesos
   roles:
     - mesos
+
+- hosts: mesos-master
+  tags: mesosyum
+  roles:
+    - mesos-yum
+
+...