You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ni...@apache.org on 2018/10/22 19:39:59 UTC

metron git commit: METRON-1839 Install Elasticsearch MPack Step in Ansible Not Idempotent (nickwallen) closes apache/metron#1244

Repository: metron
Updated Branches:
  refs/heads/master 0c0602c75 -> 739782ab7


METRON-1839 Install Elasticsearch MPack Step in Ansible Not Idempotent (nickwallen) closes apache/metron#1244


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

Branch: refs/heads/master
Commit: 739782ab71f6e571ff459d1844a77b533abbdbea
Parents: 0c0602c
Author: nickwallen <ni...@nickallen.org>
Authored: Mon Oct 22 15:39:25 2018 -0400
Committer: nickallen <ni...@apache.org>
Committed: Mon Oct 22 15:39:25 2018 -0400

----------------------------------------------------------------------
 metron-deployment/ansible/roles/ambari_master/defaults/main.yml  | 1 +
 .../ansible/roles/ambari_master/tasks/elasticsearch_mpack.yml    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/metron/blob/739782ab/metron-deployment/ansible/roles/ambari_master/defaults/main.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/ansible/roles/ambari_master/defaults/main.yml b/metron-deployment/ansible/roles/ambari_master/defaults/main.yml
index 8bae8ce..f6d76e5 100644
--- a/metron-deployment/ansible/roles/ambari_master/defaults/main.yml
+++ b/metron-deployment/ansible/roles/ambari_master/defaults/main.yml
@@ -19,5 +19,6 @@ ambari_server_mem: 2048
 ambari_mpack_version: 0.6.1.0
 metron_mpack_name: metron_mpack-{{ ambari_mpack_version }}.tar.gz
 metron_mpack_path: "{{ playbook_dir }}/../../packaging/ambari/metron-mpack/target/{{ metron_mpack_name }}"
+elasticsearch_mpack_version: 5.6.2
 elasticsearch_mpack_name: elasticsearch_mpack-{{ ambari_mpack_version }}.tar.gz
 elasticsearch_mpack_path: "{{ playbook_dir }}/../../packaging/ambari/elasticsearch-mpack/target/{{ elasticsearch_mpack_name }}"

http://git-wip-us.apache.org/repos/asf/metron/blob/739782ab/metron-deployment/ansible/roles/ambari_master/tasks/elasticsearch_mpack.yml
----------------------------------------------------------------------
diff --git a/metron-deployment/ansible/roles/ambari_master/tasks/elasticsearch_mpack.yml b/metron-deployment/ansible/roles/ambari_master/tasks/elasticsearch_mpack.yml
index 7ce1a13..ea5b0f4 100644
--- a/metron-deployment/ansible/roles/ambari_master/tasks/elasticsearch_mpack.yml
+++ b/metron-deployment/ansible/roles/ambari_master/tasks/elasticsearch_mpack.yml
@@ -21,6 +21,6 @@
     dest: /tmp
 
 - name: Install Elasticsearch MPack on Ambari Host
-  shell: ambari-server install-mpack --mpack=/tmp/elasticsearch_mpack-{{ ambari_mpack_version }}.tar.gz
+  shell: "ambari-server install-mpack --mpack=/tmp/{{ elasticsearch_mpack_name }}"
   args:
-    creates: /var/lib/ambari-server/resources/mpacks/elasticsearch-ambari.mpack-{{ ambari_mpack_version }}/addon-services
+    creates: /var/lib/ambari-server/resources/mpacks/elasticsearch-ambari.mpack-{{ elasticsearch_mpack_version }}/addon-services