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/06/24 14:00:32 UTC

incubator-metron git commit: METRON-243 Ensure templates are installed on all search hosts. (nickwallen via cestella) closes apache/incubator-metron#175

Repository: incubator-metron
Updated Branches:
  refs/heads/master 112a770f7 -> 3f057c6fc


METRON-243 Ensure templates are installed on all search hosts. (nickwallen via cestella) closes apache/incubator-metron#175


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

Branch: refs/heads/master
Commit: 3f057c6fce70149ee07db6af2122ffe7087eda31
Parents: 112a770
Author: nickwallen <ni...@nickallen.org>
Authored: Fri Jun 24 10:00:21 2016 -0400
Committer: cstella <ce...@gmail.com>
Committed: Fri Jun 24 10:00:21 2016 -0400

----------------------------------------------------------------------
 .../metron_elasticsearch_templates/tasks/load_templates.yml  | 8 ++++----
 .../roles/metron_elasticsearch_templates/tasks/main.yml      | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/3f057c6f/metron-deployment/roles/metron_elasticsearch_templates/tasks/load_templates.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/metron_elasticsearch_templates/tasks/load_templates.yml b/metron-deployment/roles/metron_elasticsearch_templates/tasks/load_templates.yml
index 6e564de..812569d 100644
--- a/metron-deployment/roles/metron_elasticsearch_templates/tasks/load_templates.yml
+++ b/metron-deployment/roles/metron_elasticsearch_templates/tasks/load_templates.yml
@@ -20,14 +20,14 @@
 
 - name : Wait for Elasticsearch Host to Start
   wait_for:
-    host: "{{ groups.search[0] }}"
+    host: "{{ inventory_hostname }}"
     port: "{{ elasticsearch_web_port }}"
     delay: 10
     timeout: 300
 
 - name: Wait for Index to Become Available
   uri:
-    url: "http://{{ groups.search[0] }}:{{ elasticsearch_web_port }}/_cat/health"
+    url: "http://{{ inventory_hostname }}:{{ elasticsearch_web_port }}/_cat/health"
     method: GET
     status_code: 200
     return_content: yes
@@ -38,7 +38,7 @@
 
 - name: Add Elasticsearch templates for topologies
   uri:
-    url: "http://{{ groups.search[0] }}:{{ elasticsearch_web_port }}/_template/{{ item | basename | replace('.template','') }}"
+    url: "http://{{ inventory_hostname }}:{{ elasticsearch_web_port }}/_template/{{ item | basename | replace('.template','') }}"
     method: PUT
     body: "{{ lookup('file',item) }}"
     status_code: 200
@@ -46,7 +46,7 @@
 
 - name: Validate Elasticsearch templates
   uri:
-    url: "http://{{ groups.search[0] }}:{{ elasticsearch_web_port }}/_template/{{ item | basename | replace('.template','') }}"
+    url: "http://{{ inventory_hostname }}:{{ elasticsearch_web_port }}/_template/{{ item | basename | replace('.template','') }}"
     method: HEAD
     body: "{{ lookup('file',item) }}"
     status_code: 200

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/3f057c6f/metron-deployment/roles/metron_elasticsearch_templates/tasks/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/roles/metron_elasticsearch_templates/tasks/main.yml b/metron-deployment/roles/metron_elasticsearch_templates/tasks/main.yml
index 16aa0be..61fb625 100644
--- a/metron-deployment/roles/metron_elasticsearch_templates/tasks/main.yml
+++ b/metron-deployment/roles/metron_elasticsearch_templates/tasks/main.yml
@@ -16,4 +16,3 @@
 #
 ---
 - include: load_templates.yml
-  run_once: true