metron-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ceste...@apache.org
Subject [1/2] incubator-metron git commit: METRON-39 Replay PCAP Data closes apache/incubator-metron#25
Date Fri, 19 Feb 2016 19:15:25 GMT
Repository: incubator-metron
Updated Branches:
  refs/heads/master 5ceee2a44 -> a837619c1


http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/hadoop_setup/meta/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/hadoop_setup/meta/main.yml b/deployment/roles/hadoop_setup/meta/main.yml
deleted file mode 100644
index 62c7d35..0000000
--- a/deployment/roles/hadoop_setup/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/hadoop_setup/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/hadoop_setup/tasks/main.yml b/deployment/roles/hadoop_setup/tasks/main.yml
index d8069a0..0650a70 100644
--- a/deployment/roles/hadoop_setup/tasks/main.yml
+++ b/deployment/roles/hadoop_setup/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: Create HBase tables
   shell: echo "create '{{ item }}','t'" | hbase shell -n
@@ -12,3 +28,6 @@
   ignore_errors: yes
   with_items:
     - "{{ pycapa_topic }}"
+    - "{{ bro_topic }}"
+    - "{{ yaf_topic }}"
+    - "{{ snort_topic }}"

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/hadoop_setup/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/hadoop_setup/vars/main.yml b/deployment/roles/hadoop_setup/vars/main.yml
index 40acd3f..9747044 100644
--- a/deployment/roles/hadoop_setup/vars/main.yml
+++ b/deployment/roles/hadoop_setup/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.
+#
 ---
-# vars file for hadoop_setup
\ No newline at end of file
+kafka_home: /usr/hdp/current/kafka-broker/

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/metron_pcapservice/defaults/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/metron_pcapservice/defaults/main.yml b/deployment/roles/metron_pcapservice/defaults/main.yml
deleted file mode 100644
index a50f9ca..0000000
--- a/deployment/roles/metron_pcapservice/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/metron_pcapservice/handlers/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/metron_pcapservice/handlers/main.yml b/deployment/roles/metron_pcapservice/handlers/main.yml
deleted file mode 100644
index a4c1162..0000000
--- a/deployment/roles/metron_pcapservice/handlers/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: restart elasticsearch
-  service: name=elasticsearch state=restarted

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/metron_pcapservice/meta/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/metron_pcapservice/meta/main.yml b/deployment/roles/metron_pcapservice/meta/main.yml
deleted file mode 100644
index 62c7d35..0000000
--- a/deployment/roles/metron_pcapservice/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/metron_pcapservice/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/metron_pcapservice/tasks/main.yml b/deployment/roles/metron_pcapservice/tasks/main.yml
index 553ef96..9011e7b 100644
--- a/deployment/roles/metron_pcapservice/tasks/main.yml
+++ b/deployment/roles/metron_pcapservice/tasks/main.yml
@@ -1,5 +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 metron_pcapservice
 - name: Create Metron streaming directories
   file: path={{ metron_directory }}/{{ item.name }}  state=directory mode=0755
   with_items:
@@ -11,7 +26,7 @@
     src: "{{ pcapservice_jar_path }}"
     dest: "{{ metron_directory }}/lib/"
 
-- name: alternatives link for "java"
+- name: Alternatives link for "java"
   alternatives: name={{ item.name }} link={{ item.link }}  path={{ item.path }}
   with_items:
     - { name: java, link: /usr/bin/java, path: /usr/jdk64/jdk1.8.0_40/bin/java}

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/metron_pcapservice/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/metron_pcapservice/vars/main.yml b/deployment/roles/metron_pcapservice/vars/main.yml
index e4c552f..4213c86 100644
--- a/deployment/roles/metron_pcapservice/vars/main.yml
+++ b/deployment/roles/metron_pcapservice/vars/main.yml
@@ -1,5 +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 metron_pcapservice
 metron_version: 0.1BETA
 metron_directory: /usr/metron/{{ metron_version }}
 pcapservice_jar_name: Metron-Pcap_Service-{{ metron_version }}-jar-with-dependencies.jar

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/metron_streaming/defaults/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/metron_streaming/defaults/main.yml b/deployment/roles/metron_streaming/defaults/main.yml
deleted file mode 100644
index a50f9ca..0000000
--- a/deployment/roles/metron_streaming/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/metron_streaming/handlers/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/metron_streaming/handlers/main.yml b/deployment/roles/metron_streaming/handlers/main.yml
index a4c1162..112c5ca 100644
--- a/deployment/roles/metron_streaming/handlers/main.yml
+++ b/deployment/roles/metron_streaming/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/metron_streaming/meta/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/metron_streaming/meta/main.yml b/deployment/roles/metron_streaming/meta/main.yml
deleted file mode 100644
index 62c7d35..0000000
--- a/deployment/roles/metron_streaming/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/metron_streaming/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/metron_streaming/tasks/main.yml b/deployment/roles/metron_streaming/tasks/main.yml
index 0164d55..5eba66d 100644
--- a/deployment/roles/metron_streaming/tasks/main.yml
+++ b/deployment/roles/metron_streaming/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: Create Metron streaming directories
   file: path="{{ metron_directory }}/{{ item.name }}"  state=directory mode=0755
@@ -81,6 +97,3 @@
     - "{{ metron_directory }}/config/topologies/bro/remote.yaml"
     - "{{ metron_directory }}/config/topologies/snort/remote.yaml"
     - "{{ metron_directory }}/config/topologies/yaf/remote.yaml"
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/metron_streaming/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/metron_streaming/vars/main.yml b/deployment/roles/metron_streaming/vars/main.yml
index a318db3..dbc492b 100644
--- a/deployment/roles/metron_streaming/vars/main.yml
+++ b/deployment/roles/metron_streaming/vars/main.yml
@@ -1,5 +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 elasticsearch
 metron_directory: /usr/metron/{{ metron_version }}
 metron_jar_name: Metron-Topologies-{{ metron_version }}.jar
 metron_dataloads_name: Metron-DataLoads-{{ metron_version }}-archive.tar.gz
@@ -7,3 +22,7 @@ metron_jar_path: "{{ playbook_dir }}/../../metron-streaming/Metron-Topologies/ta
 metron_dataloads_path: "{{ playbook_dir }}/../../metron-streaming/Metron-DataLoads/target/{{ metron_dataloads_name }}"
 metron_src_config_path: "{{ playbook_dir }}/../../metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs"
 metron_properties_config_path: "{{ metron_directory }}/config/etc/env/config.properties"
+elasticsearch_config_path: /etc/elasticsearch
+elasticsearch_cluster_name: metron
+elasticsearch_transport_port: 9300
+hbase_config_path: "/etc/hbase/conf"

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/metron_ui/defaults/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/metron_ui/defaults/main.yml b/deployment/roles/metron_ui/defaults/main.yml
deleted file mode 100644
index a50f9ca..0000000
--- a/deployment/roles/metron_ui/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/metron_ui/handlers/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/metron_ui/handlers/main.yml b/deployment/roles/metron_ui/handlers/main.yml
deleted file mode 100644
index a4c1162..0000000
--- a/deployment/roles/metron_ui/handlers/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: restart elasticsearch
-  service: name=elasticsearch state=restarted

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/metron_ui/meta/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/metron_ui/meta/main.yml b/deployment/roles/metron_ui/meta/main.yml
deleted file mode 100644
index 62c7d35..0000000
--- a/deployment/roles/metron_ui/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/metron_ui/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/metron_ui/tasks/main.yml b/deployment/roles/metron_ui/tasks/main.yml
index 69946b6..48d5c20 100644
--- a/deployment/roles/metron_ui/tasks/main.yml
+++ b/deployment/roles/metron_ui/tasks/main.yml
@@ -1,5 +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 metron_ui
 - name: Install Metron UI dependencies
   yum: pkg={{ item.package }} state=installed
   with_items:
@@ -50,4 +65,4 @@
     mode: 0644
 
 - name: Start Metron UI service
-  shell: source ~/.bashrc && opensoc-ui start
\ No newline at end of file
+  shell: source ~/.bashrc && opensoc-ui start

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/metron_ui/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/metron_ui/vars/main.yml b/deployment/roles/metron_ui/vars/main.yml
index 04b599a..ff647ae 100644
--- a/deployment/roles/metron_ui/vars/main.yml
+++ b/deployment/roles/metron_ui/vars/main.yml
@@ -1,5 +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 elasticsearch
 metron_version: 0.1BETA
 metron_directory: /usr/metron/{{ metron_version }}
 metron_jar_url: http://192.168.1.174:8080/repository/internal/com/opensoc/OpenSOC-Topologies/{{ metron_version }}/OpenSOC-Topologies-{{ metron_version }}.jar

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/pcap_replay/README.md
----------------------------------------------------------------------
diff --git a/deployment/roles/pcap_replay/README.md b/deployment/roles/pcap_replay/README.md
new file mode 100644
index 0000000..d6691a4
--- /dev/null
+++ b/deployment/roles/pcap_replay/README.md
@@ -0,0 +1,27 @@
+Pcap Replay
+===========
+
+This will install components necessary to easily replay packet capture data to support functional performance, and load testing of Metron.
+
+Getting Started
+---------------
+
+Pcap Replay is installed as a System V service at `/etc/init.d/pcap-replay`.  To start the service, run the following command.
+
+```
+service pcap-replay start
+```
+
+An example packet capture file has been installed at `/opt/pcap-replay/example.pcap`.  By default, the network traffic contained within this file is continually replayed.  That's right, it will never, ever stop.  
+
+To replay your own packet capture data, simply add any number of files containing `libpcap` formatted packet capture data to `/opt/pcap-replay`.  The files must end with the `.pcap` file extension.  To pick up newly installed files, simply restart the service.
+
+```
+service pcap-replay restart
+```
+
+All nodes on the same subnet with their network interface set to promiscuous mode will then be able to capture the network traffic being replayed.  To validate, simply run something like the following.
+
+```
+tcpdump -i eth1
+```

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/pcap_replay/files/example.pcap
----------------------------------------------------------------------
diff --git a/deployment/roles/pcap_replay/files/example.pcap b/deployment/roles/pcap_replay/files/example.pcap
new file mode 100644
index 0000000..06594ec
Binary files /dev/null and b/deployment/roles/pcap_replay/files/example.pcap differ

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/pcap_replay/files/pcap-replay
----------------------------------------------------------------------
diff --git a/deployment/roles/pcap_replay/files/pcap-replay b/deployment/roles/pcap_replay/files/pcap-replay
new file mode 100644
index 0000000..074406d
--- /dev/null
+++ b/deployment/roles/pcap_replay/files/pcap-replay
@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+# pcap replay daemon
+# chkconfig: 345 20 80
+# description: Replays packet capture data stored in libpcap format
+# processname: pcap-replay
+
+DAEMON_PATH="/opt/pcap-replay"
+PCAPIN=`ls $DAEMON_PATH/*.pcap 2> /dev/null`
+IFACE="eth1"
+DAEMON=/usr/local/bin/tcpreplay
+DAEMONOPTS="--intf1=$IFACE --loop=0 $PCAPIN"
+
+NAME=pcap-replay
+DESC="Replays packet capture data stored in libpcap format"
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+case "$1" in
+  start)
+    printf "%-50s" "Starting $NAME..."
+
+    # ensure that a pcap file exists to replay
+    if [ -z "$PCAPIN" ]; then
+      printf "%s: %s\n" "Fail: No pcap files found" $DAEMON_PATH
+    else
+      # kick-off the daemon
+      cd $DAEMON_PATH
+      PID=`$DAEMON $DAEMONOPTS > /dev/null 2>&1 & echo $!`
+      if [ -z $PID ]; then
+          printf "%s\n" "Fail"
+      else
+          echo $PID > $PIDFILE
+          printf "%s\n" "Ok"
+      fi
+    fi
+  ;;
+
+  status)
+    printf "%-50s" "Checking $NAME..."
+    if [ -f $PIDFILE ]; then
+      PID=`cat $PIDFILE`
+      if [ -z "`ps axf | grep ${PID} | grep -v grep`" ]; then
+        printf "%s\n" "Process dead but pidfile exists"
+      else
+        echo "Running"
+      fi
+    else
+      printf "%s\n" "Service not running"
+    fi
+  ;;
+
+  stop)
+    printf "%-50s" "Stopping $NAME"
+    PID=`cat $PIDFILE`
+    cd $DAEMON_PATH
+    if [ -f $PIDFILE ]; then
+        kill -HUP $PID
+        printf "%s\n" "Ok"
+        rm -f $PIDFILE
+    else
+        printf "%s\n" "pidfile not found"
+    fi
+  ;;
+
+  restart)
+    $0 stop
+    $0 start
+  ;;
+
+  *)
+    echo "Usage: $0 {status|start|stop|restart}"
+    exit 1
+esac

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/pcap_replay/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/pcap_replay/tasks/main.yml b/deployment/roles/pcap_replay/tasks/main.yml
new file mode 100644
index 0000000..7a9a2d9
--- /dev/null
+++ b/deployment/roles/pcap_replay/tasks/main.yml
@@ -0,0 +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.
+#
+---
+- include: tcpreplay.yml
+
+- include: service.yml
+
+- name: Start the pcap-replay service
+  service: name=pcap-replay state=started

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/pcap_replay/tasks/service.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/pcap_replay/tasks/service.yml b/deployment/roles/pcap_replay/tasks/service.yml
new file mode 100644
index 0000000..351bbe0
--- /dev/null
+++ b/deployment/roles/pcap_replay/tasks/service.yml
@@ -0,0 +1,28 @@
+#
+#  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: Create pcap directory
+  file: path={{ pcap_replay_path }} state=directory mode=0755
+
+- name: Install init.d service script
+  copy: src=pcap-replay dest=/etc/init.d/pcap-replay
+
+- name: Set permissions on service script
+  file: path=/etc/init.d/pcap-replay mode=0755
+
+- name: Install example pcap file
+  copy: src=example.pcap dest={{ pcap_replay_path }}/

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/pcap_replay/tasks/tcpreplay.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/pcap_replay/tasks/tcpreplay.yml b/deployment/roles/pcap_replay/tasks/tcpreplay.yml
new file mode 100644
index 0000000..73be4ab
--- /dev/null
+++ b/deployment/roles/pcap_replay/tasks/tcpreplay.yml
@@ -0,0 +1,45 @@
+#
+#  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 }}
+  with_items:
+    - "@Development tools"
+    - libpcap
+    - libpcap-devel
+
+- name: Download tcpreplay
+  get_url:
+    url: "https://github.com/appneta/tcpreplay/releases/download/v{{ tcpreplay_version }}/tcpreplay-{{ tcpreplay_version }}.tar.gz"
+    dest: "/tmp/tcpreplay-{{ tcpreplay_version }}.tar.gz"
+
+- name: Extract tcpreplay tarball
+  unarchive:
+    src: "/tmp/tcpreplay-{{ tcpreplay_version }}.tar.gz"
+    dest: /opt
+    copy: no
+    creates: "/opt/tcpreplay-{{ tcpreplay_version }}"
+
+- name: Compile and install tcpreplay
+  shell: "{{ item }}"
+  args:
+    chdir: "/opt/tcpreplay-{{ tcpreplay_version }}"
+    creates: /usr/local/bin/tcpreplay
+  with_items:
+    - ./configure
+    - make
+    - make install

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/pcap_replay/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/pcap_replay/vars/main.yml b/deployment/roles/pcap_replay/vars/main.yml
new file mode 100644
index 0000000..a2bb5c2
--- /dev/null
+++ b/deployment/roles/pcap_replay/vars/main.yml
@@ -0,0 +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.
+#
+---
+tcpreplay_version: 4.1.1
+pcap_replay_path: /opt/pcap-replay

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/pycapa/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/pycapa/tasks/main.yml b/deployment/roles/pycapa/tasks/main.yml
index 0c71b1c..4324ced 100644
--- a/deployment/roles/pycapa/tasks/main.yml
+++ b/deployment/roles/pycapa/tasks/main.yml
@@ -1,4 +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.
+#
 ---
+- name: Install EPEL repository
+  yum: name=epel-release
+
 - name: Install python and tcpdump
   yum: name={{item}}
   with_items:
@@ -19,10 +38,18 @@
     - pip install argparse
     - python setup.py install
 
+- name: Turn on promiscuous mode for {{ sniff_interface }}
+  shell: "ip link set {{ sniff_interface }} promisc on"
+
 - name: Install prerequisites
   yum: name=daemonize
 
+- set_fact:
+    pycapa: /opt/pycapa/pycapa/pycapa_cli.py
+    pycapa_log: /var/log/pycapa.log
+    pycapa_lock: /var/lock/subsys/pycapa
+
 - name: Start pycapa
-  shell: "daemonize -c {{ pycapa_home }} -e /var/log/pycapa.log -o /var/log/pycapa.log -l /var/lock/subsys/pycapa /usr/bin/python /opt/pycapa/pycapa/pycapa_cli.py  -z {{ zookeeper_url }} -t {{ pycapa_topic }} -i {{ iface }}"
+  shell: "daemonize -c {{ pycapa_home }} -e {{ pycapa_log }} -o {{ pycapa_log }} -l {{ pycapa_lock }} /usr/bin/python {{ pycapa }}  -z {{ zookeeper_url }} -t {{ pycapa_topic }} -i {{ sniff_interface }}"
   args:
-    creates: /var/lock/subsys/pycapa
+    creates: "{{ pycapa_lock }}"

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/pycapa/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/pycapa/vars/main.yml b/deployment/roles/pycapa/vars/main.yml
index 3d7ed3a..d47fa65 100644
--- a/deployment/roles/pycapa/vars/main.yml
+++ b/deployment/roles/pycapa/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.
+#
 ---
 pycapa_repo: https://github.com/OpenSOC/pycapa.git
 pycapa_home: /opt/pycapa

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/snort/files/flume-snort.conf
----------------------------------------------------------------------
diff --git a/deployment/roles/snort/files/flume-snort.conf b/deployment/roles/snort/files/flume-snort.conf
index 152228e..7dea516 100644
--- a/deployment/roles/snort/files/flume-snort.conf
+++ b/deployment/roles/snort/files/flume-snort.conf
@@ -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.
+#
 
 snort.sources = exec-source
 snort.channels = memory-channel

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/snort/tasks/daq.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/snort/tasks/daq.yml b/deployment/roles/snort/tasks/daq.yml
new file mode 100644
index 0000000..8f0dcae
--- /dev/null
+++ b/deployment/roles/snort/tasks/daq.yml
@@ -0,0 +1,30 @@
+#
+#  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 daq
+  get_url:
+    url: "https://snort.org/downloads/snort/daq-{{ daq_version }}.src.rpm"
+    dest: "/tmp/daq-{{ daq_version }}.src.rpm"
+
+- name: Build daq
+  shell: "rpmbuild --rebuild daq-{{ daq_version }}.src.rpm"
+  args:
+    chdir: /tmp
+    creates: /root/rpmbuild/RPMS/x86_64/daq-{{ daq_version }}.x86_64.rpm
+
+- name: Install daq
+  yum: name=/root/rpmbuild/RPMS/x86_64/daq-{{ daq_version }}.x86_64.rpm

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/snort/tasks/flume.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/snort/tasks/flume.yml b/deployment/roles/snort/tasks/flume.yml
index 5bb5b0b..e5bd593 100644
--- a/deployment/roles/snort/tasks/flume.yml
+++ b/deployment/roles/snort/tasks/flume.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 flume configurations
   copy: src={{ item.src }} dest={{ item.dest }}

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/snort/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/snort/tasks/main.yml b/deployment/roles/snort/tasks/main.yml
index 7e7029a..43b9c16 100644
--- a/deployment/roles/snort/tasks/main.yml
+++ b/deployment/roles/snort/tasks/main.yml
@@ -1,11 +1,45 @@
+#
+#  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 libselinux-python
-  yum: name=libselinux-python
+- name: Install EPEL repository
+  yum: name=epel-release
+
+- name: Install snort prerequisites
+  yum: name={{ item }}
+  with_items:
+    - "@Development tools"
+    - libdnet-devel
+    - rpm-build
+    - libpcap
+    - libpcap-devel
+    - pcre
+    - pcre-devel
+    - zlib-devel
+    - libselinux-python
+
+- include: daq.yml
 
 - include: snort.yml
 
 - include: flume.yml
 
+- name: Turn on promiscuous mode for {{ sniff_interface }}
+  shell: "ip link set {{ sniff_interface }} promisc on"
+
 - name: Start snort
   service: name=snortd state=restarted
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/snort/tasks/snort.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/snort/tasks/snort.yml b/deployment/roles/snort/tasks/snort.yml
index 66e770e..52339fc 100644
--- a/deployment/roles/snort/tasks/snort.yml
+++ b/deployment/roles/snort/tasks/snort.yml
@@ -1,35 +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.
+#
 ---
-- name: Install EPEL repository
-  yum: name=epel-release
-
-- name: Install development tools
-  yum: name="@Development tools" state=present
-
-- name: Install snort prerequisites
-  yum: name={{ item }}
-  with_items:
-    - libdnet-devel
-    - rpm-build
-    - libpcap
-    - libpcap-devel
-    - pcre
-    - pcre-devel
-    - zlib-devel
-
-- name: Download daq
-  get_url:
-    url: "https://snort.org/downloads/snort/daq-{{ daq_version }}.src.rpm"
-    dest: "/tmp/daq-{{ daq_version }}.src.rpm"
-
-- name: Build daq
-  shell: "rpmbuild --rebuild daq-{{ daq_version }}.src.rpm"
-  args:
-    chdir: /tmp
-    creates: /root/rpmbuild/RPMS/x86_64/daq-{{ daq_version }}.x86_64.rpm
-
-- name: Install daq
-  yum: name=/root/rpmbuild/RPMS/x86_64/daq-{{ daq_version }}.x86_64.rpm
-
 - name: Download snort
   get_url:
     url: "https://snort.org/downloads/snort/snort-{{ snort_version }}.src.rpm"
@@ -83,7 +68,6 @@
 - name: Configure sysconfig
   lineinfile: dest=/etc/sysconfig/snort regexp="{{ item.regexp }}" line="{{ item.line }}"
   with_items:
-    - { regexp: "^ALERTMODE=.*$", line: "ALERTMODE=" }
+    - { regexp: "^ALERTMODE=.*$",     line: "ALERTMODE=" }
     - { regexp: "^NO_PACKET_LOG=.*$", line: "NO_PACKET_LOG=1" }
-
-
+    - { regexp: "^INTERFACE=.*$",     line: "INTERFACE={{ sniff_interface }}" }

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/snort/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/snort/vars/main.yml b/deployment/roles/snort/vars/main.yml
index 784430e..df66171 100644
--- a/deployment/roles/snort/vars/main.yml
+++ b/deployment/roles/snort/vars/main.yml
@@ -1,3 +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.
+#
 ---
 snort_version: 2.9.8.0-1
 daq_version: 2.0.6-1
+snort_topic: snort
+snort_alert_csv_path: /var/log/snort/alert.csv

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/yaf/files/flume-ipfix.conf
----------------------------------------------------------------------
diff --git a/deployment/roles/yaf/files/flume-ipfix.conf b/deployment/roles/yaf/files/flume-ipfix.conf
deleted file mode 100644
index fa97ca7..0000000
--- a/deployment/roles/yaf/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/yaf/files/start-yaf.sh
----------------------------------------------------------------------
diff --git a/deployment/roles/yaf/files/start-yaf.sh b/deployment/roles/yaf/files/start-yaf.sh
deleted file mode 100644
index af52486..0000000
--- a/deployment/roles/yaf/files/start-yaf.sh
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/bin/yaf --in eth0 --live pcap --idle-timeout 0 | /usr/local/bin/yafscii --tabular --print-header | /usr/hdp/current/kafka-broker/bin/kafka-console-producer.sh --broker-list $1 --topic ipfix
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/yaf/tasks/fixbuf.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/yaf/tasks/fixbuf.yml b/deployment/roles/yaf/tasks/fixbuf.yml
new file mode 100644
index 0000000..9cd9244
--- /dev/null
+++ b/deployment/roles/yaf/tasks/fixbuf.yml
@@ -0,0 +1,37 @@
+#
+#  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 fixbuf
+  get_url:
+    url: "http://tools.netsa.cert.org/releases/libfixbuf-{{fixbuf_version}}.tar.gz"
+    dest: "/tmp/libfixbuf-{{fixbuf_version}}.tar.gz"
+
+- name: Extract fixbuf tarball
+  unarchive:
+    src: "/tmp/libfixbuf-{{fixbuf_version}}.tar.gz"
+    dest: /tmp
+    copy: no
+    creates: "/tmp/libfixbuf-{{fixbuf_version}}"
+
+- name: Compile and Install fixbuf
+  shell: "{{item}}"
+  args:
+    chdir: "/tmp/libfixbuf-{{fixbuf_version}}"
+  with_items:
+    - ./configure
+    - make
+    - make install

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/yaf/tasks/flume.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/yaf/tasks/flume.yml b/deployment/roles/yaf/tasks/flume.yml
deleted file mode 100644
index 8c8db29..0000000
--- a/deployment/roles/yaf/tasks/flume.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-- name: Install flume configurations
-  copy: src={{ item.src }} dest={{ item.dest }}
-  with_items:
-    - { src: flume-ipfix.conf, dest: /etc/flume/conf/flume-ipfix.conf }
-
-- name: Set kafka broker in flume
-  lineinfile: >
-    dest="{{ item.dest }}"
-    regexp="{{ item.regexp }}"
-    line="{{ item.line }}"
-    state=present
-  with_items:
-    - { dest: /etc/flume/conf/flume-ipfix.conf,
-        regexp: '^ipfix\.sinks\.kafka-sink\.brokerList.*$',
-        line: 'ipfix.sinks.kafka-sink.brokerList = {{ kafka_broker_url }}' }
-
-- name: Set kafka topics in flume
-  lineinfile: >
-    dest="{{ item.dest }}"
-    regexp="{{ item.regexp }}"
-    line="{{ item.line }}"
-    state=present
-  with_items:
-    - { dest: /etc/flume/conf/flume-ipfix.conf,
-        regexp: '^ipfix\.sinks\.kafka-sink\.topic.*$',
-        line: 'ipfix.sinks.kafka-sink.topic = {{ yaf_topic }}'}

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/yaf/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/yaf/tasks/main.yml b/deployment/roles/yaf/tasks/main.yml
index 552fb44..09215f9 100644
--- a/deployment/roles/yaf/tasks/main.yml
+++ b/deployment/roles/yaf/tasks/main.yml
@@ -1,10 +1,24 @@
+#
+#  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 development tools
-  yum: name="@Development tools" state=present
-
 - name: Install prerequisites
   yum: name={{ item }}
   with_items:
+    - "@Development tools"
     - libpcap
     - libpcap-devel
     - pcre
@@ -13,62 +27,21 @@
     - zlib
     - zlib-devel
 
-- name: Download fixbuf
-  get_url:
-    url: "http://tools.netsa.cert.org/releases/libfixbuf-{{fixbuf_version}}.tar.gz"
-    dest: "/tmp/libfixbuf-{{fixbuf_version}}.tar.gz"
-
-- name: Extract fixbuf tarball
-  unarchive:
-    src: "/tmp/libfixbuf-{{fixbuf_version}}.tar.gz"
-    dest: /tmp
-    copy: no
-    creates: "/tmp/libfixbuf-{{fixbuf_version}}"
-
-- name: Compile and Install fixbuf
-  shell: "{{item}}"
-  args:
-    chdir: "/tmp/libfixbuf-{{fixbuf_version}}"
-  with_items:
-    - ./configure
-    - make
-    - make install
+- include: fixbuf.yml
 
-- name: Download yaf
-  get_url:
-    url: "http://tools.netsa.cert.org/releases/yaf-{{yaf_version}}.tar.gz"
-    dest: "/tmp/yaf-{{yaf_version}}.tar.gz"
-
-- name: Extract yaf tarball
-  unarchive:
-    src: "/tmp/yaf-{{yaf_version}}.tar.gz"
-    dest: /tmp
-    copy: no
-    creates: /usr/local/bin/yaf
-
-- name: Compile and install yaf
-  shell: "{{item}}"
-  args:
-    chdir: "/tmp/yaf-{{yaf_version}}"
-    creates: /usr/local/bin/yaf
-  with_items:
-    - ./configure --enable-applabel --enable-plugins
-    - make
-    - make install
+- include: yaf.yml
 
-- name: Create Yaf home directory
-  file:
-    path: "{{ yaf_home }}"
-    state: directory
-    mode: 0755
+- name: Turn on promiscuous mode for {{ sniff_interface }}
+  shell: "ip link set {{ sniff_interface }} promisc on"
 
-- name: Add Yaf startup script
-  copy:
-    src: start-yaf.sh
-    dest: "{{ yaf_home }}/start-yaf.sh"
-    mode: 0755
+- set_fact:
+    yaf: /usr/local/bin/yaf
+    yafscii: /usr/local/bin/yafscii
+    yaf_log: /var/log/yaf.log
+    yaf_lock: /var/lock/subsys/yaf
+    kafka_prod: /usr/hdp/current/kafka-broker/bin/kafka-console-producer.sh
 
 - name: Start yaf
-  shell: "daemonize -c {{ yaf_home }} -e /var/log/yaf.log -o /var/log/yaf.log -l /var/lock/subsys/yaf {{yaf_home}}/start-yaf.sh {{ kafka_broker_url }}"
+  shell: "daemonize -c {{ yaf_home }} -e {{ yaf_log }} -o {{ yaf_log }} -l {{ yaf_lock }} {{ yaf }} --in {{ sniff_interface }} --live pcap | {{ yafscii }} --tabular | {{ kafka_prod }} --broker-list {{ kafka_broker_url }} --topic {{ yaf_topic }}"
   args:
-    creates: /var/lock/subsys/yaf
\ No newline at end of file
+    creates: "{{ yaf_lock }}"

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/yaf/tasks/yaf.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/yaf/tasks/yaf.yml b/deployment/roles/yaf/tasks/yaf.yml
index a65830e..db49305 100644
--- a/deployment/roles/yaf/tasks/yaf.yml
+++ b/deployment/roles/yaf/tasks/yaf.yml
@@ -1,39 +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.
+#
 ---
-- name: Install development tools
-  yum: name="@Development tools" state=present
-
-- name: Install prerequisites
-  yum: name={{ item }}
-  with_items:
-    - libpcap
-    - libpcap-devel
-    - pcre
-    - pcre-devel
-    - glib2-devel
-    - zlib
-    - zlib-devel
-
-- name: Download fixbuf
-  get_url:
-    url: "http://tools.netsa.cert.org/releases/libfixbuf-{{fixbuf_version}}.tar.gz"
-    dest: "/tmp/libfixbuf-{{fixbuf_version}}.tar.gz"
-
-- name: Extract fixbuf tarball
-  unarchive:
-    src: "/tmp/libfixbuf-{{fixbuf_version}}.tar.gz"
-    dest: /tmp
-    copy: no
-    creates: "/tmp/libfixbuf-{{fixbuf_version}}"
-
-- name: Compile and Install fixbuf
-  shell: "{{item}}"
-  args:
-    chdir: "/tmp/libfixbuf-{{fixbuf_version}}"
-  with_items:
-    - ./configure
-    - make
-    - make install
-
 - name: Download yaf
   get_url:
     url: "http://tools.netsa.cert.org/releases/yaf-{{yaf_version}}.tar.gz"
@@ -61,14 +42,3 @@
     path: "{{ yaf_home }}"
     state: directory
     mode: 0755
-
-- name: Add Yaf startup script
-  copy:
-    src: start-yaf.sh
-    dest: "{{ yaf_home }}/start-yaf.sh"
-    mode: 0755
-
-- name: Start yaf
-  shell: "daemonize -c {{ yaf_home }} -e /var/log/yaf.log -o /var/log/yaf.log -l /var/lock/subsys/yaf {{yaf_home}}/start-yaf.sh {{ kafka_broker_url }}"
-  args:
-    creates: /var/lock/subsys/yaf

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/roles/yaf/vars/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/yaf/vars/main.yml b/deployment/roles/yaf/vars/main.yml
index d88794b..967d479 100644
--- a/deployment/roles/yaf/vars/main.yml
+++ b/deployment/roles/yaf/vars/main.yml
@@ -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.
+#
 ---
 fixbuf_version: 1.7.1
 yaf_version: 2.8.0
 yaf_home: /opt/yaf
+yaf_topic: ipfix

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/vagrant/multinode-vagrant/Vagrantfile
----------------------------------------------------------------------
diff --git a/deployment/vagrant/multinode-vagrant/Vagrantfile b/deployment/vagrant/multinode-vagrant/Vagrantfile
index 052168c..9309786 100644
--- a/deployment/vagrant/multinode-vagrant/Vagrantfile
+++ b/deployment/vagrant/multinode-vagrant/Vagrantfile
@@ -1,5 +1,19 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
+#
+#  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 = [
   { hostname: "node1", ip: "192.168.66.101", memory: "2048", cpus: 2 },
@@ -19,17 +33,22 @@ Vagrant.configure(2) do |config|
   config.hostmanager.manage_host = true
 
   # define each host
-  hosts.each_with_index do |hosts, index|
-    config.vm.define hosts[:hostname] do |node|
+  hosts.each_with_index do |host, index|
+    config.vm.define host[:hostname] do |node|
 
       # host settings
-      node.vm.hostname = hosts[:hostname]
-      node.vm.network "private_network", ip: hosts[:ip]
+      node.vm.hostname = host[:hostname]
+      node.vm.network "private_network", ip: host[:ip]
 
       # vm settings
       node.vm.provider "virtualbox" do |vb|
-        vb.memory = hosts[:memory]
-        vb.cpus = hosts[:cpus]
+        vb.memory = host[:memory]
+        vb.cpus = host[:cpus]
+
+        # enable promisc mode on the network interface
+        if host.has_key?(:promisc)
+          vb.customize ["modifyvm", :id, "--nicpromisc#{host[:promisc]}", "allow-all"]
+        end
       end
 
       # provisioning; only after all hosts created

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/vagrant/multinode-vagrant/ansible.cfg
----------------------------------------------------------------------
diff --git a/deployment/vagrant/multinode-vagrant/ansible.cfg b/deployment/vagrant/multinode-vagrant/ansible.cfg
index 1ef9cff..9c650c2 100644
--- a/deployment/vagrant/multinode-vagrant/ansible.cfg
+++ b/deployment/vagrant/multinode-vagrant/ansible.cfg
@@ -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.
+#
+
 [defaults]
 host_key_checking = false
 library = ../../extra_modules

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/vagrant/singlenode-vagrant/Vagrantfile
----------------------------------------------------------------------
diff --git a/deployment/vagrant/singlenode-vagrant/Vagrantfile b/deployment/vagrant/singlenode-vagrant/Vagrantfile
index 955535c..98413d6 100644
--- a/deployment/vagrant/singlenode-vagrant/Vagrantfile
+++ b/deployment/vagrant/singlenode-vagrant/Vagrantfile
@@ -1,9 +1,27 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-hosts = [
-  { hostname: "node1", ip: "192.168.66.121", memory: "8192", cpus: 2 }
-]
+#
+#  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 = [{
+    hostname: "node1",
+    ip: "192.168.66.121",
+    memory: "8192",
+    cpus: 4,
+    promisc: 2  # enables promisc on the 'Nth' network interface
+}]
 
 Vagrant.configure(2) do |config|
 
@@ -16,17 +34,22 @@ Vagrant.configure(2) do |config|
   config.hostmanager.manage_host = true
 
   # host definition
-  hosts.each_with_index do |hosts, index|
-    config.vm.define hosts[:hostname] do |node|
+  hosts.each_with_index do |host, index|
+    config.vm.define host[:hostname] do |node|
 
       # host settings
-      node.vm.hostname = hosts[:hostname]
-      node.vm.network "private_network", ip: hosts[:ip]
+      node.vm.hostname = host[:hostname]
+      node.vm.network "private_network", ip: host[:ip]
 
       # vm settings
       node.vm.provider "virtualbox" do |vb|
-        vb.memory = hosts[:memory]
-        vb.cpus = hosts[:cpus]
+        vb.memory = host[:memory]
+        vb.cpus = host[:cpus]
+
+        # enable promisc mode on the network interface
+        if host.has_key?(:promisc)
+          vb.customize ["modifyvm", :id, "--nicpromisc#{host[:promisc]}", "allow-all"]
+        end
       end
     end
   end

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a837619c/deployment/vagrant/singlenode-vagrant/ansible.cfg
----------------------------------------------------------------------
diff --git a/deployment/vagrant/singlenode-vagrant/ansible.cfg b/deployment/vagrant/singlenode-vagrant/ansible.cfg
index 1ef9cff..9c650c2 100644
--- a/deployment/vagrant/singlenode-vagrant/ansible.cfg
+++ b/deployment/vagrant/singlenode-vagrant/ansible.cfg
@@ -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.
+#
+
 [defaults]
 host_key_checking = false
 library = ../../extra_modules


Mime
View raw message