You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ce...@apache.org on 2016/02/22 18:37:13 UTC
[2/7] incubator-metron git commit: METRON-39 Replay PCAP Data closes apache/incubator-metron#25

METRON-39 Replay PCAP Data closes apache/incubator-metron#25


Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/a837619c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/a837619c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/a837619c

Branch: refs/heads/Metron_0.1BETA
Commit: a837619c107d28d5066d99f843444c560831d45c
Parents: 5ceee2a
Author: nickwallen <ni...@gmail.com>
Authored: Fri Feb 19 14:14:59 2016 -0500
Committer: cstella <ce...@gmail.com>
Committed: Fri Feb 19 14:14:59 2016 -0500

----------------------------------------------------------------------
 bro-plugin-kafka/Makefile                       |   1 +
 bro-plugin-kafka/cmake/FindLibRDKafka.cmake     |  16 ++
 bro-plugin-kafka/configure                      |   4 +-
 bro-plugin-kafka/configure.plugin               |  15 ++
 .../scripts/Metron/Kafka/__load__.bro           |  17 +++
 .../scripts/Metron/Kafka/logs-to-kafka.bro      |  30 +++-
 bro-plugin-kafka/scripts/__load__.bro           |  22 ++-
 bro-plugin-kafka/tests/Makefile                 |  16 ++
 bro-plugin-kafka/tests/Scripts/get-bro-env      |  19 ++-
 .../inventory/metron_example/group_vars/all     |  50 +++----
 .../inventory/singlenode-vagrant/group_vars/all |  52 +++----
 deployment/playbooks/ambari_install.yml         |  18 ++-
 deployment/playbooks/metron_full_install.yml    |  18 ++-
 deployment/playbooks/metron_install.yml         |  19 ++-
 .../roles/ambari_common/defaults/main.yml       |   2 -
 .../roles/ambari_common/handlers/main.yml       |   2 -
 deployment/roles/ambari_common/meta/main.yml    | 139 ------------------
 deployment/roles/ambari_common/tasks/main.yml   |  16 ++
 .../ambari_common/tasks/passwd_less_ssh.yml     |  16 ++
 deployment/roles/ambari_common/vars/main.yml    |  16 ++
 .../roles/ambari_config/defaults/main.yml       |   2 -
 .../roles/ambari_config/handlers/main.yml       |   2 -
 deployment/roles/ambari_config/meta/main.yml    | 139 ------------------
 deployment/roles/ambari_config/tasks/main.yml   |  18 ++-
 deployment/roles/ambari_config/vars/main.yml    |  18 ++-
 .../roles/ambari_config/vars/single_node_vm.yml |  18 ++-
 .../roles/ambari_config/vars/small_cluster.yml  |  18 ++-
 .../roles/ambari_gather_facts/defaults/main.yml |   2 -
 .../roles/ambari_gather_facts/handlers/main.yml |   2 -
 .../roles/ambari_gather_facts/meta/main.yml     | 139 ------------------
 .../roles/ambari_gather_facts/tasks/main.yml    |  20 ++-
 .../roles/ambari_gather_facts/vars/main.yml     |   2 -
 .../roles/ambari_master/defaults/main.yml       |   2 -
 .../roles/ambari_master/handlers/main.yml       |   2 -
 deployment/roles/ambari_master/meta/main.yml    | 139 ------------------
 deployment/roles/ambari_master/tasks/main.yml   |  18 ++-
 deployment/roles/ambari_master/vars/main.yml    |   2 -
 deployment/roles/ambari_slave/defaults/main.yml |   2 -
 deployment/roles/ambari_slave/handlers/main.yml |   2 -
 deployment/roles/ambari_slave/meta/main.yml     | 139 ------------------
 deployment/roles/ambari_slave/tasks/main.yml    |  16 ++
 deployment/roles/ambari_slave/vars/main.yml     |  18 ++-
 deployment/roles/ansible-hdp-kafka/README.md    |  50 -------
 .../roles/ansible-hdp-kafka/defaults/main.yml   |   2 -
 .../roles/ansible-hdp-kafka/handlers/main.yml   |   2 -
 .../ansible-hdp-kafka/meta/.galaxy_install_info |   1 -
 .../roles/ansible-hdp-kafka/meta/main.yml       | 147 -------------------
 .../roles/ansible-hdp-kafka/tasks/main.yml      |  22 ---
 .../roles/ansible-hdp-kafka/vars/main.yml       |   2 -
 deployment/roles/bro/tasks/bro-plugin-kafka.yml |  16 ++
 deployment/roles/bro/tasks/bro.yml              |  22 +++
 deployment/roles/bro/tasks/librdkafka.yml       |  16 ++
 deployment/roles/bro/tasks/main.yml             |  19 +++
 deployment/roles/bro/vars/main.yml              |  22 ++-
 .../roles/elasticsearch/defaults/main.yml       |   2 -
 .../roles/elasticsearch/handlers/main.yml       |  16 ++
 deployment/roles/elasticsearch/meta/main.yml    | 139 ------------------
 deployment/roles/elasticsearch/tasks/main.yml   |  22 ++-
 deployment/roles/elasticsearch/vars/main.yml    |   3 -
 deployment/roles/flume/files/flume-ipfix.conf   |  27 ----
 deployment/roles/flume/tasks/main.yml           |  19 ++-
 deployment/roles/flume/vars/main.yml            |  16 ++
 deployment/roles/hadoop_setup/defaults/main.yml |   2 -
 deployment/roles/hadoop_setup/handlers/main.yml |   2 -
 deployment/roles/hadoop_setup/meta/main.yml     | 139 ------------------
 deployment/roles/hadoop_setup/tasks/main.yml    |  19 +++
 deployment/roles/hadoop_setup/vars/main.yml     |  18 ++-
 .../roles/metron_pcapservice/defaults/main.yml  |   2 -
 .../roles/metron_pcapservice/handlers/main.yml  |   3 -
 .../roles/metron_pcapservice/meta/main.yml      | 139 ------------------
 .../roles/metron_pcapservice/tasks/main.yml     |  19 ++-
 .../roles/metron_pcapservice/vars/main.yml      |  17 ++-
 .../roles/metron_streaming/defaults/main.yml    |   2 -
 .../roles/metron_streaming/handlers/main.yml    |  16 ++
 deployment/roles/metron_streaming/meta/main.yml | 139 ------------------
 .../roles/metron_streaming/tasks/main.yml       |  19 ++-
 deployment/roles/metron_streaming/vars/main.yml |  21 ++-
 deployment/roles/metron_ui/defaults/main.yml    |   2 -
 deployment/roles/metron_ui/handlers/main.yml    |   3 -
 deployment/roles/metron_ui/meta/main.yml        | 139 ------------------
 deployment/roles/metron_ui/tasks/main.yml       |  19 ++-
 deployment/roles/metron_ui/vars/main.yml        |  17 ++-
 deployment/roles/pcap_replay/README.md          |  27 ++++
 deployment/roles/pcap_replay/files/example.pcap | Bin 0 -> 507865 bytes
 deployment/roles/pcap_replay/files/pcap-replay  |  73 +++++++++
 deployment/roles/pcap_replay/tasks/main.yml     |  23 +++
 deployment/roles/pcap_replay/tasks/service.yml  |  28 ++++
 .../roles/pcap_replay/tasks/tcpreplay.yml       |  45 ++++++
 deployment/roles/pcap_replay/vars/main.yml      |  19 +++
 deployment/roles/pycapa/tasks/main.yml          |  31 +++-
 deployment/roles/pycapa/vars/main.yml           |  16 ++
 deployment/roles/snort/files/flume-snort.conf   |  16 ++
 deployment/roles/snort/tasks/daq.yml            |  30 ++++
 deployment/roles/snort/tasks/flume.yml          |  16 ++
 deployment/roles/snort/tasks/main.yml           |  38 ++++-
 deployment/roles/snort/tasks/snort.yml          |  52 +++----
 deployment/roles/snort/vars/main.yml            |  18 +++
 deployment/roles/yaf/files/flume-ipfix.conf     |  27 ----
 deployment/roles/yaf/files/start-yaf.sh         |   1 -
 deployment/roles/yaf/tasks/fixbuf.yml           |  37 +++++
 deployment/roles/yaf/tasks/flume.yml            |  27 ----
 deployment/roles/yaf/tasks/main.yml             |  85 ++++-------
 deployment/roles/yaf/tasks/yaf.yml              |  62 ++------
 deployment/roles/yaf/vars/main.yml              |  17 +++
 .../vagrant/multinode-vagrant/Vagrantfile       |  35 ++++-
 .../vagrant/multinode-vagrant/ansible.cfg       |  17 +++
 .../vagrant/singlenode-vagrant/Vagrantfile      |  47 ++++--
 .../vagrant/singlenode-vagrant/ansible.cfg      |  17 +++
 108 files changed, 1304 insertions(+), 2010 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/bro-plugin-kafka/Makefile
----------------------------------------------------------------------
diff --git a/bro-plugin-kafka/Makefile b/bro-plugin-kafka/Makefile
index 977937d..e4157c9 100644
--- a/bro-plugin-kafka/Makefile
+++ b/bro-plugin-kafka/Makefile
@@ -1,3 +1,4 @@
+#
 # 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

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/bro-plugin-kafka/cmake/FindLibRDKafka.cmake
----------------------------------------------------------------------
diff --git a/bro-plugin-kafka/cmake/FindLibRDKafka.cmake b/bro-plugin-kafka/cmake/FindLibRDKafka.cmake
index 2292e71..c64d8f9 100644
--- a/bro-plugin-kafka/cmake/FindLibRDKafka.cmake
+++ b/bro-plugin-kafka/cmake/FindLibRDKafka.cmake
@@ -1,3 +1,19 @@
+#
+#  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.
+#
 
 find_path(LibRDKafka_ROOT_DIR
   NAMES include/librdkafka/rdkafkacpp.h

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/bro-plugin-kafka/configure
----------------------------------------------------------------------
diff --git a/bro-plugin-kafka/configure b/bro-plugin-kafka/configure
index 20d98f9..b496886 100755
--- a/bro-plugin-kafka/configure
+++ b/bro-plugin-kafka/configure
@@ -1,4 +1,5 @@
 #!/bin/sh
+#
 # 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
@@ -14,8 +15,7 @@
 # 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.
-
-
+#
 #
 # Wrapper for viewing/setting options that the plugin's CMake
 # scripts will recognize.

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/bro-plugin-kafka/configure.plugin
----------------------------------------------------------------------
diff --git a/bro-plugin-kafka/configure.plugin b/bro-plugin-kafka/configure.plugin
index 0147e52..f5cb384 100644
--- a/bro-plugin-kafka/configure.plugin
+++ b/bro-plugin-kafka/configure.plugin
@@ -1,5 +1,20 @@
 #!/bin/sh
 #
+#  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.
+#
 # Hooks to add custom options to the configure script.
 #
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/bro-plugin-kafka/scripts/Metron/Kafka/__load__.bro
----------------------------------------------------------------------
diff --git a/bro-plugin-kafka/scripts/Metron/Kafka/__load__.bro b/bro-plugin-kafka/scripts/Metron/Kafka/__load__.bro
index 27a23bf..36913d3 100644
--- a/bro-plugin-kafka/scripts/Metron/Kafka/__load__.bro
+++ b/bro-plugin-kafka/scripts/Metron/Kafka/__load__.bro
@@ -1,4 +1,21 @@
 #
+#  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.
+#
+
+#
 # This is loaded when a user activates the plugin. Include scripts here that should be
 # loaded automatically at that point.
 #

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/bro-plugin-kafka/scripts/Metron/Kafka/logs-to-kafka.bro
----------------------------------------------------------------------
diff --git a/bro-plugin-kafka/scripts/Metron/Kafka/logs-to-kafka.bro b/bro-plugin-kafka/scripts/Metron/Kafka/logs-to-kafka.bro
index e57409a..5d0af0c 100644
--- a/bro-plugin-kafka/scripts/Metron/Kafka/logs-to-kafka.bro
+++ b/bro-plugin-kafka/scripts/Metron/Kafka/logs-to-kafka.bro
@@ -1,3 +1,20 @@
+#
+#  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.
+#
+
 ##! load this script to enable log output to kafka
 
 module Kafka;
@@ -11,16 +28,13 @@ export {
 	const logs_to_send: set[Log::ID] &redef;
 }
 
-event bro_init() &priority=-5
-{
-	if(kafka_broker_list == "" || topic_name == "")
+event bro_init() &priority=-5 {
+	if(kafka_broker_list == "" || topic_name == "") {
 		return;
+	}
 
-	for (stream_id in Log::active_streams)
-	{
-		if (stream_id in Kafka::logs_to_send)
-		{
-
+	for (stream_id in Log::active_streams) {
+		if (stream_id in Kafka::logs_to_send) {
 			local stream_str = fmt("%s", stream_id);
 
 			local filter: Log::Filter = [

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/bro-plugin-kafka/scripts/__load__.bro
----------------------------------------------------------------------
diff --git a/bro-plugin-kafka/scripts/__load__.bro b/bro-plugin-kafka/scripts/__load__.bro
index 21f1f58..e3db306 100644
--- a/bro-plugin-kafka/scripts/__load__.bro
+++ b/bro-plugin-kafka/scripts/__load__.bro
@@ -1,13 +1,27 @@
 #
+#  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.
+#
+
+#
 # This is loaded unconditionally at Bro startup. Include scripts here that should
 # always be loaded.
-# 
+#
 # Normally, that will be only code that initializes built-in elements. Load
 # your standard scripts in
 # scripts/<plugin-namespace>/<plugin-name>/__load__.bro instead.
 #
 
 @load ./init.bro
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/bro-plugin-kafka/tests/Makefile
----------------------------------------------------------------------
diff --git a/bro-plugin-kafka/tests/Makefile b/bro-plugin-kafka/tests/Makefile
index 4cdedac..a637cd3 100644
--- a/bro-plugin-kafka/tests/Makefile
+++ b/bro-plugin-kafka/tests/Makefile
@@ -1,3 +1,19 @@
+#
+#  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.
+#
 
 test:
 	@btest

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/bro-plugin-kafka/tests/Scripts/get-bro-env
----------------------------------------------------------------------
diff --git a/bro-plugin-kafka/tests/Scripts/get-bro-env b/bro-plugin-kafka/tests/Scripts/get-bro-env
index b568b8b..80cfb11 100755
--- a/bro-plugin-kafka/tests/Scripts/get-bro-env
+++ b/bro-plugin-kafka/tests/Scripts/get-bro-env
@@ -1,7 +1,24 @@
 #! /bin/sh
 #
-# BTest helper for getting values for Bro-related environment variables.
+#  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.
+#
 
+#
+# BTest helper for getting values for Bro-related environment variables.
+#
 base=`dirname $0`
 bro=`cat ${base}/../../build/CMakeCache.txt | grep BRO_DIST | cut -d = -f 2`
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/inventory/metron_example/group_vars/all
----------------------------------------------------------------------
diff --git a/deployment/inventory/metron_example/group_vars/all b/deployment/inventory/metron_example/group_vars/all
index 5f136a3..c6e7aab 100644
--- a/deployment/inventory/metron_example/group_vars/all
+++ b/deployment/inventory/metron_example/group_vars/all
@@ -1,33 +1,27 @@
-#Ambari variables
-ambari_host: "metron01.cloud.hortonworks.com"
+# metron variables
+metron_version: 0.1BETA
+java_home: /usr/jdk64/jdk1.8.0_40
+
+# ambari
+ambari_host: metron01.cloud.hortonworks.com
 ambari_port: 8080
-ambari_user: "admin"
-ambari_password: "admin"
+ambari_user: admin
+ambari_password: admin
+cluster_type: single_node_vm
+hdp_host_group: ["metron01.cloud.hortonworks.com"]
 
-#Metron variables
-metron_version: 0.1BETA
-java_home: "/usr/jdk64/jdk1.8.0_40"
+# hbase
+pcap_hbase_table: pcap
+tracker_hbase_table: access_tracker
+threatintel_ip_hbase_table: malicious_ip
+
+# kafka
+pycapa_topic: pcap
+bro_topic: bro
+yaf_topic: ipfix
+snort_topic: snort
 
-#Default values
-hdp_repo_def: "http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.3.2.0/hdp.repo"
-hbase_config_path: "/etc/hbase/conf"
-kafka_home: "/usr/hdp/current/kafka-broker/"
-elasticsearch_config_path: "/etc/elasticsearch"
-elasticsearch_cluster_name: "metron"
+# other values
 elasticsearch_web_port: 9200
-elasticsearch_transport_port: 9300
 pcapservice_port: 8081
-bro_version: "2.4.1"
-fixbuf_version: "1.7.1"
-yaf_version: "2.8.0"
-snort_version: "2.9.8.0-1"
-daq_version: "2.0.6-1"
-iface: "eth0"
-yaf_topic: "ipfix"
-snort_topic: "snort"
-bro_topic: "bro"
-pycapa_repo: "https://github.com/OpenSOC/pycapa.git"
-pycapa_home: "/opt/pycapa"
-pycapa_topic: "pcap"
-pcap_hbase_table: "pcap"
-snort_alert_csv_path: "/var/log/snort/alert.csv"
+sniff_interface: eth1

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/inventory/singlenode-vagrant/group_vars/all
----------------------------------------------------------------------
diff --git a/deployment/inventory/singlenode-vagrant/group_vars/all b/deployment/inventory/singlenode-vagrant/group_vars/all
index d9e6511..0135acc 100644
--- a/deployment/inventory/singlenode-vagrant/group_vars/all
+++ b/deployment/inventory/singlenode-vagrant/group_vars/all
@@ -1,37 +1,27 @@
-#Ambari variables
-ambari_host: "node1"
+# metron variables
+metron_version: 0.1BETA
+java_home: /usr/jdk64/jdk1.8.0_40
+
+# ambari
+ambari_host: node1
 ambari_port: 8080
-ambari_user: "admin"
-ambari_password: "admin"
-cluster_type: "single_node_vm"
+ambari_user: admin
+ambari_password: admin
+cluster_type: single_node_vm
 hdp_host_group: ["node1"]
 
-#Metron variables
-metron_version: 0.1BETA
-java_home: "/usr/jdk64/jdk1.8.0_40"
+# hbase
+pcap_hbase_table: pcap
+tracker_hbase_table: access_tracker
+threatintel_ip_hbase_table: malicious_ip
+
+# kafka
+pycapa_topic: pcap
+bro_topic: bro
+yaf_topic: ipfix
+snort_topic: snort
 
-#Default values
-hdp_repo_def: "http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.3.2.0/hdp.repo"
-hbase_config_path: "/etc/hbase/conf"
-kafka_home: "/usr/hdp/current/kafka-broker/"
-elasticsearch_config_path: "/etc/elasticsearch"
-elasticsearch_cluster_name: "metron"
+# other values
 elasticsearch_web_port: 9200
-elasticsearch_transport_port: 9300
 pcapservice_port: 8081
-bro_version: "2.4.1"
-fixbuf_version: "1.7.1"
-yaf_version: "2.8.0"
-snort_version: "2.9.8.0-1"
-daq_version: "2.0.6-1"
-iface: "eth0"
-yaf_topic: "ipfix"
-snort_topic: "snort"
-bro_topic: "bro"
-pcap_hbase_table: "pcap_test"
-tracker_hbase_table: "access_tracker"
-threatintel_ip_hbase_table: "malicious_ip"
-pycapa_repo: "https://github.com/OpenSOC/pycapa.git"
-pycapa_home: "/opt/pycapa"
-pycapa_topic: "pcap"
-snort_alert_csv_path: "/var/log/snort/alert.csv"
+sniff_interface: eth1

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/playbooks/ambari_install.yml
----------------------------------------------------------------------
diff --git a/deployment/playbooks/ambari_install.yml b/deployment/playbooks/ambari_install.yml
index bd918f6..e1da427 100644
--- a/deployment/playbooks/ambari_install.yml
+++ b/deployment/playbooks/ambari_install.yml
@@ -1,3 +1,19 @@
+#
+#  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.
+#
 ---
 - hosts: ambari_*
   sudo: yes
@@ -16,4 +32,4 @@
 
 - hosts: ambari_master
   roles:
-    - role: ambari_config
\ No newline at end of file
+    - role: ambari_config

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/playbooks/metron_full_install.yml
----------------------------------------------------------------------
diff --git a/deployment/playbooks/metron_full_install.yml b/deployment/playbooks/metron_full_install.yml
index c6200a8..38203da 100644
--- a/deployment/playbooks/metron_full_install.yml
+++ b/deployment/playbooks/metron_full_install.yml
@@ -1,3 +1,19 @@
+#
+#  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.
+#
 ---
 - include: ambari_install.yml
-- include: metron_install.yml
\ No newline at end of file
+- include: metron_install.yml

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/playbooks/metron_install.yml
----------------------------------------------------------------------
diff --git a/deployment/playbooks/metron_install.yml b/deployment/playbooks/metron_install.yml
index 1c9ac54..6873b78 100644
--- a/deployment/playbooks/metron_install.yml
+++ b/deployment/playbooks/metron_install.yml
@@ -1,3 +1,19 @@
+#
+#  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.
+#
 ---
 - hosts: hadoop_client
   sudo: yes
@@ -21,6 +37,7 @@
     - role: bro
     - role: snort
     - role: yaf
+    - role: pcap_replay
   tags:
       - sensors
 
@@ -39,4 +56,4 @@
     - role: metron_ui
     - role: metron_pcapservice
   tags:
-    - web
\ No newline at end of file
+    - web

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_common/defaults/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_common/defaults/main.yml b/deployment/roles/ambari_common/defaults/main.yml
deleted file mode 100644
index a50f9ca..0000000
--- a/deployment/roles/ambari_common/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for ambari_common

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_common/handlers/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_common/handlers/main.yml b/deployment/roles/ambari_common/handlers/main.yml
deleted file mode 100644
index 63c3e6f..0000000
--- a/deployment/roles/ambari_common/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for ambari_common

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_common/meta/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_common/meta/main.yml b/deployment/roles/ambari_common/meta/main.yml
deleted file mode 100644
index 62c7d35..0000000
--- a/deployment/roles/ambari_common/meta/main.yml
+++ /dev/null
@@ -1,139 +0,0 @@
----
-galaxy_info:
-  author: your name
-  description: 
-  company: your company (optional)
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-  # Some suggested licenses:
-  # - BSD (default)
-  # - MIT
-  # - GPLv2
-  # - GPLv3
-  # - Apache
-  # - CC-BY
-  license: license (GPLv2, CC-BY, etc)
-  min_ansible_version: 1.2
-  #
-  # Below are all platforms currently available. Just uncomment
-  # 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:
-  #- name: EL
-  #  versions:
-  #  - all
-  #  - 5
-  #  - 6
-  #  - 7
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Fedora
-  #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #  - 21
-  #  - 22
-  #- name: Windows
-  #  versions:
-  #  - all
-  #  - 2012R2
-  #- name: SmartOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: opensuse
-  #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
-  #- name: Amazon
-  #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #- name: GenericBSD
-  #  versions:
-  #  - all
-  #  - any
-  #- name: FreeBSD
-  #  versions:
-  #  - all
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
-  #- name: Ubuntu
-  #  versions:
-  #  - all
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
-  #  - trusty
-  #  - utopic
-  #  - vivid
-  #- name: SLES
-  #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #- name: GenericLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Debian
-  #  versions:
-  #  - all
-  #  - etch
-  #  - jessie
-  #  - lenny
-  #  - squeeze
-  #  - wheezy
-  #
-  # Below are all categories currently available. Just as with
-  # the platforms above, uncomment those that apply to your role.
-  #
-  #categories:
-  #- cloud
-  #- cloud:ec2
-  #- cloud:gce
-  #- cloud:rax
-  #- clustering
-  #- database
-  #- database:nosql
-  #- database:sql
-  #- development
-  #- monitoring
-  #- networking
-  #- packaging
-  #- system
-  #- web
-dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
-  

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_common/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_common/tasks/main.yml b/deployment/roles/ambari_common/tasks/main.yml
index 357c9b6..ec5576b 100644
--- a/deployment/roles/ambari_common/tasks/main.yml
+++ b/deployment/roles/ambari_common/tasks/main.yml
@@ -1,3 +1,19 @@
+#
+#  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.
+#
 ---
 # tasks file for ambari_common
 - name: Install libselinux-python

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_common/tasks/passwd_less_ssh.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_common/tasks/passwd_less_ssh.yml b/deployment/roles/ambari_common/tasks/passwd_less_ssh.yml
index e414712..67b07e9 100644
--- a/deployment/roles/ambari_common/tasks/passwd_less_ssh.yml
+++ b/deployment/roles/ambari_common/tasks/passwd_less_ssh.yml
@@ -1,3 +1,19 @@
+#
+#  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.
+#
 ---
 - name: Generate ssh key pair for "{{ ambari_user }}"
   user: name={{ ambari_user }} generate_ssh_key=yes

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_common/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_common/vars/main.yml b/deployment/roles/ambari_common/vars/main.yml
index 935a138..f86f9f6 100644
--- a/deployment/roles/ambari_common/vars/main.yml
+++ b/deployment/roles/ambari_common/vars/main.yml
@@ -1,3 +1,19 @@
+#
+#  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.
+#
 ---
 # vars file for ambari_common
 epel_repo_url: "http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm"

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_config/defaults/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_config/defaults/main.yml b/deployment/roles/ambari_config/defaults/main.yml
deleted file mode 100644
index 78fc121..0000000
--- a/deployment/roles/ambari_config/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for ambari_config

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_config/handlers/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_config/handlers/main.yml b/deployment/roles/ambari_config/handlers/main.yml
deleted file mode 100644
index bf6bdbe..0000000
--- a/deployment/roles/ambari_config/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for ambari_config

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_config/meta/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_config/meta/main.yml b/deployment/roles/ambari_config/meta/main.yml
deleted file mode 100644
index 62c7d35..0000000
--- a/deployment/roles/ambari_config/meta/main.yml
+++ /dev/null
@@ -1,139 +0,0 @@
----
-galaxy_info:
-  author: your name
-  description: 
-  company: your company (optional)
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-  # Some suggested licenses:
-  # - BSD (default)
-  # - MIT
-  # - GPLv2
-  # - GPLv3
-  # - Apache
-  # - CC-BY
-  license: license (GPLv2, CC-BY, etc)
-  min_ansible_version: 1.2
-  #
-  # Below are all platforms currently available. Just uncomment
-  # 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:
-  #- name: EL
-  #  versions:
-  #  - all
-  #  - 5
-  #  - 6
-  #  - 7
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Fedora
-  #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #  - 21
-  #  - 22
-  #- name: Windows
-  #  versions:
-  #  - all
-  #  - 2012R2
-  #- name: SmartOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: opensuse
-  #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
-  #- name: Amazon
-  #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #- name: GenericBSD
-  #  versions:
-  #  - all
-  #  - any
-  #- name: FreeBSD
-  #  versions:
-  #  - all
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
-  #- name: Ubuntu
-  #  versions:
-  #  - all
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
-  #  - trusty
-  #  - utopic
-  #  - vivid
-  #- name: SLES
-  #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #- name: GenericLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Debian
-  #  versions:
-  #  - all
-  #  - etch
-  #  - jessie
-  #  - lenny
-  #  - squeeze
-  #  - wheezy
-  #
-  # Below are all categories currently available. Just as with
-  # the platforms above, uncomment those that apply to your role.
-  #
-  #categories:
-  #- cloud
-  #- cloud:ec2
-  #- cloud:gce
-  #- cloud:rax
-  #- clustering
-  #- database
-  #- database:nosql
-  #- database:sql
-  #- development
-  #- monitoring
-  #- networking
-  #- packaging
-  #- system
-  #- web
-dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
-  

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_config/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_config/tasks/main.yml b/deployment/roles/ambari_config/tasks/main.yml
index 764399f..73e146d 100644
--- a/deployment/roles/ambari_config/tasks/main.yml
+++ b/deployment/roles/ambari_config/tasks/main.yml
@@ -1,6 +1,20 @@
+#
+#  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.
+#
 ---
-# tasks file for ambari_config
-
 - include_vars: "{{ cluster_type }}.yml"
 
 - name: Install python-requests

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_config/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_config/vars/main.yml b/deployment/roles/ambari_config/vars/main.yml
index 3888eb1..841d185 100644
--- a/deployment/roles/ambari_config/vars/main.yml
+++ b/deployment/roles/ambari_config/vars/main.yml
@@ -1,3 +1,17 @@
+#
+#  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.
+#
 ---
-# vars file for ambari_config
-

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_config/vars/single_node_vm.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_config/vars/single_node_vm.yml b/deployment/roles/ambari_config/vars/single_node_vm.yml
index 07ca31b..d87d55b 100644
--- a/deployment/roles/ambari_config/vars/single_node_vm.yml
+++ b/deployment/roles/ambari_config/vars/single_node_vm.yml
@@ -1,3 +1,19 @@
+#
+#  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.
+#
 ---
 # vars file for single_node_vm blueprint
 
@@ -43,4 +59,4 @@ blueprint:
       cardinality: 1
       configurations: []
       components: "{{ metron_components }}"
-      hosts: "{{ hdp_host_group }}"
\ No newline at end of file
+      hosts: "{{ hdp_host_group }}"

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_config/vars/small_cluster.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_config/vars/small_cluster.yml b/deployment/roles/ambari_config/vars/small_cluster.yml
index da6b655..46d18ac 100644
--- a/deployment/roles/ambari_config/vars/small_cluster.yml
+++ b/deployment/roles/ambari_config/vars/small_cluster.yml
@@ -1,3 +1,19 @@
+#
+#  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.
+#
 ---
 # vars file for small_cluster blueprint
 
@@ -33,4 +49,4 @@ blueprint:
       cardinality: 1+
       configuration: []  # configuration not yet implemented
       components: "{{ slave_components }}"
-      hosts: "{{slaves_group}}"
\ No newline at end of file
+      hosts: "{{slaves_group}}"

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_gather_facts/defaults/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_gather_facts/defaults/main.yml b/deployment/roles/ambari_gather_facts/defaults/main.yml
deleted file mode 100644
index a5edc1e..0000000
--- a/deployment/roles/ambari_gather_facts/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for ambari_gather_facts

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_gather_facts/handlers/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_gather_facts/handlers/main.yml b/deployment/roles/ambari_gather_facts/handlers/main.yml
deleted file mode 100644
index 277d551..0000000
--- a/deployment/roles/ambari_gather_facts/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for ambari_gather_facts

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_gather_facts/meta/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_gather_facts/meta/main.yml b/deployment/roles/ambari_gather_facts/meta/main.yml
deleted file mode 100644
index 62c7d35..0000000
--- a/deployment/roles/ambari_gather_facts/meta/main.yml
+++ /dev/null
@@ -1,139 +0,0 @@
----
-galaxy_info:
-  author: your name
-  description: 
-  company: your company (optional)
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-  # Some suggested licenses:
-  # - BSD (default)
-  # - MIT
-  # - GPLv2
-  # - GPLv3
-  # - Apache
-  # - CC-BY
-  license: license (GPLv2, CC-BY, etc)
-  min_ansible_version: 1.2
-  #
-  # Below are all platforms currently available. Just uncomment
-  # 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:
-  #- name: EL
-  #  versions:
-  #  - all
-  #  - 5
-  #  - 6
-  #  - 7
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Fedora
-  #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #  - 21
-  #  - 22
-  #- name: Windows
-  #  versions:
-  #  - all
-  #  - 2012R2
-  #- name: SmartOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: opensuse
-  #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
-  #- name: Amazon
-  #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #- name: GenericBSD
-  #  versions:
-  #  - all
-  #  - any
-  #- name: FreeBSD
-  #  versions:
-  #  - all
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
-  #- name: Ubuntu
-  #  versions:
-  #  - all
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
-  #  - trusty
-  #  - utopic
-  #  - vivid
-  #- name: SLES
-  #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #- name: GenericLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Debian
-  #  versions:
-  #  - all
-  #  - etch
-  #  - jessie
-  #  - lenny
-  #  - squeeze
-  #  - wheezy
-  #
-  # Below are all categories currently available. Just as with
-  # the platforms above, uncomment those that apply to your role.
-  #
-  #categories:
-  #- cloud
-  #- cloud:ec2
-  #- cloud:gce
-  #- cloud:rax
-  #- clustering
-  #- database
-  #- database:nosql
-  #- database:sql
-  #- development
-  #- monitoring
-  #- networking
-  #- packaging
-  #- system
-  #- web
-dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
-  

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_gather_facts/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_gather_facts/tasks/main.yml b/deployment/roles/ambari_gather_facts/tasks/main.yml
index 6f358ad..cf01c21 100644
--- a/deployment/roles/ambari_gather_facts/tasks/main.yml
+++ b/deployment/roles/ambari_gather_facts/tasks/main.yml
@@ -1,5 +1,23 @@
+#
+#  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.
+#
 ---
-# tasks file for ambari_gather_facts
+- name: Install EPEL repository
+  yum: name=epel-release
+
 - name: Install pip
   yum: name=python-pip
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_gather_facts/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_gather_facts/vars/main.yml b/deployment/roles/ambari_gather_facts/vars/main.yml
deleted file mode 100644
index 20fda92..0000000
--- a/deployment/roles/ambari_gather_facts/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# vars file for ambari_gather_facts

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_master/defaults/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_master/defaults/main.yml b/deployment/roles/ambari_master/defaults/main.yml
deleted file mode 100644
index 3379cb7..0000000
--- a/deployment/roles/ambari_master/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for ambari_master

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_master/handlers/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_master/handlers/main.yml b/deployment/roles/ambari_master/handlers/main.yml
deleted file mode 100644
index 99943a5..0000000
--- a/deployment/roles/ambari_master/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for ambari_master

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_master/meta/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_master/meta/main.yml b/deployment/roles/ambari_master/meta/main.yml
deleted file mode 100644
index 62c7d35..0000000
--- a/deployment/roles/ambari_master/meta/main.yml
+++ /dev/null
@@ -1,139 +0,0 @@
----
-galaxy_info:
-  author: your name
-  description: 
-  company: your company (optional)
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-  # Some suggested licenses:
-  # - BSD (default)
-  # - MIT
-  # - GPLv2
-  # - GPLv3
-  # - Apache
-  # - CC-BY
-  license: license (GPLv2, CC-BY, etc)
-  min_ansible_version: 1.2
-  #
-  # Below are all platforms currently available. Just uncomment
-  # 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:
-  #- name: EL
-  #  versions:
-  #  - all
-  #  - 5
-  #  - 6
-  #  - 7
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Fedora
-  #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #  - 21
-  #  - 22
-  #- name: Windows
-  #  versions:
-  #  - all
-  #  - 2012R2
-  #- name: SmartOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: opensuse
-  #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
-  #- name: Amazon
-  #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #- name: GenericBSD
-  #  versions:
-  #  - all
-  #  - any
-  #- name: FreeBSD
-  #  versions:
-  #  - all
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
-  #- name: Ubuntu
-  #  versions:
-  #  - all
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
-  #  - trusty
-  #  - utopic
-  #  - vivid
-  #- name: SLES
-  #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #- name: GenericLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Debian
-  #  versions:
-  #  - all
-  #  - etch
-  #  - jessie
-  #  - lenny
-  #  - squeeze
-  #  - wheezy
-  #
-  # Below are all categories currently available. Just as with
-  # the platforms above, uncomment those that apply to your role.
-  #
-  #categories:
-  #- cloud
-  #- cloud:ec2
-  #- cloud:gce
-  #- cloud:rax
-  #- clustering
-  #- database
-  #- database:nosql
-  #- database:sql
-  #- development
-  #- monitoring
-  #- networking
-  #- packaging
-  #- system
-  #- web
-dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
-  

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_master/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_master/tasks/main.yml b/deployment/roles/ambari_master/tasks/main.yml
index 8ff2dd2..92c9a5c 100644
--- a/deployment/roles/ambari_master/tasks/main.yml
+++ b/deployment/roles/ambari_master/tasks/main.yml
@@ -1,3 +1,19 @@
+#
+#  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.
+#
 ---
 # tasks file for ambari_master
 - name: Install ambari repo
@@ -12,4 +28,4 @@
   service: name=ambari-server state=restarted
 
 - name : check if ambari-server is up
-  wait_for : host=127.0.0.1 port=8080 delay=10
+  wait_for : host={{ ambari_host }} port={{ ambari_port }} delay=10

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_master/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_master/vars/main.yml b/deployment/roles/ambari_master/vars/main.yml
deleted file mode 100644
index a97605d..0000000
--- a/deployment/roles/ambari_master/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# vars file for ambari_master

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_slave/defaults/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_slave/defaults/main.yml b/deployment/roles/ambari_slave/defaults/main.yml
deleted file mode 100644
index 755f529..0000000
--- a/deployment/roles/ambari_slave/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for ambari_slave

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_slave/handlers/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_slave/handlers/main.yml b/deployment/roles/ambari_slave/handlers/main.yml
deleted file mode 100644
index cdab51c..0000000
--- a/deployment/roles/ambari_slave/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for ambari_slave

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_slave/meta/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_slave/meta/main.yml b/deployment/roles/ambari_slave/meta/main.yml
deleted file mode 100644
index 62c7d35..0000000
--- a/deployment/roles/ambari_slave/meta/main.yml
+++ /dev/null
@@ -1,139 +0,0 @@
----
-galaxy_info:
-  author: your name
-  description: 
-  company: your company (optional)
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-  # Some suggested licenses:
-  # - BSD (default)
-  # - MIT
-  # - GPLv2
-  # - GPLv3
-  # - Apache
-  # - CC-BY
-  license: license (GPLv2, CC-BY, etc)
-  min_ansible_version: 1.2
-  #
-  # Below are all platforms currently available. Just uncomment
-  # 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:
-  #- name: EL
-  #  versions:
-  #  - all
-  #  - 5
-  #  - 6
-  #  - 7
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Fedora
-  #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #  - 21
-  #  - 22
-  #- name: Windows
-  #  versions:
-  #  - all
-  #  - 2012R2
-  #- name: SmartOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: opensuse
-  #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
-  #- name: Amazon
-  #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #- name: GenericBSD
-  #  versions:
-  #  - all
-  #  - any
-  #- name: FreeBSD
-  #  versions:
-  #  - all
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
-  #- name: Ubuntu
-  #  versions:
-  #  - all
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
-  #  - trusty
-  #  - utopic
-  #  - vivid
-  #- name: SLES
-  #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #- name: GenericLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Debian
-  #  versions:
-  #  - all
-  #  - etch
-  #  - jessie
-  #  - lenny
-  #  - squeeze
-  #  - wheezy
-  #
-  # Below are all categories currently available. Just as with
-  # the platforms above, uncomment those that apply to your role.
-  #
-  #categories:
-  #- cloud
-  #- cloud:ec2
-  #- cloud:gce
-  #- cloud:rax
-  #- clustering
-  #- database
-  #- database:nosql
-  #- database:sql
-  #- development
-  #- monitoring
-  #- networking
-  #- packaging
-  #- system
-  #- web
-dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
-  

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_slave/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_slave/tasks/main.yml b/deployment/roles/ambari_slave/tasks/main.yml
index cb84dc2..c28315a 100644
--- a/deployment/roles/ambari_slave/tasks/main.yml
+++ b/deployment/roles/ambari_slave/tasks/main.yml
@@ -1,3 +1,19 @@
+#
+#  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.
+#
 ---
 # tasks file for ambari_slave
 - name: Install ambari-agent

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ambari_slave/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ambari_slave/vars/main.yml b/deployment/roles/ambari_slave/vars/main.yml
index 40a14b2..b3920fc 100644
--- a/deployment/roles/ambari_slave/vars/main.yml
+++ b/deployment/roles/ambari_slave/vars/main.yml
@@ -1,6 +1,20 @@
+#
+#  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.
+#
 ---
-# vars file for ambari_slave
-
 #
 # TODO: duplicates from ambari-common.  need all of these moved to group_vars
 #

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ansible-hdp-kafka/README.md
----------------------------------------------------------------------
diff --git a/deployment/roles/ansible-hdp-kafka/README.md b/deployment/roles/ansible-hdp-kafka/README.md
deleted file mode 100644
index e0e3466..0000000
--- a/deployment/roles/ansible-hdp-kafka/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-Kafka @ Hortonworks Data Platform
-=================================
-
-An Ansible Role that installs a single-node Kafka broker from the Hortonworks Data Platform distribution.  Zookeeper is also installed to support the Kafka broker.  
-
-Getting Started
----------------
-
-Add to your playbook's requirements.yml:
-
-```
-- src: https://github.com/nickwallen/ansible-hdp-kafka
-```
-
-and then run:
-
-```
-ansible-galaxy install -r requirements.yml --ignore-errors
-```
-
-Requirements
-------------
-
-None.
-
-Role Variables
---------------
-
-
-Dependencies
-------------
-
-None.
-
-Example Playbook
-----------------
-
-    - hosts: kafka*
-      roles:
-         - { role: ansible-hdp-kafka, x: 42 }
-
-License
--------
-
-BSD
-
-Author Information
-------------------
-
-Nick Allen

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ansible-hdp-kafka/defaults/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ansible-hdp-kafka/defaults/main.yml b/deployment/roles/ansible-hdp-kafka/defaults/main.yml
deleted file mode 100644
index c7837fc..0000000
--- a/deployment/roles/ansible-hdp-kafka/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for .

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ansible-hdp-kafka/handlers/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ansible-hdp-kafka/handlers/main.yml b/deployment/roles/ansible-hdp-kafka/handlers/main.yml
deleted file mode 100644
index 050cdd1..0000000
--- a/deployment/roles/ansible-hdp-kafka/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for .

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ansible-hdp-kafka/meta/.galaxy_install_info
----------------------------------------------------------------------
diff --git a/deployment/roles/ansible-hdp-kafka/meta/.galaxy_install_info b/deployment/roles/ansible-hdp-kafka/meta/.galaxy_install_info
deleted file mode 100644
index c0c2c3c..0000000
--- a/deployment/roles/ansible-hdp-kafka/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Wed Jan 27 14:27:44 2016', version: ''}

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ansible-hdp-kafka/meta/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ansible-hdp-kafka/meta/main.yml b/deployment/roles/ansible-hdp-kafka/meta/main.yml
deleted file mode 100644
index 888088e..0000000
--- a/deployment/roles/ansible-hdp-kafka/meta/main.yml
+++ /dev/null
@@ -1,147 +0,0 @@
----
-galaxy_info:
-  author: your name
-  description: 
-  company: your company (optional)
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-  # Some suggested licenses:
-  # - BSD (default)
-  # - MIT
-  # - GPLv2
-  # - GPLv3
-  # - Apache
-  # - CC-BY
-  license: license (GPLv2, CC-BY, etc)
-  min_ansible_version: 1.2
-  #
-  # Below are all platforms currently available. Just uncomment
-  # 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:
-  #- name: EL
-  #  versions:
-  #  - all
-  #  - 5
-  #  - 6
-  #  - 7
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Solaris
-  #  versions:
-  #  - all
-  #  - 10
-  #  - 11.0
-  #  - 11.1
-  #  - 11.2
-  #  - 11.3
-  #- name: Fedora
-  #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #  - 21
-  #  - 22
-  #- name: Windows
-  #  versions:
-  #  - all
-  #  - 2012R2
-  #- name: SmartOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: opensuse
-  #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
-  #- name: Amazon
-  #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #- name: GenericBSD
-  #  versions:
-  #  - all
-  #  - any
-  #- name: FreeBSD
-  #  versions:
-  #  - all
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
-  #- name: Ubuntu
-  #  versions:
-  #  - all
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
-  #  - trusty
-  #  - utopic
-  #  - vivid
-  #- name: SLES
-  #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #- name: GenericLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Debian
-  #  versions:
-  #  - all
-  #  - etch
-  #  - jessie
-  #  - lenny
-  #  - squeeze
-  #  - wheezy
-  #
-  # Below are all categories currently available. Just as with
-  # the platforms above, uncomment those that apply to your role.
-  #
-  #categories:
-  #- cloud
-  #- cloud:ec2
-  #- cloud:gce
-  #- cloud:rax
-  #- clustering
-  #- database
-  #- database:nosql
-  #- database:sql
-  #- development
-  #- monitoring
-  #- networking
-  #- packaging
-  #- system
-  #- web
-dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
-  

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ansible-hdp-kafka/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ansible-hdp-kafka/tasks/main.yml b/deployment/roles/ansible-hdp-kafka/tasks/main.yml
deleted file mode 100644
index c77b91b..0000000
--- a/deployment/roles/ansible-hdp-kafka/tasks/main.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- name: Install prerequisites
-  yum: name=libselinux-python state=latest
-
-- name: Retrieve HDP repository definition
-  get_url:
-    url: "{{ hdp_repo_def }}"
-    dest: /etc/yum.repos.d/hdp.repo
-    mode: 0644
-
-- name: Install kafka
-  yum: name={{item}}
-  with_items:
-    - java-1.8.0-openjdk
-    - kafka
-    - zookeeper-server
-
-- name: Start zookeeper
-  shell: /usr/hdp/current/zookeeper-server/bin/zookeeper-server start
-
-- name: Start kafka
-  shell: /usr/hdp/current/kafka-broker/bin/kafka start

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/ansible-hdp-kafka/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/ansible-hdp-kafka/vars/main.yml b/deployment/roles/ansible-hdp-kafka/vars/main.yml
deleted file mode 100644
index d6af4b7..0000000
--- a/deployment/roles/ansible-hdp-kafka/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-hdp_repo_def: http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.3.2.0/hdp.repo

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/bro/tasks/bro-plugin-kafka.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/bro/tasks/bro-plugin-kafka.yml b/deployment/roles/bro/tasks/bro-plugin-kafka.yml
index 9190268..8e953ba 100644
--- a/deployment/roles/bro/tasks/bro-plugin-kafka.yml
+++ b/deployment/roles/bro/tasks/bro-plugin-kafka.yml
@@ -1,3 +1,19 @@
+#
+#  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.
+#
 ---
 - name: Distribute bro plugin
   copy: src=../../../bro-plugin-kafka dest=/tmp mode=0755

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/bro/tasks/bro.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/bro/tasks/bro.yml b/deployment/roles/bro/tasks/bro.yml
index 1fc6c03..55c86d6 100644
--- a/deployment/roles/bro/tasks/bro.yml
+++ b/deployment/roles/bro/tasks/bro.yml
@@ -1,3 +1,19 @@
+#
+#  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.
+#
 ---
 - name: Download bro
   get_url:
@@ -20,3 +36,9 @@
     - ./configure
     - make
     - make install
+
+- name: Configure bro
+  lineinfile:
+    dest: /usr/local/bro/etc/node.cfg
+    regexp: '^interface=.*$'
+    line: 'interface={{ sniff_interface }}'

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/bro/tasks/librdkafka.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/bro/tasks/librdkafka.yml b/deployment/roles/bro/tasks/librdkafka.yml
index 66a1d4a..561bae2 100644
--- a/deployment/roles/bro/tasks/librdkafka.yml
+++ b/deployment/roles/bro/tasks/librdkafka.yml
@@ -1,3 +1,19 @@
+#
+#  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.
+#
 ---
 - name: Download librdkafka
   get_url:

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/bro/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/bro/tasks/main.yml b/deployment/roles/bro/tasks/main.yml
index e8f97c2..04dfe8f 100644
--- a/deployment/roles/bro/tasks/main.yml
+++ b/deployment/roles/bro/tasks/main.yml
@@ -1,3 +1,19 @@
+#
+#  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.
+#
 ---
 - name: Install prerequisites
   yum: name={{ item }}
@@ -22,6 +38,9 @@
 
 - include: bro-plugin-kafka.yml
 
+- name: Turn on promiscuous mode for {{ sniff_interface }}
+  shell: "ip link set {{ sniff_interface }} promisc on"
+
 - name: Update bro configuration
   shell: /usr/local/bro/bin/broctl install
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/bro/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/bro/vars/main.yml b/deployment/roles/bro/vars/main.yml
index 1e97fe1..88e6f64 100644
--- a/deployment/roles/bro/vars/main.yml
+++ b/deployment/roles/bro/vars/main.yml
@@ -1,5 +1,19 @@
+#
+#  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.
+#
 ---
-rpms:
-  - librdkafka1-0.9.1-10.el6.x86_64.rpm
-  - librdkafka-devel-0.9.1-10.el6.x86_64.rpm
-  - Bro-2.2-344-Linux-x86_64.rpm
+bro_version: 2.4.1
+bro_topic: bro

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/elasticsearch/defaults/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/elasticsearch/defaults/main.yml b/deployment/roles/elasticsearch/defaults/main.yml
deleted file mode 100644
index a50f9ca..0000000
--- a/deployment/roles/elasticsearch/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for ambari_common

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/elasticsearch/handlers/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/elasticsearch/handlers/main.yml b/deployment/roles/elasticsearch/handlers/main.yml
index a4c1162..112c5ca 100644
--- a/deployment/roles/elasticsearch/handlers/main.yml
+++ b/deployment/roles/elasticsearch/handlers/main.yml
@@ -1,3 +1,19 @@
+#
+#  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.
+#
 ---
 - name: restart elasticsearch
   service: name=elasticsearch state=restarted

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/elasticsearch/meta/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/elasticsearch/meta/main.yml b/deployment/roles/elasticsearch/meta/main.yml
deleted file mode 100644
index 62c7d35..0000000
--- a/deployment/roles/elasticsearch/meta/main.yml
+++ /dev/null
@@ -1,139 +0,0 @@
----
-galaxy_info:
-  author: your name
-  description: 
-  company: your company (optional)
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-  # Some suggested licenses:
-  # - BSD (default)
-  # - MIT
-  # - GPLv2
-  # - GPLv3
-  # - Apache
-  # - CC-BY
-  license: license (GPLv2, CC-BY, etc)
-  min_ansible_version: 1.2
-  #
-  # Below are all platforms currently available. Just uncomment
-  # 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:
-  #- name: EL
-  #  versions:
-  #  - all
-  #  - 5
-  #  - 6
-  #  - 7
-  #- name: GenericUNIX
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Fedora
-  #  versions:
-  #  - all
-  #  - 16
-  #  - 17
-  #  - 18
-  #  - 19
-  #  - 20
-  #  - 21
-  #  - 22
-  #- name: Windows
-  #  versions:
-  #  - all
-  #  - 2012R2
-  #- name: SmartOS
-  #  versions:
-  #  - all
-  #  - any
-  #- name: opensuse
-  #  versions:
-  #  - all
-  #  - 12.1
-  #  - 12.2
-  #  - 12.3
-  #  - 13.1
-  #  - 13.2
-  #- name: Amazon
-  #  versions:
-  #  - all
-  #  - 2013.03
-  #  - 2013.09
-  #- name: GenericBSD
-  #  versions:
-  #  - all
-  #  - any
-  #- name: FreeBSD
-  #  versions:
-  #  - all
-  #  - 8.0
-  #  - 8.1
-  #  - 8.2
-  #  - 8.3
-  #  - 8.4
-  #  - 9.0
-  #  - 9.1
-  #  - 9.1
-  #  - 9.2
-  #- name: Ubuntu
-  #  versions:
-  #  - all
-  #  - lucid
-  #  - maverick
-  #  - natty
-  #  - oneiric
-  #  - precise
-  #  - quantal
-  #  - raring
-  #  - saucy
-  #  - trusty
-  #  - utopic
-  #  - vivid
-  #- name: SLES
-  #  versions:
-  #  - all
-  #  - 10SP3
-  #  - 10SP4
-  #  - 11
-  #  - 11SP1
-  #  - 11SP2
-  #  - 11SP3
-  #- name: GenericLinux
-  #  versions:
-  #  - all
-  #  - any
-  #- name: Debian
-  #  versions:
-  #  - all
-  #  - etch
-  #  - jessie
-  #  - lenny
-  #  - squeeze
-  #  - wheezy
-  #
-  # Below are all categories currently available. Just as with
-  # the platforms above, uncomment those that apply to your role.
-  #
-  #categories:
-  #- cloud
-  #- cloud:ec2
-  #- cloud:gce
-  #- cloud:rax
-  #- clustering
-  #- database
-  #- database:nosql
-  #- database:sql
-  #- development
-  #- monitoring
-  #- networking
-  #- packaging
-  #- system
-  #- web
-dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
-  

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/elasticsearch/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/elasticsearch/tasks/main.yml b/deployment/roles/elasticsearch/tasks/main.yml
index b491a10..862b6b5 100644
--- a/deployment/roles/elasticsearch/tasks/main.yml
+++ b/deployment/roles/elasticsearch/tasks/main.yml
@@ -1,7 +1,21 @@
+#
+#  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.
+#
 ---
-
-# tasks file for elasticsearch
-- name: alternatives link for "java"
+- name: Alternatives link for "java"
   alternatives: name=java link=/usr/bin/java  path=/usr/jdk64/jdk1.8.0_40/bin/java
 
 - name: Add Elasticsearch GPG key.
@@ -29,4 +43,4 @@
   notify: restart elasticsearch
 
 - name: Start Elasticsearch.
-  service: name=elasticsearch state=started enabled=yes
\ No newline at end of file
+  service: name=elasticsearch state=started enabled=yes

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/elasticsearch/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/elasticsearch/vars/main.yml b/deployment/roles/elasticsearch/vars/main.yml
deleted file mode 100644
index 837bf23..0000000
--- a/deployment/roles/elasticsearch/vars/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# vars file for elasticsearch
-

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/flume/files/flume-ipfix.conf
----------------------------------------------------------------------
diff --git a/deployment/roles/flume/files/flume-ipfix.conf b/deployment/roles/flume/files/flume-ipfix.conf
deleted file mode 100644
index fa97ca7..0000000
--- a/deployment/roles/flume/files/flume-ipfix.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-
-ipfix.sources = netcat-source
-ipfix.channels = memory-channel
-ipfix.sinks = kafka-sink logger-sink
-
-# ipfix publishes ipfix to local tcp port 4739
-ipfix.sources.netcat-source.type = netcat
-ipfix.sources.netcat-source.bind = localhost
-ipfix.sources.netcat-source.port = 4739
-
-# data is sent to kafka
-ipfix.sinks.kafka-sink.type = org.apache.flume.sink.kafka.KafkaSink
-ipfix.sinks.kafka-sink.brokerList = [[value overwritten by ansible]]
-ipfix.sinks.kafka-sink.topic = [[value overwritten by ansible]]
-
-# also log events
-ipfix.sinks.logger-sink.type = logger
-
-# buffer events in memory
-ipfix.channels.memory-channel.type = memory
-ipfix.channels.memory-channel.capacity = 1000
-ipfix.channels.memory-channel.transactionCapacity = 100
-
-# bind the source and sink to the channel
-ipfix.sources.netcat-source.channels = memory-channel
-ipfix.sinks.kafka-sink.channel = memory-channel
-ipfix.sinks.logger-sink.channel = memory-channel

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/flume/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/flume/tasks/main.yml b/deployment/roles/flume/tasks/main.yml
index 9239280..7080b55 100644
--- a/deployment/roles/flume/tasks/main.yml
+++ b/deployment/roles/flume/tasks/main.yml
@@ -1,3 +1,19 @@
+#
+#  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.
+#
 ---
 - name: Retrieve HDP repository definition
   get_url:
@@ -8,6 +24,7 @@
 - name: Install flume
   yum: name={{item}}
   with_items:
+    - libselinux-python
     - flume
     - flume-agent
 
@@ -29,4 +46,4 @@
     - cp /usr/hdp/current/flume-server/etc/rc.d/init.d/flume-agent /etc/init.d/
 
 - name: Remove default flume configuration
-  shell: rm -f /etc/flume/conf/flume.conf
+  file: path=/etc/flume/conf/flume.conf state=absent

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/flume/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/flume/vars/main.yml b/deployment/roles/flume/vars/main.yml
index d6af4b7..351d125 100644
--- a/deployment/roles/flume/vars/main.yml
+++ b/deployment/roles/flume/vars/main.yml
@@ -1,2 +1,18 @@
+#
+#  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.
+#
 ---
 hdp_repo_def: http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.3.2.0/hdp.repo

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/hadoop_setup/defaults/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/hadoop_setup/defaults/main.yml b/deployment/roles/hadoop_setup/defaults/main.yml
deleted file mode 100644
index 0c25535..0000000
--- a/deployment/roles/hadoop_setup/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for hadoop_setup

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/hadoop_setup/handlers/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/hadoop_setup/handlers/main.yml b/deployment/roles/hadoop_setup/handlers/main.yml
deleted file mode 100644
index fc19806..0000000
--- a/deployment/roles/hadoop_setup/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for hadoop_setup