From c6b31c2ae078b1681cfa8ced2cc30bac458450cd Mon Sep 17 00:00:00 2001
From: Julien Georges <julien.georges@culture.gouv.fr>
Date: Thu, 10 Jun 2021 14:21:18 +0200
Subject: [PATCH] Define specific names for vitamui services to avoid conflict
with vitam services when using the same consul cluster. (#307)
---
deployment/environments/group_vars/all/vitamui_vars.yml | 4 ++--
.../vitamui/templates/ingest-external/application.yml.j2 | 2 +-
.../vitamui/templates/ingest-internal/application.yml.j2 | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/deployment/environments/group_vars/all/vitamui_vars.yml b/deployment/environments/group_vars/all/vitamui_vars.yml
index c3b0d73b3..b2ebbf571 100755
--- a/deployment/environments/group_vars/all/vitamui_vars.yml
+++ b/deployment/environments/group_vars/all/vitamui_vars.yml
@@ -286,7 +286,7 @@ vitamui:
vitamui_level: "DEBUG"
ingest_external:
- host: "ingest-external.service.{{ consul_domain }}"
+ host: "vitamui-ingest-external.service.{{ consul_domain }}"
vitamui_component: "ingest-external"
vitamui_component_type: "external"
package_name: "vitamui-ingest-external"
@@ -305,7 +305,7 @@ vitamui:
vitamui_level: "DEBUG"
ingest_internal:
- host: "ingest-internal.service.{{ consul_domain }}"
+ host: "vitamui-ingest-internal.service.{{ consul_domain }}"
vitamui_component: "ingest-internal"
vitamui_component_type: "internal"
package_name: "vitamui-ingest-internal"
diff --git a/deployment/roles/vitamui/templates/ingest-external/application.yml.j2 b/deployment/roles/vitamui/templates/ingest-external/application.yml.j2
index 3009062ac..d06a3c5f4 100644
--- a/deployment/roles/vitamui/templates/ingest-external/application.yml.j2
+++ b/deployment/roles/vitamui/templates/ingest-external/application.yml.j2
@@ -15,7 +15,7 @@ spring.servlet.multipart.max-request-size: -1
server-identity:
identityName: {{ vitamui_site_name }}
- identityRole: {{ vitamui_struct.vitamui_component }}
+ identityRole: vitamui-{{ vitamui_struct.vitamui_component }}
identityServerId: 1
server:
diff --git a/deployment/roles/vitamui/templates/ingest-internal/application.yml.j2 b/deployment/roles/vitamui/templates/ingest-internal/application.yml.j2
index 69c1417a7..be02b296a 100644
--- a/deployment/roles/vitamui/templates/ingest-internal/application.yml.j2
+++ b/deployment/roles/vitamui/templates/ingest-internal/application.yml.j2
@@ -17,7 +17,7 @@ spring.servlet.multipart.max-request-size: -1
server-identity:
identityName: {{ vitamui_site_name }}
- identityRole: {{ vitamui_struct.vitamui_component }}
+ identityRole: vitamui-{{ vitamui_struct.vitamui_component }}
identityServerId: 1
server:
--
GitLab