commit 0de4713301d594f0bf4b88e2cf985033db2ad447
author Jeffrey Manno <jeffreymanno15@gmail.com> Fri Oct 01 15:16:50 2021 -0400
committer GitHub <noreply@github.com> Fri Oct 01 15:16:50 2021 -0400
tree 551792547489bb9f1576c213bda575ab269d54b8
parent 233aabd03d52ca01e5cb534ac5abebda601a2427

Adapt accumulo.sh to use new cluster.yaml file (#272)

bin/impl/install/accumulo.sh

diff --git a/bin/impl/install/accumulo.sh b/bin/impl/install/accumulo.sh
index 86dfbf1..bb490f7 100755
--- a/bin/impl/install/accumulo.sh
+++ b/bin/impl/install/accumulo.sh
@@ -50,7 +50,9 @@
   accumulo_conf=$conf/accumulo.properties
   cp "$UNO_HOME"/conf/accumulo/2/* "$conf"
   "$ACCUMULO_HOME"/bin/accumulo-cluster create-config
-  $SED "s#localhost#$UNO_HOST#" "$conf/tservers"
+  if [[ -f "$conf/tservers" ]]; then
+    $SED "s#localhost#$UNO_HOST#" "$conf/tservers"
+  fi
   $SED "s#export HADOOP_HOME=[^ ]*#export HADOOP_HOME=$HADOOP_HOME#" "$conf"/accumulo-env.sh
   $SED "s#instance[.]name=#instance.name=$ACCUMULO_INSTANCE#" "$conf"/accumulo-client.properties
   $SED "s#instance[.]zookeepers=localhost:2181#instance.zookeepers=$UNO_HOST:2181#" "$conf"/accumulo-client.properties
@@ -63,11 +65,16 @@
   fi
 fi
 
-managers_file="$conf/managers"
-if [[ -f "$conf/masters" ]]; then
-  managers_file="$conf/masters"
+if [[ -f "$conf/cluster.yaml" ]]; then
+    $SED "s#localhost#$UNO_HOST#" "$conf/cluster.yaml"
+else
+  managers_file="$conf/managers"
+  if [[ -f "$conf/masters" ]]; then
+    managers_file="$conf/masters"
+  fi
+  $SED "s#localhost#$UNO_HOST#" "$managers_file" "$conf/monitor" "$conf/gc"
 fi
-$SED "s#localhost#$UNO_HOST#" "$managers_file" "$conf/monitor" "$conf/gc"
+
 $SED "s#export ZOOKEEPER_HOME=[^ ]*#export ZOOKEEPER_HOME=$ZOOKEEPER_HOME#" "$conf"/accumulo-env.sh
 $SED "s#export ACCUMULO_LOG_DIR=[^ ]*#export ACCUMULO_LOG_DIR=$ACCUMULO_LOG_DIR#" "$conf"/accumulo-env.sh
 if [[ $ACCUMULO_VERSION =~ ^1\..*$ ]]; then