From 10b108afdb860bcfa6ce4ec3d9a3e1e27f2954da Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Wed, 21 Jun 2023 12:13:39 +0800
Subject: [PATCH] =?UTF-8?q?feature:TSG-15664:OS=E9=80=82=E9=85=8D=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/roles/hasp/tasks/main.yml                   |  7 ++++++-
 .../traffic-engine/files/helm/templates/_config.tpl | 13 ++++++++++++-
 .../files/helm/templates/deployment-firewall.yaml   |  2 ++
 make/Makefile.TSGXBUILDCONTAINERP0906               |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ansible/roles/hasp/tasks/main.yml b/ansible/roles/hasp/tasks/main.yml
index 3a46d326..dd0c1ef1 100644
--- a/ansible/roles/hasp/tasks/main.yml
+++ b/ansible/roles/hasp/tasks/main.yml
@@ -43,4 +43,9 @@
   copy:
     src: "{{ role_path }}/files/hasp.sh"
     dest: /etc/profile.d/
-    mode: 0755
\ No newline at end of file
+    mode: 0755
+
+- name: "start hasp_monitor.service"
+  systemd:
+    name: hasp_monitor.service
+    enabled: yes
diff --git a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl
index 7dc8e7b4..465f6dc7 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl
+++ b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl
@@ -559,4 +559,15 @@ enable_breakpad_upload=0
 {{- if eq .Values.external_resources.cm.connectivity "local_cache" }}
             sed -Ei "s|CM_POLICY_LOCAL_CACHE_IP_LOCATION|${CM_POLICY_LOCAL_CACHE_IP?}|g" /opt/tsg/shaping_engine/conf/shaping.conf
 {{- end }}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
+
+{{- define "traffic-engine.volume.dev-shm" -}}
+      - name: dev-shm
+        hostPath:
+          path: /dev/shm
+{{- end -}}
+
+{{- define "traffic-engine.mount.dev-shm" -}}
+        - name: dev-shm
+          mountPath: /dev/shm
+{{- end -}}
diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml
index 0a5aae00..22983160 100644
--- a/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml
+++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml
@@ -94,6 +94,7 @@ spec:
         {{ template "traffic-engine.firewall.mount.prestart" . }}
         {{ template "traffic-engine.firewall.mount.hostpath" . }}
         {{ template "traffic-engine.mount.dev-bus-usb" . }}
+        {{ template "traffic-engine.mount.dev-shm" . }}
 
       - name: telegraf
         image: "registry.gdnt-cloud.website/tsg-telegraf:{{ .Chart.AppVersion }}"
@@ -178,3 +179,4 @@ spec:
       {{ template "traffic-engine.firewall.volume.prestart" . }}
       {{ template "traffic-engine.volume.hostpath" . }}
       {{ template "traffic-engine.volume.dev-bus-usb" . }}
+      {{ template "traffic-engine.volume.dev-shm" . }}
\ No newline at end of file
diff --git a/make/Makefile.TSGXBUILDCONTAINERP0906 b/make/Makefile.TSGXBUILDCONTAINERP0906
index 7444aa5c..0c41b007 100644
--- a/make/Makefile.TSGXBUILDCONTAINERP0906
+++ b/make/Makefile.TSGXBUILDCONTAINERP0906
@@ -52,7 +52,7 @@ builddir:
 	tar -zxvf $(PROJECTDIR)/ansible/roles/traffic-engine/files/helm-linux-amd64.tar.gz  -C /tmp/helm
 
 installer: builddir
-	sed -i '/sapp-pr:/d;/tfe-pr:/d;/mrzcpd:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
+	sed -i '/sapp:/d;/tfe-pr:/d;/mrzcpd:/d' $(PROJECTDIR)/ansible/install_config/group_vars/rpm_version.yml
 
 container-images-generate: builddir
 	podman load < $(PROJECTDIR)/package/rockylinux8.tar