From fc7885b44b5e200d5b386eeec0b1e57c35ad396f Mon Sep 17 00:00:00 2001
From: luwenpeng <luwenpeng@zdjizhi.com>
Date: Tue, 2 Nov 2021 11:55:48 +0300
Subject: [PATCH] =?UTF-8?q?TSG-8288=20TSG-OS=E4=B8=AD=E4=BF=AE=E6=94=B9SAP?=
 =?UTF-8?q?P/TFE/CertStore=E7=9A=84Service=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0Licence=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E7=9A=84=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/roles/certstore/tasks/main.yml                      | 6 ++++++
 .../roles/certstore/templates/service_override_env.conf.j2  | 2 ++
 ansible/roles/sapp/tasks/main.yml                           | 4 ++--
 ansible/roles/sapp/templates/service_env.conf.j2            | 2 --
 ansible/roles/sapp/templates/service_override_env.conf.j2   | 3 +++
 ansible/roles/tfe/tasks/main.yml                            | 6 ++++++
 ansible/roles/tfe/templates/service_override_env.conf.j2    | 2 ++
 7 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 ansible/roles/certstore/templates/service_override_env.conf.j2
 delete mode 100644 ansible/roles/sapp/templates/service_env.conf.j2
 create mode 100644 ansible/roles/sapp/templates/service_override_env.conf.j2
 create mode 100644 ansible/roles/tfe/templates/service_override_env.conf.j2

diff --git a/ansible/roles/certstore/tasks/main.yml b/ansible/roles/certstore/tasks/main.yml
index fadf57da..c465f0c5 100644
--- a/ansible/roles/certstore/tasks/main.yml
+++ b/ansible/roles/certstore/tasks/main.yml
@@ -33,6 +33,12 @@
     dest: /usr/lib/systemd/system/certstore.service.d/service_override_slice.conf
     mode: 0644
 
+- name: "copy env file to certstore.service.d"
+  copy:
+    src: "{{ role_path }}/templates/service_override_env.conf.j2"
+    dest: /usr/lib/systemd/system/certstore.service.d/service_override_env.conf
+    mode: 0644
+
 - name: "Create /usr/lib/systemd/system/cert-redis.service.d directory if it does not exist"
   file:
     path: "{{ item }}"
diff --git a/ansible/roles/certstore/templates/service_override_env.conf.j2 b/ansible/roles/certstore/templates/service_override_env.conf.j2
new file mode 100644
index 00000000..4d73ff5f
--- /dev/null
+++ b/ansible/roles/certstore/templates/service_override_env.conf.j2
@@ -0,0 +1,2 @@
+[Service]
+Environment=HASPUSER_PREFIX=/etc/tsg/licence/
\ No newline at end of file
diff --git a/ansible/roles/sapp/tasks/main.yml b/ansible/roles/sapp/tasks/main.yml
index 4c78c701..42c36ee7 100644
--- a/ansible/roles/sapp/tasks/main.yml
+++ b/ansible/roles/sapp/tasks/main.yml
@@ -155,8 +155,8 @@
 
 - name: "copy env conf to sapp.service.d"
   copy:
-    src: "{{ role_path }}/templates/service_env.conf.j2"
-    dest: /usr/lib/systemd/system/sapp.service.d/service_env.conf
+    src: "{{ role_path }}/templates/service_override_env.conf.j2"
+    dest: /usr/lib/systemd/system/sapp.service.d/service_override_env.conf
     mode: 0644
 
 - name: "copy fake promisc tools for tera mode - service file and scripts"
diff --git a/ansible/roles/sapp/templates/service_env.conf.j2 b/ansible/roles/sapp/templates/service_env.conf.j2
deleted file mode 100644
index 9d4a4f52..00000000
--- a/ansible/roles/sapp/templates/service_env.conf.j2
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-Environment="ZLOG_PROFILE_ERROR=/var/log/zlog.error.log"
\ No newline at end of file
diff --git a/ansible/roles/sapp/templates/service_override_env.conf.j2 b/ansible/roles/sapp/templates/service_override_env.conf.j2
new file mode 100644
index 00000000..b5b92008
--- /dev/null
+++ b/ansible/roles/sapp/templates/service_override_env.conf.j2
@@ -0,0 +1,3 @@
+[Service]
+Environment="ZLOG_PROFILE_ERROR=/var/log/zlog.error.log"
+Environment=HASPUSER_PREFIX=/etc/tsg/licence/
\ No newline at end of file
diff --git a/ansible/roles/tfe/tasks/main.yml b/ansible/roles/tfe/tasks/main.yml
index 400e6321..f7e6e44e 100644
--- a/ansible/roles/tfe/tasks/main.yml
+++ b/ansible/roles/tfe/tasks/main.yml
@@ -74,6 +74,12 @@
     dest: /usr/lib/systemd/system/tfe.service.d/service_override_slice.conf
     mode: 0644
 
+- name: "copy env file to tfe.service.d"
+  copy:
+    src: "{{ role_path }}/templates/service_override_env.conf.j2"
+    dest: /usr/lib/systemd/system/tfe.service.d/service_override_env.conf
+    mode: 0644
+
 - name: "replace action: replace service WantedBy from multi-user.target to workload.target"
   replace:
     path: "{{ item }}"
diff --git a/ansible/roles/tfe/templates/service_override_env.conf.j2 b/ansible/roles/tfe/templates/service_override_env.conf.j2
new file mode 100644
index 00000000..4d73ff5f
--- /dev/null
+++ b/ansible/roles/tfe/templates/service_override_env.conf.j2
@@ -0,0 +1,2 @@
+[Service]
+Environment=HASPUSER_PREFIX=/etc/tsg/licence/
\ No newline at end of file