From 942552615fb7b57aef2c3dd2a3a6ea0acddfdb68 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Fri, 6 Nov 2020 17:47:50 +0100
Subject: [PATCH] update deployment scripts
---
deploy/asapo_services/scripts/asapo-receivers.nmd.tpl | 3 +++
deploy/asapo_services/scripts/receiver.json.tpl | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/deploy/asapo_services/scripts/asapo-receivers.nmd.tpl b/deploy/asapo_services/scripts/asapo-receivers.nmd.tpl
index f0aa1a79a..075100884 100644
--- a/deploy/asapo_services/scripts/asapo-receivers.nmd.tpl
+++ b/deploy/asapo_services/scripts/asapo-receivers.nmd.tpl
@@ -27,6 +27,9 @@ job "asapo-receivers" {
driver = "docker"
user = "${asapo_user}"
config {
+ ulimit {
+ memlock = "-1:-1"
+ }
network_mode = "host"
security_opt = ["no-new-privileges"]
userns_mode = "host"
diff --git a/deploy/asapo_services/scripts/receiver.json.tpl b/deploy/asapo_services/scripts/receiver.json.tpl
index 9f1b688a8..c4f0d33b2 100644
--- a/deploy/asapo_services/scripts/receiver.json.tpl
+++ b/deploy/asapo_services/scripts/receiver.json.tpl
@@ -10,7 +10,7 @@
"AdvertiseURI": "{{ if or (env "meta.ib_address") "none" | regexMatch "none" }}{{ env "NOMAD_IP_recv" }}{{ else }}{{ env "meta.ib_address" }}{{ end }}:{{ env "NOMAD_PORT_recv_ds" }}",
"NThreads": {{ env "NOMAD_META_receiver_dataserver_nthreads" }},
"ListenPort": {{ env "NOMAD_PORT_recv_ds" }},
- "NetworkMode": ["{{ env "NOMAD_META_receiver_network_modes" | split "," | join "\",\"" }}"]
+ "NetworkMode": ["{{ if or (env "meta.ib_address") "none" | regexMatch "none" }}{{ printf "%s" "tcp" }}{{ else }}{{ env "NOMAD_META_receiver_network_modes" | split "," | join "\",\"" }}{{ end }}"]
},
"DataCache": {
"Use": true,
--
GitLab