Story #12096: Fix service registration when colocalisation with consu…

…l server. Consul server is not bind to localhost.
ProgrammeVitam · Dec 13, 2023 · 60863a5 · 60863a5
1 parent 01c6276
commit 60863a5
Show file tree

Hide file tree

Showing 23 changed files with 23 additions and 33 deletions.
diff --git a/deployment/environments/hosts-ui.example b/deployment/environments/hosts-ui.example
@@ -185,31 +185,15 @@ hosts_vitamui_consul_server
 ################################################################################
 [vitam:children]
 hosts_consul_server
-hosts_ingest_external
-hosts_access_external
-hosts_functionnal_admin
-hosts_security_internal
 hosts_elasticsearch_log
 
 # MINIMUM REQUIRED IN ZONE VITAM
 [hosts_consul_server]
 # EDIT: Mandatory unless [hosts_vitamui_consul_server] is defined
 # Choose between [hosts_consul_server] and [hosts_vitamui_consul_server]. If both defined [hosts_vitamui_consul_server] will be used by default.
 
-[hosts_ingest_external]
-# EDIT: Mandatory
-
-[hosts_access_external]
-# EDIT: Mandatory
-
-[hosts_functionnal_admin]
-# EDIT: Mandatory
-
-[hosts_security_internal]
-# EDIT: Mandatory
-
 [hosts_elasticsearch_log]
-# EDIT: Mandatory
+# EDIT: Mandatory when [hosts_vitamui_logstash] is defined
 
 
 ################################################################################

diff --git a/deployment/environments/hosts.local b/deployment/environments/hosts.local
@@ -206,31 +206,15 @@ hosts_vitamui_consul_server
 ################################################################################
 [vitam:children]
 hosts_consul_server
-hosts_ingest_external
-hosts_access_external
 hosts_elasticsearch_log
-hosts_functionnal_admin
-hosts_security_internal
 
 # MINIMUM REQUIRED IN ZONE VITAM
 [hosts_consul_server]
 localhost
 
-[hosts_ingest_external]
-localhost
-
-[hosts_access_external]
-localhost
-
 [hosts_elasticsearch_log]
 localhost
 
-[hosts_functionnal_admin]
-localhost
-
-[hosts_security_internal]
-localhost
-
 ################################################################################
 # ZONE TOOLS
 ################################################################################

diff --git a/deployment/roles/vitamui/templates/archive-search-external/application.yml.j2 b/deployment/roles/vitamui/templates/archive-search-external/application.yml.j2
@@ -3,6 +3,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/archive-search-internal/application.yml.j2 b/deployment/roles/vitamui/templates/archive-search-internal/application.yml.j2
@@ -2,6 +2,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/cas-server/application.yml.j2 b/deployment/roles/vitamui/templates/cas-server/application.yml.j2
@@ -2,6 +2,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/collect-external/application.yml.j2 b/deployment/roles/vitamui/templates/collect-external/application.yml.j2
@@ -3,6 +3,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/collect-internal/application.yml.j2 b/deployment/roles/vitamui/templates/collect-internal/application.yml.j2
@@ -2,6 +2,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/iam-external/application.yml.j2 b/deployment/roles/vitamui/templates/iam-external/application.yml.j2
@@ -3,6 +3,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/iam-internal/application.yml.j2 b/deployment/roles/vitamui/templates/iam-internal/application.yml.j2
@@ -2,6 +2,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/ingest-external/application.yml.j2 b/deployment/roles/vitamui/templates/ingest-external/application.yml.j2
@@ -3,6 +3,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/ingest-internal/application.yml.j2 b/deployment/roles/vitamui/templates/ingest-internal/application.yml.j2
@@ -2,6 +2,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/pastis-external/application.yml.j2 b/deployment/roles/vitamui/templates/pastis-external/application.yml.j2
@@ -16,6 +16,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/referential-external/application.yml.j2 b/deployment/roles/vitamui/templates/referential-external/application.yml.j2
@@ -3,6 +3,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/referential-internal/application.yml.j2 b/deployment/roles/vitamui/templates/referential-internal/application.yml.j2
@@ -2,6 +2,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/security-internal/application.yml.j2 b/deployment/roles/vitamui/templates/security-internal/application.yml.j2
@@ -2,6 +2,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/ui-archive-search/application.yml.j2 b/deployment/roles/vitamui/templates/ui-archive-search/application.yml.j2
@@ -2,6 +2,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/ui-collect/application.yml.j2 b/deployment/roles/vitamui/templates/ui-collect/application.yml.j2
@@ -2,6 +2,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/ui-identity-admin/application.yml.j2 b/deployment/roles/vitamui/templates/ui-identity-admin/application.yml.j2
@@ -2,6 +2,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/ui-identity/application.yml.j2 b/deployment/roles/vitamui/templates/ui-identity/application.yml.j2
@@ -2,6 +2,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/ui-ingest/application.yml.j2 b/deployment/roles/vitamui/templates/ui-ingest/application.yml.j2
@@ -2,6 +2,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/ui-pastis/application.yml.j2 b/deployment/roles/vitamui/templates/ui-pastis/application.yml.j2
@@ -2,6 +2,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/ui-portal/application.yml.j2 b/deployment/roles/vitamui/templates/ui-portal/application.yml.j2
@@ -2,6 +2,7 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}

diff --git a/deployment/roles/vitamui/templates/ui-referential/application.yml.j2 b/deployment/roles/vitamui/templates/ui-referential/application.yml.j2
@@ -2,10 +2,12 @@ spring:
   cloud:
     consul:
       enabled: true
+      host: {{ hostvars[inventory_hostname][consul.network] if (inventory_hostname in groups['hosts_vitamui_consul_server'] or inventory_hostname in groups['hosts_consul_server']) else 'localhost' }}
       discovery:
         preferIpAddress: true
         tags: {{ consul_tags }}
         instanceId: {{ vitamui_struct.vitamui_component }}-${server.port}-${spring.cloud.client.hostname}
+        deregister: false
   servlet:
     multipart:
       max-file-size: -1