From 7ac5c3159e027e0b4819c3e44416a059490822f6 Mon Sep 17 00:00:00 2001
From: Mathieu Leguay <mathieu.leguay@teamdlab.com>
Date: Tue, 21 Apr 2020 19:34:59 +0200
Subject: [PATCH] [DEVOPS] Fix unknown variable vitamui_services.x.dir.assets
---
deployment/environments/group_vars/all/vitamui_vars.yml | 9 +++------
.../templates/ui-identity-admin/application.yml.j2 | 2 +-
.../vitamui/templates/ui-identity/application.yml.j2 | 2 +-
.../roles/vitamui/templates/ui-portal/application.yml.j2 | 2 +-
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/deployment/environments/group_vars/all/vitamui_vars.yml b/deployment/environments/group_vars/all/vitamui_vars.yml
index 6b4ce70c..cbce42b9 100755
--- a/deployment/environments/group_vars/all/vitamui_vars.yml
+++ b/deployment/environments/group_vars/all/vitamui_vars.yml
@@ -56,9 +56,8 @@ vitamui:
logback_total_size_cap: "5GB"
root_log_level: "ERROR"
vitamui_level: "INFO"
- # Custom directories linked to the module
dirs:
- - "{{ vitam_defaults.folder.root_path }}/conf/assets"
+ assets: "/tmp/assets"
identity_admin:
host: "identity-admin.service.consul"
vitamui_component: "ui-identity-admin"
@@ -77,9 +76,8 @@ vitamui:
logback_total_size_cap: "5GB"
root_log_level: "ERROR"
vitamui_level: "INFO"
- # Custom directories linked to the module
dirs:
- - "{{ vitam_defaults.folder.root_path }}/conf/assets"
+ assets: "/tmp/assets"
portal:
host: "portal.service.consul"
vitamui_component: "ui-portal"
@@ -98,9 +96,8 @@ vitamui:
logback_total_size_cap: "5GB"
root_log_level: "ERROR"
vitamui_level: "INFO"
- # Custom directories linked to the module
dirs:
- - "{{ vitam_defaults.folder.root_path }}/conf/assets"
+ assets: "/tmp/assets"
iam_external:
host: "iam-external.service.consul"
vitamui_component: "iam-external"
diff --git a/deployment/roles/vitamui/templates/ui-identity-admin/application.yml.j2 b/deployment/roles/vitamui/templates/ui-identity-admin/application.yml.j2
index d5db880d..ecb50f97 100644
--- a/deployment/roles/vitamui/templates/ui-identity-admin/application.yml.j2
+++ b/deployment/roles/vitamui/templates/ui-identity-admin/application.yml.j2
@@ -62,7 +62,7 @@ ui-identity:
key-password: {{ password_truststore }} # TODO OMA : revoir
hostname-verification: false
{% endif %}
- assets: "{{ vitam_defaults.folder.root_path }}/conf/assets"
+ assets: "{{ vitamui_struct.ui_identity_admin.dirs.assets }}"
base-url:
{% if vitamui.portal.base_url is defined %}
portal: "{{ vitamui.portal.base_url }}"
diff --git a/deployment/roles/vitamui/templates/ui-identity/application.yml.j2 b/deployment/roles/vitamui/templates/ui-identity/application.yml.j2
index e81d6487..8b2f022e 100644
--- a/deployment/roles/vitamui/templates/ui-identity/application.yml.j2
+++ b/deployment/roles/vitamui/templates/ui-identity/application.yml.j2
@@ -59,7 +59,7 @@ ui-identity:
key-password: {{ password_truststore }}
hostname-verification: false
{%endif %}
- assets: "{{ vitam_defaults.folder.root_path }}/conf/assets"
+ assets: "{{ vitamui_struct.ui_identity.dirs.assets }}"
base-url:
{% if vitamui.portal.base_url is defined %}
portal: "{{ vitamui.portal.base_url }}"
diff --git a/deployment/roles/vitamui/templates/ui-portal/application.yml.j2 b/deployment/roles/vitamui/templates/ui-portal/application.yml.j2
index fdc4d72f..9a0b4f88 100644
--- a/deployment/roles/vitamui/templates/ui-portal/application.yml.j2
+++ b/deployment/roles/vitamui/templates/ui-portal/application.yml.j2
@@ -54,7 +54,7 @@ ui-portal:
key-path: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks
key-password: {{ password_truststore }} # TODO OMA : revoir
hostname-verification: false
- assets: "{{ vitam_defaults.folder.root_path }}/conf/assets"
+ assets: "{{ vitamui_struct.ui_portal.dirs.assets }}"
{% endif %}
{% if vitamui.portal.base_url is undefined %}
base-url:
--
GitLab