Merge pull request #352 from karthick-rn/Karthick/Accumulo_2.1_init
Update init scope when using multiple volumes in Accumulo 2.1
diff --git a/ansible/accumulo.yml b/ansible/accumulo.yml
index affbd0a..1a50d70 100644
--- a/ansible/accumulo.yml
+++ b/ansible/accumulo.yml
@@ -30,11 +30,11 @@
- hosts: all:!{{ azure_proxy_host }}
tasks:
- import_tasks: roles/accumulo/tasks/add-adlsgen2.yml
- when: cluster_type == 'azure' and accumulo_major_version == '2' and use_adlsg2
+ when: cluster_type == 'azure' and accumulo_version is version('2.0.0','>=') and accumulo_version is version('2.1.0','<') and use_adlsg2
- hosts: accumulomaster[0]
tasks:
- import_tasks: roles/accumulo/tasks/init-adlsgen2.yml
- when: cluster_type == 'azure' and accumulo_major_version == '2' and use_adlsg2
+ when: cluster_type == 'azure' and accumulo_version is version('2.0.0','>=') and accumulo_version is version('2.1.0','<') and use_adlsg2
handlers:
- import_tasks: roles/accumulo/handlers/init-adlsgen2.yml
- hosts: accumulo
diff --git a/ansible/roles/accumulo/templates/accumulo.properties b/ansible/roles/accumulo/templates/accumulo.properties
index 95765ab..b4da88f 100644
--- a/ansible/roles/accumulo/templates/accumulo.properties
+++ b/ansible/roles/accumulo/templates/accumulo.properties
@@ -26,7 +26,11 @@
instance.secret=muchos
## Sets location in HDFS where Accumulo will store data
+{% if cluster_type == 'azure' and use_adlsg2 and accumulo_version is version('2.1.0','>=') %}
+instance.volumes={{ hdfs_root }}/accumulo,{{ instance_volumes_preferred }}
+{% else %}
instance.volumes={{ hdfs_root }}/accumulo
+{% endif %}
## Sets location of Zookeepers
instance.zookeeper.host={{ zookeeper_connect }}
@@ -49,6 +53,10 @@
general.custom.volume.preferred.logger={{ hdfs_root }}/accumulo
{% endif %}
+{% if cluster_type == 'azure' and use_adlsg2 and accumulo_version is version('2.1.0','>=') %}
+general.custom.volume.preferred.init={{ instance_volumes_preferred }}
+{% endif %}
+
{% if num_tservers > 1 %}
tserver.port.search = true
replication.receipt.service.port = 0
