Story #13302: Fix Consul DNS resolution in cluster mode for Almalinux

ProgrammeVitam · Oct 10, 2024 · 13222fb · 13222fb
1 parent e776544
commit 13222fb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/deployment/roles/consul/templates/vitam-container-consul.service.j2 b/deployment/roles/consul/templates/vitam-container-consul.service.j2
@@ -20,7 +20,7 @@ ExecStart=/usr/bin/docker run --rm --net=host -e 'CONSUL_ALLOW_PRIVILEGED_PORTS=
 
 ExecStop=/usr/bin/docker stop -t 85 vitam-consul
 ExecRestart=/usr/bin/docker restart -t 85 vitam-consul
-ExecReload=/usr/bin/docker exec vitam-consul sh -c 'kill -HUP $(pidof consul)'
+ExecReload=/usr/bin/docker exec vitam-consul sh -c 'for pid in $(ls /proc | grep -E "^[0-9]+$"); do if [ "$(cat /proc/$pid/comm 2>/dev/null)" = "consul" ]; then kill -HUP $pid; fi; done'
 TimeoutStartSec=60
 TimeoutStopSec=30
 StartLimitBurst=6

diff --git a/deployment/roles/docker/tasks/RedHat.yml b/deployment/roles/docker/tasks/RedHat.yml
@@ -36,8 +36,3 @@
     name: net.ipv4.ip_forward
     sysctl_set: yes
     value: '1'
-- name: Make sure net.ipv4.ip_unprivileged_port_start is disabled
-  sysctl:
-    name: net.ipv4.ip_unprivileged_port_start
-    sysctl_set: yes
-    value: '0'
diff --git a/deployment/roles/docker/tasks/main.yml b/deployment/roles/docker/tasks/main.yml
@@ -44,3 +44,9 @@
   when:
     - install_mode == "container"
     - container_repository is defined
+
+- name: Make sure net.ipv4.ip_unprivileged_port_start is disabled
+  sysctl:
+    name: net.ipv4.ip_unprivileged_port_start
+    sysctl_set: yes
+    value: '0'