bugfix:修改sce配置文件

ansible/install_config/group_vars/rpm_version.yml

@@ -105,4 +105,4 @@ sce_rpm_version:
   sce: sce-1.0.04.83e4eba
 
 bfdd_rpm_version:
-  bfdd: need-to-modify
+  bfdd: bfdd-1.0.2-release

ansible/roles/bfdd/tasks/main.yml

@@ -38,14 +38,35 @@
     state: present
     disable_gpg_check: yes
 
-- name: "temp: copy rpm to dest"
-  copy:
-    src: "{{ role_path }}/files/bfdd-1.1.1-release.x86_64.rpm"
-    dest: /tmp
+#- name: "temp: copy rpm to dest"
+#  copy:
+#    src: "{{ role_path }}/files/bfdd-1.1.1-release.x86_64.rpm"
+#    dest: /tmp
 
-- name: "install bfdd"
+#- name: "install bfdd"
+#  yum:
+#    name:
+#      - /tmp/bfdd-1.1.1-release.x86_64.rpm"
+#    state: present
+#    disable_gpg_check: yes
+
+- name: "download rpm packages: bfdd"
   yum:
     name:
-      - /tmp/bfdd-1.1.1-release.x86_64.rpm"
+      - "{{ bfdd_rpm_version.bfdd }}"
+    conf_file: "{{ rpm_repo_config_path }}"
     state: present
-    disable_gpg_check: yes
+    download_only: yes
+    download_dir: "{{ path_download }}"
+
+- name: "Get bfdd rpm path"
+  find:
+    path: /tmp/rpm_download/
+    pattern: "{{ bfdd_rpm_version.bfdd }}*"
+  register: bfdd_rpm_fullname
+
+- name: "Install bfdd from local path" 
+  yum:
+    name: "{{ bfdd_rpm_fullname.files[0].path }}" 
+    state: present
+    disable_gpg_check: yes

ansible/roles/traffic-engine/files/helm/conf/sce.conf

@@ -57,6 +57,6 @@ telegraf_listen_port=8300
 
 [bfdd]
 #path=/var/run/frr/bfdd_{{ .Values.vsys_id }}.vty
-path=/run/frr/bfdd.vty
+path={{ .Values.sce.bfdd_socket_path }}/bfdd.vty
 device={{ .Values.sce.endpoint_nic }}
 gateway={{ .Values.sce.endpoint_gateway }}

ansible/roles/traffic-engine/files/helm/templates/_config.tpl

@@ -61,7 +61,7 @@ enable_breakpad_upload=0
 
 {{- define "traffic-engine.sce.cpu-affinity" -}}
 {{- if eq (len .Values.sce.affinity) 1 }}
-{{- print (index .Values.sce.affinity 0) "," (index .Values.sce.affinity 0) }}
+{{- print (index .Values.sce.affinity 0) }}
 {{- else }}
 {{- join "," .Values.sce.affinity }}
 {{- end }}

ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml

@@ -321,6 +321,18 @@ spec:
           failureThreshold: 30
           periodSeconds: 10
         volumeMounts:
+        - name: opt-tsg-mrzcpd
+          mountPath: /opt/tsg/mrzcpd
+          readOnly: false
+        - name: var-run-mrzcpd
+          mountPath: /var/run/mrzcpd
+          readOnly: false
+        - name: var-run-dpdk
+          mountPath: /var/run/dpdk
+          readOnly: false
+        - name: root-sys
+          mountPath: /root/sys
+          readOnly: false
         - name: sce
           mountPath: "/opt/tsg/config"
         - name: config-volume
@@ -336,7 +348,7 @@ spec:
         - name: hotfix-sce
           mountPath: /etc/traffic-engine/hotfix/sce
         - name: bfdd-unix-socket
-          mountPath: /var/run/frr
+          mountPath: {{ .Values.sce.bfdd_socket_path }}
 
       - name: bfdd
         image: "{{ .Values.image.bfdd.repository }}:{{ .Values.image.bfdd.tag | default .Chart.AppVersion }}"
@@ -373,7 +385,7 @@ spec:
         - name: hotfix-bfdd
           mountPath: /etc/traffic-engine/hotfix/bfdd
         - name: bfdd-unix-socket
-          mountPath: /var/run/frr
+          mountPath: {{ .Values.sce.bfdd_socket_path }}
 
 
 

ansible/roles/traffic-engine/files/helm/values.yaml

@@ -233,6 +233,7 @@ sce:
   endpoint_netip: 127.0.0.1
   endpoint_mask: 24
   affinity: [1]
+  bfdd_socket_path: "/run/frr"
 
 sid:
   firewall: 1