From b8bf63bd5c2d184a5a86aef32e8bfa9598d39dc1 Mon Sep 17 00:00:00 2001
From: Mathieu Leguay <mathieu.leguay@teamdlab.com>
Date: Wed, 22 Apr 2020 15:14:40 +0200
Subject: [PATCH] [DEVOPS] Update scripts for deployment
---
.../group_vars/all/vitamui_vars.yml | 9 ++++++---
.../roles/vitamui/tasks/iam-internal.yml | 3 +++
deployment/roles/vitamui/tasks/main.yml | 18 +++---------------
.../ui-identity-admin/application.yml.j2 | 2 +-
.../templates/ui-identity/application.yml.j2 | 2 +-
.../templates/ui-portal/application.yml.j2 | 2 +-
6 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/deployment/environments/group_vars/all/vitamui_vars.yml b/deployment/environments/group_vars/all/vitamui_vars.yml
index cbce42b9..6b4ce70c 100755
--- a/deployment/environments/group_vars/all/vitamui_vars.yml
+++ b/deployment/environments/group_vars/all/vitamui_vars.yml
@@ -56,8 +56,9 @@ vitamui:
logback_total_size_cap: "5GB"
root_log_level: "ERROR"
vitamui_level: "INFO"
+ # Custom directories linked to the module
dirs:
- assets: "/tmp/assets"
+ - "{{ vitam_defaults.folder.root_path }}/conf/assets"
identity_admin:
host: "identity-admin.service.consul"
vitamui_component: "ui-identity-admin"
@@ -76,8 +77,9 @@ vitamui:
logback_total_size_cap: "5GB"
root_log_level: "ERROR"
vitamui_level: "INFO"
+ # Custom directories linked to the module
dirs:
- assets: "/tmp/assets"
+ - "{{ vitam_defaults.folder.root_path }}/conf/assets"
portal:
host: "portal.service.consul"
vitamui_component: "ui-portal"
@@ -96,8 +98,9 @@ vitamui:
logback_total_size_cap: "5GB"
root_log_level: "ERROR"
vitamui_level: "INFO"
+ # Custom directories linked to the module
dirs:
- assets: "/tmp/assets"
+ - "{{ vitam_defaults.folder.root_path }}/conf/assets"
iam_external:
host: "iam-external.service.consul"
vitamui_component: "iam-external"
diff --git a/deployment/roles/vitamui/tasks/iam-internal.yml b/deployment/roles/vitamui/tasks/iam-internal.yml
index ccacaaf9..ba96e792 100644
--- a/deployment/roles/vitamui/tasks/iam-internal.yml
+++ b/deployment/roles/vitamui/tasks/iam-internal.yml
@@ -12,6 +12,7 @@
tags:
- update_vitam_configuration
notify:
+<<<<<<< HEAD
- restart service
- name: Deploy customer-init.yml
@@ -24,4 +25,6 @@
tags:
- update_vitam_configuration
notify:
+=======
+>>>>>>> [DEVOPS] Update scripts for deployment
- restart service
\ No newline at end of file
diff --git a/deployment/roles/vitamui/tasks/main.yml b/deployment/roles/vitamui/tasks/main.yml
index e6cb01bc..aad7ad14 100644
--- a/deployment/roles/vitamui/tasks/main.yml
+++ b/deployment/roles/vitamui/tasks/main.yml
@@ -141,21 +141,9 @@
notify:
- restart service
-- name: "Copy vitam certificates"
- copy:
- src: "{{ item }}"
- dest: "{{ vitamui_folder_conf }}/{{ item | basename }}"
- owner: "{{ vitamui_defaults.users.vitamui }}"
- group: "{{ vitamui_defaults.users.group }}"
- mode: "{{ vitamui_defaults.folder.folder_permission }}"
- with_fileglob:
- - "{{ inventory_dir }}/keystores/client-vitam/*.*"
- when:
- - vitam_cert is defined
- tags:
- - update_vitam_configuration
- notify:
- - restart service
+- name: "Execute sub-tasks for the component type: {{ vitamui_struct.vitamui_component_type }}"
+ include_tasks: "{{ vitamui_struct.vitamui_component_type }}.yml"
+ when: "{{ lookup('pipe', 'test -f {{ role_path }}/tasks/{{ vitamui_struct.vitamui_component_type }}.yml || echo nofile') == \"\" }}"
- name: "Execute sub-tasks for the component: {{ vitamui_struct.vitamui_component }}"
include_tasks: "{{ vitamui_struct.vitamui_component }}.yml"
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 ecb50f97..d5db880d 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: "{{ vitamui_struct.ui_identity_admin.dirs.assets }}"
+ assets: "{{ vitam_defaults.folder.root_path }}/conf/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 8b2f022e..e81d6487 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: "{{ vitamui_struct.ui_identity.dirs.assets }}"
+ assets: "{{ vitam_defaults.folder.root_path }}/conf/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 9a0b4f88..fdc4d72f 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: "{{ vitamui_struct.ui_portal.dirs.assets }}"
+ assets: "{{ vitam_defaults.folder.root_path }}/conf/assets"
{% endif %}
{% if vitamui.portal.base_url is undefined %}
base-url:
--
GitLab