small fixes

deploy/docker/cluster/run.sh

@@ -3,6 +3,7 @@
 NOMAD_ALLOC_HOST_SHARED=/tmp/asapo/container_host_shared/nomad_alloc
 SERVICE_DATA_CLUSTER_SHARED=/tmp/asapo/asapo_cluster_shared/service_data
 DATA_GLOBAL_SHARED=/tmp/asapo/global_shared/data
+MONGO_DIR=$SERVICE_DATA_CLUSTER_SHARED/mongodb
 
 ASAPO_USER=`id -u`:`id -g`
 
@@ -35,6 +36,7 @@ docker run --privileged --rm -v /var/run/docker.sock:/var/run/docker.sock \
 	-e NOMAD_ALLOC_DIR=$NOMAD_ALLOC_HOST_SHARED \
 	-e TF_VAR_service_dir=$SERVICE_DATA_CLUSTER_SHARED \
 	-e TF_VAR_data_dir=$DATA_GLOBAL_SHARED \
+	-e TF_VAR_mongo_dir=$MONGO_DIR \
 	-e ADVERTISE_IP=$ADVERTISE_IP \
 	-e RECURSORS=$RECURSORS \
 	-e TF_VAR_asapo_user=$ASAPO_USER \

deploy/docker/cluster/run_maxwell.sh

@@ -35,7 +35,7 @@ fi
 N_SERVERS=$(( $SLURM_JOB_NUM_NODES > $MAX_NOMAD_SERVERS ? $MAX_NOMAD_SERVERS : $SLURM_JOB_NUM_NODES ))
 
 SERVER_ADRESSES=`scontrol show hostnames $SLURM_JOB_NODELIST | head -$N_SERVERS | awk 'BEGIN{printf "["} {printf "%s\"%s\"",sep,$0; sep=","} END{print "]"}'`
-ASAPO_LIGHTWEIGHT_SERVICE_NODES=`scontrol show hostnames $SLURM_JOB_NODELIST | head -$N_ASAPO_LIGHTWEIGHT_SERVICE_NODES | 'BEGIN{printf "["} {printf "%s\"%s\"",sep,$0; sep=","} END{print "]"}'`
+ASAPO_LIGHTWEIGHT_SERVICE_NODES=`scontrol show hostnames $SLURM_JOB_NODELIST | head -$N_ASAPO_LIGHTWEIGHT_SERVICE_NODES | awk 'BEGIN{printf "["} {printf "%s\"%s\"",sep,$0; sep=","} END{print "]"}'`
 
 # make folders if not exist
 mkdir -p $NOMAD_ALLOC_HOST_SHARED $SERVICE_DATA_CLUSTER_SHARED $DATA_GLOBAL_SHARED $MONGO_DIR

deploy/docker/cluster/scripts/asapo-logging.nmd.tpl

@@ -19,7 +19,7 @@ job "asapo-logging" {
     count = "%{ if nomad_logs }0%{ else }1%{ endif }"
     restart {
       attempts = 2
-      interval = "3m"h nnodes
+      interval = "3m"
 
       delay = "15s"
       mode = "delay"

deploy/docker/cluster/scripts/discovery.json.tpl

@@ -2,7 +2,7 @@
   "Mode": "consul",
   "Receiver": {
     "MaxConnections": 32,
-    "UseIBAddress": {{ keyOrDefault "use_ib_for_receiver" "false" }}
+    "UseIBAddress": {{ keyOrDefault "use_ib_for_receiver" "true" }}
   },
   "Port": {{ env "NOMAD_PORT_discovery" }},
   "LogLevel": "{{ keyOrDefault "log_level" "info" }}"