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/01/29 21:04:36 UTC
[23/30] incubator-metron git commit: Improved performance of ansible
deployment by (1) specifying a file, rather than a directory,
for all 'get_url' tasks so that the file is not re-downloaded and (2) ensuring
that the yum cache is not refreshed when it
Improved performance of ansible deployment by (1) specifying a file, rather than a directory, for all 'get_url' tasks so that the file is not re-downloaded and (2) ensuring that the yum cache is not refreshed when it does not need to be
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/e1a81f8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/e1a81f8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/e1a81f8a
Branch: refs/heads/master
Commit: e1a81f8accd65b8d2963379311ae5c96484aeab1
Parents: ac91bc2
Author: Nick Allen <ni...@nickallen.org>
Authored: Tue Jan 26 13:19:39 2016 -0500
Committer: Nick Allen <ni...@nickallen.org>
Committed: Tue Jan 26 13:19:39 2016 -0500
----------------------------------------------------------------------
deployment/roles/ambari_common/tasks/main.yml | 4 +--
deployment/roles/flume/tasks/main.yml | 2 +-
deployment/roles/pycapa/tasks/main.yml | 4 +--
deployment/roles/snort/tasks/snort.yml | 29 ++++++++++++++++------
deployment/roles/yaf/tasks/yaf.yml | 6 ++---
5 files changed, 29 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e1a81f8a/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 0acefa7..830ffa9 100644
--- a/deployment/roles/ambari_common/tasks/main.yml
+++ b/deployment/roles/ambari_common/tasks/main.yml
@@ -5,7 +5,7 @@
- include: passwd_less_ssh.yml
-#
+#
# ambari uses socket.getfqdn() to find the hostname. with 'localhost.localdomain'
# in '/etc/hosts' this function will report the hostname as 'localhost.localdomain'
# rather than 'node1' as would be expected. other functions like socket.gethostname()
@@ -22,7 +22,7 @@
lineinfile: dest=/etc/hosts line="127.0.0.1 localhost"
- name: Download HDP repo
- get_url: url="{{ rhel_ambari_install_url }}" dest=/etc/yum.repos.d/
+ get_url: url="{{ rhel_ambari_install_url }}" dest=/etc/yum.repos.d/ambari.repo
- name: Install EPEL repo.
yum:
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e1a81f8a/deployment/roles/flume/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/flume/tasks/main.yml b/deployment/roles/flume/tasks/main.yml
index 61af35a..9d7f2ac 100644
--- a/deployment/roles/flume/tasks/main.yml
+++ b/deployment/roles/flume/tasks/main.yml
@@ -6,7 +6,7 @@
mode: 0644
- name: Install flume
- yum: name={{item}} state=latest update_cache=yes
+ yum: name={{item}}
with_items:
- flume
- flume-agent
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e1a81f8a/deployment/roles/pycapa/tasks/main.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/pycapa/tasks/main.yml b/deployment/roles/pycapa/tasks/main.yml
index 13c67e9..0c71b1c 100644
--- a/deployment/roles/pycapa/tasks/main.yml
+++ b/deployment/roles/pycapa/tasks/main.yml
@@ -1,6 +1,6 @@
---
- name: Install python and tcpdump
- yum: name={{item}} state=latest update_cache=no
+ yum: name={{item}}
with_items:
- python
- python-pip
@@ -20,7 +20,7 @@
- python setup.py install
- name: Install prerequisites
- yum: name=daemonize state=latest
+ yum: name=daemonize
- 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 }}"
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e1a81f8a/deployment/roles/snort/tasks/snort.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/snort/tasks/snort.yml b/deployment/roles/snort/tasks/snort.yml
index 372b33f..69652e0 100644
--- a/deployment/roles/snort/tasks/snort.yml
+++ b/deployment/roles/snort/tasks/snort.yml
@@ -3,7 +3,7 @@
yum: name="@Development tools" state=present
- name: Install snort prerequisites
- yum: name={{ item }} state=latest update_cache=yes
+ yum: name={{ item }}
with_items:
- libdnet-devel
- rpm-build
@@ -14,28 +14,41 @@
- zlib-devel
- name: Download daq
- get_url: url="https://snort.org/downloads/snort/daq-{{ daq_version }}.src.rpm" dest=/tmp
+ 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" chdir=/tmp
+ 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 state=present
+ 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" dest=/tmp
+ get_url:
+ url: "https://snort.org/downloads/snort/snort-{{ snort_version }}.src.rpm"
+ dest: "/tmp/snort-{{ snort_version }}.src.rpm"
- name: Build snort
- shell: rpmbuild --rebuild "snort-{{ snort_version }}.src.rpm" chdir=/tmp
+ shell: "rpmbuild --rebuild snort-{{ snort_version }}.src.rpm"
+ args:
+ chdir: /tmp
+ creates: /root/rpmbuild/RPMS/x86_64/snort-{{ snort_version }}.x86_64.rpm
- name: Install snort
- yum: name=/root/rpmbuild/RPMS/x86_64/snort-{{ snort_version }}.x86_64.rpm state=present
+ yum: name=/root/rpmbuild/RPMS/x86_64/snort-{{ snort_version }}.x86_64.rpm
#
# TODO download latest rules from snort website - requires credentials
#
- name: Download snort rules
- unarchive: src=snortrules-snapshot-2962.tar.gz dest=/tmp
+ unarchive:
+ src: snortrules-snapshot-2962.tar.gz
+ dest: /tmp
+ creates: /tmp/snortrules-snapshot-2962.tar.gz
- name: Install snort rules
shell: "{{ item }}"
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/e1a81f8a/deployment/roles/yaf/tasks/yaf.yml
----------------------------------------------------------------------
diff --git a/deployment/roles/yaf/tasks/yaf.yml b/deployment/roles/yaf/tasks/yaf.yml
index b7939de..351d174 100644
--- a/deployment/roles/yaf/tasks/yaf.yml
+++ b/deployment/roles/yaf/tasks/yaf.yml
@@ -3,7 +3,7 @@
yum: name="@Development tools" state=present
- name: Install prerequisites
- yum: name={{item}} state=latest update_cache=yes
+ yum: name={{ item }}
with_items:
- libpcap
- libpcap-devel
@@ -16,7 +16,7 @@
- name: Download fixbuf
get_url:
url: "http://tools.netsa.cert.org/releases/libfixbuf-{{fixbuf_version}}.tar.gz"
- dest: /tmp
+ dest: "/tmp/libfixbuf-{{fixbuf_version}}.tar.gz"
- name: Extract fixbuf tarball
unarchive:
@@ -37,7 +37,7 @@
- name: Download yaf
get_url:
url: "http://tools.netsa.cert.org/releases/yaf-{{yaf_version}}.tar.gz"
- dest: /tmp
+ dest: "/tmp/yaf-{{yaf_version}}.tar.gz"
- name: Extract yaf tarball
unarchive: