From d4035c670fbe0f2c4e39361640ca3b5eca5e19e5 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_services.yml.rej | 17 --------
.../group_vars/all/vitamui_vars.yml | 16 +++++--
.../vitamui/files/ui/assets/vitamui-logo.png | Bin 0 -> 6330 bytes
deployment/roles/vitamui/handlers/main.yml | 3 +-
deployment/roles/vitamui/tasks/cas-server.yml | 10 +++++
.../roles/vitamui/tasks/iam-internal.yml | 15 +++++++
deployment/roles/vitamui/tasks/main.yml | 39 ++++++------------
deployment/roles/vitamui/tasks/ui.yml | 21 ++++++++++
.../ui-identity-admin/application.yml.j2 | 8 +---
.../templates/ui-identity/application.yml.j2 | 2 +-
.../templates/ui-portal/application.yml.j2 | 2 +-
11 files changed, 76 insertions(+), 57 deletions(-)
delete mode 100644 deployment/environment/group_vars/all/vitamui_services.yml.rej
create mode 100644 deployment/roles/vitamui/files/ui/assets/vitamui-logo.png
create mode 100644 deployment/roles/vitamui/tasks/cas-server.yml
create mode 100644 deployment/roles/vitamui/tasks/iam-internal.yml
create mode 100644 deployment/roles/vitamui/tasks/ui.yml
diff --git a/deployment/environment/group_vars/all/vitamui_services.yml.rej b/deployment/environment/group_vars/all/vitamui_services.yml.rej
deleted file mode 100644
index 1747c1cb..00000000
--- a/deployment/environment/group_vars/all/vitamui_services.yml.rej
+++ /dev/null
@@ -1,17 +0,0 @@
-diff a/deployment/environment/group_vars/all/vitamui_services.yml b/deployment/environment/group_vars/all/vitamui_services.yml (rejected hunks)
-@@ -157,6 +157,7 @@ vitamui_services:
- dirs:
- config: /vitamui/conf/ui-identity
- log: /vitamui/log/ui-identity
-+ assets: /vitamui/assets/ui-identity
-
- server_name: "{{ vitamui_env_name }}-identity.teamvitamui.com"
- java_opts: -Xms128m -Xmx512m -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true
-@@ -211,6 +212,7 @@ vitamui_services:
- dirs:
- config: /vitamui/conf/ui-portal
- log: /vitamui/log/ui-portal
-+ assets: /vitamui/assets/ui-portal
- server_name: "{{ vitamui_env_name }}-portal.teamvitamui.com"
- java_opts: -Xms128m -Xmx512m -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true
- access_log_enabled: false
diff --git a/deployment/environments/group_vars/all/vitamui_vars.yml b/deployment/environments/group_vars/all/vitamui_vars.yml
index 43bca4ee..6b4ce70c 100755
--- a/deployment/environments/group_vars/all/vitamui_vars.yml
+++ b/deployment/environments/group_vars/all/vitamui_vars.yml
@@ -41,6 +41,7 @@ vitamui:
identity:
host: "identity.service.consul"
vitamui_component: "ui-identity"
+ vitamui_component_type: "ui"
package_name: "vitamui-ui-identity"
service_name: "vitamui-ui-identity"
store_name: "ui-identity"
@@ -55,11 +56,13 @@ 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"
+ vitamui_component_type: "ui"
package_name: "vitamui-ui-identity-admin"
service_name: "vitamui-ui-identity-admin"
store_name: "ui-identity-admin"
@@ -74,11 +77,13 @@ 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"
+ vitamui_component_type: "ui"
package_name: "vitamui-ui-portal"
service_name: "vitamui-ui-portal"
store_name: "ui-portal"
@@ -93,11 +98,13 @@ 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"
+ vitamui_component_type: "external"
package_name: "vitamui-iam-external"
store_name: "iam-external"
service_name: "vitamui-iam-external"
@@ -115,6 +122,7 @@ vitamui:
iam_internal:
host: "iam-internal.service.consul"
vitamui_component: "iam-internal"
+ vitamui_component_type: "internal"
package_name: "vitamui-iam-internal"
store_name: "iam-internal"
service_name: "vitamui-iam-internal"
@@ -137,6 +145,7 @@ vitamui:
cas_server:
host: "cas-server.service.consul"
vitamui_component: "cas-server"
+ vitamui_component_type: "external"
package_name: "vitamui-cas-server"
store_name: "cas-server"
service_name: "vitamui-cas-server"
@@ -155,6 +164,7 @@ vitamui:
security_internal:
host: "security-internal.service.consul"
vitamui_component: "security-internal"
+ vitamui_component_type: "internal"
package_name: "vitamui-security-internal"
store_name: "security-internal"
service_name: "vitamui-security-internal"
diff --git a/deployment/roles/vitamui/files/ui/assets/vitamui-logo.png b/deployment/roles/vitamui/files/ui/assets/vitamui-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fccc526e489c1e1b41fa6a4a6c5eb24a8012435
GIT binary patch
literal 6330
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
literal 0
HcmV?d00001
diff --git a/deployment/roles/vitamui/handlers/main.yml b/deployment/roles/vitamui/handlers/main.yml
index 119cf200..55587c25 100644
--- a/deployment/roles/vitamui/handlers/main.yml
+++ b/deployment/roles/vitamui/handlers/main.yml
@@ -3,8 +3,7 @@
service:
name: "{{ service_consul }}"
state: restarted
- listen: restart service
- when: service_name == 'vitamui-cas-server'
+ listen: restart consul
- name: restart the service
service:
diff --git a/deployment/roles/vitamui/tasks/cas-server.yml b/deployment/roles/vitamui/tasks/cas-server.yml
new file mode 100644
index 00000000..31f3a30b
--- /dev/null
+++ b/deployment/roles/vitamui/tasks/cas-server.yml
@@ -0,0 +1,10 @@
+- name: apply consul conf when cas-server ONLY
+ template:
+ src: "cas-server/vitamui-cas-server.json.j2"
+ dest: "{{ vitamui_conf_consul }}/vitamui-cas-server.json"
+ owner: "{{ vitamui_defaults.users.vitamui }}"
+ group: "{{ vitamui_defaults.users.group }}"
+ mode: "{{ vitamui_defaults.folder.folder_permission }}"
+ notify:
+ - restart consul
+ - restart service
\ No newline at end of file
diff --git a/deployment/roles/vitamui/tasks/iam-internal.yml b/deployment/roles/vitamui/tasks/iam-internal.yml
new file mode 100644
index 00000000..d4423324
--- /dev/null
+++ b/deployment/roles/vitamui/tasks/iam-internal.yml
@@ -0,0 +1,15 @@
+- 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
\ No newline at end of file
diff --git a/deployment/roles/vitamui/tasks/main.yml b/deployment/roles/vitamui/tasks/main.yml
index 09c1fae5..aad7ad14 100644
--- a/deployment/roles/vitamui/tasks/main.yml
+++ b/deployment/roles/vitamui/tasks/main.yml
@@ -52,13 +52,17 @@
notify:
- restart service
-- name: Ensure that the templates sub-directory exists
+- name: Create custom sub-directories
file:
- path: "{{ vitamui_folder_conf }}/templates"
+ path: "{{ item }}"
state: directory
owner: "{{ vitamui_defaults.users.vitamui }}"
group: "{{ vitamui_defaults.users.group }}"
mode: "{{ vitamui_defaults.folder.folder_permission }}"
+ loop: "{{ vitamui_struct.dirs }}"
+ when:
+ - vitamui_struct.dirs is defined
+ - vitamui_struct.dirs|length > 0
notify:
- restart service
@@ -137,32 +141,13 @@
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: apply consul conf when cas-server ONLY
- template:
- src: "cas-server/vitamui-cas-server.json.j2"
- dest: "{{ vitamui_conf_consul }}/vitamui-cas-server.json"
- owner: "{{ vitamui_defaults.users.vitamui }}"
- group: "{{ vitamui_defaults.users.group }}"
- mode: "{{ vitamui_defaults.folder.folder_permission }}"
- when: vitamui_struct.service_name == 'vitamui-cas-server'
- notify:
- - restart service
+- name: "Execute sub-tasks for the component: {{ vitamui_struct.vitamui_component }}"
+ include_tasks: "{{ vitamui_struct.vitamui_component }}.yml"
+ when: "{{ lookup('pipe', 'test -f {{ role_path }}/tasks/{{ vitamui_struct.vitamui_component }}.yml || echo nofile') == \"\" }}"
- name: flush_handlers
meta: flush_handlers
diff --git a/deployment/roles/vitamui/tasks/ui.yml b/deployment/roles/vitamui/tasks/ui.yml
new file mode 100644
index 00000000..90c315f9
--- /dev/null
+++ b/deployment/roles/vitamui/tasks/ui.yml
@@ -0,0 +1,21 @@
+- name: Ensure asset directory is present
+ file:
+ path: "{{ vitam_defaults.folder.root_path}}/conf/assets"
+ state: directory
+ owner: "{{ vitamui_defaults.users.vitamui }}"
+ group: "{{ vitamui_defaults.users.group }}"
+ mode: "{{ vitamui_defaults.folder.folder_permission }}"
+
+- name: Deploy custom files for UI.
+ copy:
+ src: "{{ item }}"
+ dest: "{{ vitam_defaults.folder.root_path}}/conf/assets"
+ owner: "{{ vitamui_defaults.users.vitamui }}"
+ group: "{{ vitamui_defaults.users.group }}"
+ mode: "{{ vitamui_defaults.folder.folder_permission }}"
+ with_fileglob:
+ - ../files/ui/assets/*
+ tags:
+ - update_vitamui_certificates
+ notify:
+ - restart service
\ No newline at end of file
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 4adbe9c7..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 }}"
@@ -101,8 +101,4 @@ cas:
ssl:
trust-store: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_type }}.jks
trust-store-password: {{ password_truststore }}
-{% endif %}
-
-theme:
- main-color: {{}}
- secondary-color: {{}}
+{% endif %}
\ No newline at end of file
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