From 1b0cfc11f81f1a41e9a30ef63c0d4566047e2481 Mon Sep 17 00:00:00 2001
From: Makhtar DIAGNE <makhtar.diagne@teamdlab.com>
Date: Tue, 5 May 2020 18:44:25 +0200
Subject: [PATCH] =?UTF-8?q?=E2=85=9CTECH]=20Fix=20merge=20deployment=20tas?=
=?UTF-8?q?k?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
deployment/roles/vitamui/tasks/iam-internal.yml | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/deployment/roles/vitamui/tasks/iam-internal.yml b/deployment/roles/vitamui/tasks/iam-internal.yml
index ba96e792..d4423324 100644
--- a/deployment/roles/vitamui/tasks/iam-internal.yml
+++ b/deployment/roles/vitamui/tasks/iam-internal.yml
@@ -12,19 +12,4 @@
tags:
- update_vitam_configuration
notify:
-<<<<<<< HEAD
- - restart service
-
-- name: Deploy customer-init.yml
- copy:
- src: "customer-init.yml"
- dest: "{{ vitamui_folder_conf }}/customer-init.yml"
- owner: "{{ vitamui_defaults.users.vitamui }}"
- group: "{{ vitamui_defaults.users.group }}"
- mode: "{{ vitamui_defaults.folder.conf_permission }}"
- tags:
- - update_vitam_configuration
- notify:
-=======
->>>>>>> [DEVOPS] Update scripts for deployment
- restart service
\ No newline at end of file
--
GitLab