You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluo.apache.org by ct...@apache.org on 2020/09/29 03:28:53 UTC

[fluo-muchos] branch main updated: Include 'zk_home/lib' in accumulo-site.xml template (#372)

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/fluo-muchos.git


The following commit(s) were added to refs/heads/main by this push:
     new b36e401  Include 'zk_home/lib' in accumulo-site.xml template (#372)
b36e401 is described below

commit b36e401e2d344a823f7fd11e798d603ce0bb8981
Author: Karthick Narendran <ka...@gmail.com>
AuthorDate: Tue Sep 29 04:27:46 2020 +0100

    Include 'zk_home/lib' in accumulo-site.xml template (#372)
    
    Co-authored-by: Karthick Narendran <ka...@microsoft.com>
---
 ansible/roles/accumulo/templates/accumulo-site.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ansible/roles/accumulo/templates/accumulo-site.xml b/ansible/roles/accumulo/templates/accumulo-site.xml
index 4555668..0320646 100644
--- a/ansible/roles/accumulo/templates/accumulo-site.xml
+++ b/ansible/roles/accumulo/templates/accumulo-site.xml
@@ -87,7 +87,11 @@
       $ACCUMULO_HOME/lib/accumulo-fate.jar,
       $ACCUMULO_HOME/lib/accumulo-proxy.jar,
       $ACCUMULO_HOME/lib/[^.].*.jar,
+{% if zookeeper_version is version('3.5','>=') %}
+      $ZOOKEEPER_HOME/lib/zookeeper[^.].*.jar,
+{% else %}      
       $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
+{% endif %}
       $HADOOP_CONF_DIR,
       $HADOOP_PREFIX/share/hadoop/common/[^.].*.jar,
       $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,