diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index a263be6e..cb33d3ff 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -97,7 +97,7 @@ hasp_update_rpm_version: tsg_os_clixon_rpm_version: cligen: cligen-5.8.0-release clixon: clixon-5.8.0-release - tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.0.28.3a0820f + tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.0.29.1806fbd sce_rpm_version: sce: sce-1.0.04.83e4eba diff --git a/ansible/roles/traffic-engine/files/helm/conf/provision-init.sh b/ansible/roles/traffic-engine/files/helm/conf/provision-init.sh index 35c7c42c..b45b2dec 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/provision-init.sh +++ b/ansible/roles/traffic-engine/files/helm/conf/provision-init.sh @@ -10,11 +10,13 @@ ip tuntap add dev tap0 mode tap multi_queue {{- end }} mount -o remount,rw /sys -ip tuntap add dev {{ .Values.sce.endpoint_nic }} mode tap -ip link set dev {{ .Values.sce.endpoint_nic }} up -ip route add {{ .Values.sce.endpoint_netip }}/{{ .Values.sce.endpoint_mask }} dev {{ .Values.sce.endpoint_nic }} table 10 -{{ if .Values.sce.endpoint_gateway }} -ip route add default via {{ .Values.sce.endpoint_gateway }} table 10 +{{ if .Values.sce_config.endpoint_nic }} +ip tuntap add dev {{ .Values.sce_config.endpoint_nic }} mode tap +ip link set dev {{ .Values.sce_config.endpoint_nic }} up +ip route add {{ .Values.sce_config.endpoint_netip }}/{{ .Values.sce_config.endpoint_mask }} dev {{ .Values.sce_config.endpoint_nic }} table 10 +{{ if .Values.sce_config.endpoint_gateway }} +ip route add default via {{ .Values.sce_config.endpoint_gateway }} table 10 {{- end }} -ip a a {{ .Values.sce.endpoint_ip }}/{{ .Values.sce.endpoint_mask }} dev {{ .Values.sce.endpoint_nic }} noprefixroute +ip a a {{ .Values.sce_config.endpoint_ip }}/{{ .Values.sce_config.endpoint_mask }} dev {{ .Values.sce_config.endpoint_nic }} noprefixroute ip rule add dport 3784 table 10 +{{- end }} diff --git a/ansible/roles/traffic-engine/files/helm/conf/sce.conf b/ansible/roles/traffic-engine/files/helm/conf/sce.conf index e5cf9f43..d1490402 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/sce.conf +++ b/ansible/roles/traffic-engine/files/helm/conf/sce.conf @@ -28,10 +28,10 @@ max_chaining_size=32 # bypass_all_traffic:1 NF2NF and SF2SF bypass_all_traffic=0 rx_burst_max=128 -app_symbol=sce_{{ .Values.sce.nic_index }} -dev_endpoint={{ .Values.sce.endpoint_nic }} -dev_nf_interface={{ .Values.sce.steering_nic }} -dev_endpoint_src_ip={{ .Values.sce.endpoint_ip }} +app_symbol=sce_{{ .Values.sce_config.nic_index }} +dev_endpoint={{ .Values.sce_config.endpoint_nic }} +dev_nf_interface={{ .Values.sce_config.steering_nic }} +dev_endpoint_src_ip={{ .Values.sce_config.endpoint_ip }} # If the configuration file does not set src mac, get src mac through marsio_get_device_ether_addr(); # If the configuration file has src mac set, use the src mac in the file @@ -57,6 +57,6 @@ telegraf_listen_port=8300 [bfdd] #path=/var/run/frr/bfdd_{{ .Values.vsys_id }}.vty -path={{ .Values.sce.bfdd_socket_path }}/bfdd.vty -device={{ .Values.sce.endpoint_nic }} -gateway={{ .Values.sce.endpoint_gateway }} \ No newline at end of file +path={{ .Values.sce_config.bfdd_socket_path }}/bfdd.vty +device={{ .Values.sce_config.endpoint_nic }} +gateway={{ .Values.sce_config.endpoint_gateway }} \ No newline at end of file diff --git a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl index ab1088a8..5253666e 100644 --- a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl +++ b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl @@ -43,10 +43,10 @@ enable_breakpad_upload=0 {{- end -}} {{- define "traffic-engine.sce.workerthread" -}} -{{- if eq (len .Values.sce.affinity) 1 }} +{{- if eq (len .Values.sce_config.affinity) 1 }} {{- 1 }} {{- else }} -{{- sub (len .Values.sce.affinity) 1 }} +{{- sub (len .Values.sce_config.affinity) 1 }} {{- end }} {{- end -}} @@ -60,10 +60,10 @@ enable_breakpad_upload=0 {{- end -}} {{- define "traffic-engine.sce.cpu-affinity" -}} -{{- if eq (len .Values.sce.affinity) 1 }} -{{- print (index .Values.sce.affinity 0) }} +{{- if eq (len .Values.sce_config.affinity) 1 }} +{{- print (index .Values.sce_config.affinity 0) }} {{- else }} -{{- join "," .Values.sce.affinity }} +{{- join "," .Values.sce_config.affinity }} {{- end }} {{- end -}} diff --git a/ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml b/ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml index 6677ccd5..692ca078 100644 --- a/ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml +++ b/ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml @@ -242,25 +242,6 @@ spec: mountPath: /etc/localtime readOnly: true {{- end }} - - name: telegraf-sce - image: "{{ .Values.image.telegraf.repository }}:{{ .Values.image.telegraf.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.telegraf.pullPolicy }} - command: ["/usr/bin/telegraf", "-config", "/etc/telegraf/telegraf_sce.conf", "-config-directory", "/etc/telegraf/telegraf_statistic.d"] - securityContext: - privileged: true - volumeMounts: - - name: telegraf - mountPath: "/etc/telegraf/telegraf_sce.conf" - subPath: "telegraf_sce.conf" - - name: config-volume - mountPath: "/opt/tsg/etc/tsg_sn.json" - subPath: "opt/tsg/etc/tsg_sn.json" - - name: config-volume - mountPath: "/etc/default/telegraf" - subPath: "etc/default/telegraf" - - name: localtime-node - mountPath: /etc/localtime - readOnly: true - name: merge-exporter image: "{{ .Values.mergeExporter.image.repository }}:{{ .Values.mergeExporter.image.tag }}" @@ -286,6 +267,27 @@ spec: - name: certstore-minidump mountPath: /run/certstore/crashreport +{{- if and (eq .Values.sce.enable .Values.define_enable_val_yes) (.Values.sce_config.endpoint_nic) }} + - name: telegraf-sce + image: "{{ .Values.image.telegraf.repository }}:{{ .Values.image.telegraf.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.telegraf.pullPolicy }} + command: ["/usr/bin/telegraf", "-config", "/etc/telegraf/telegraf_sce.conf", "-config-directory", "/etc/telegraf/telegraf_statistic.d"] + securityContext: + privileged: true + volumeMounts: + - name: telegraf + mountPath: "/etc/telegraf/telegraf_sce.conf" + subPath: "telegraf_sce.conf" + - name: config-volume + mountPath: "/opt/tsg/etc/tsg_sn.json" + subPath: "opt/tsg/etc/tsg_sn.json" + - name: config-volume + mountPath: "/etc/default/telegraf" + subPath: "etc/default/telegraf" + - name: localtime-node + mountPath: /etc/localtime + readOnly: true + - name: sce image: "{{ .Values.image.sce.repository }}:{{ .Values.image.sce.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.sce.pullPolicy }} @@ -348,7 +350,7 @@ spec: - name: hotfix-sce mountPath: /etc/traffic-engine/hotfix/sce - name: bfdd-unix-socket - mountPath: {{ .Values.sce.bfdd_socket_path }} + mountPath: {{ .Values.sce_config.bfdd_socket_path }} - name: bfdd image: "{{ .Values.image.bfdd.repository }}:{{ .Values.image.bfdd.tag | default .Chart.AppVersion }}" @@ -385,8 +387,8 @@ spec: - name: hotfix-bfdd mountPath: /etc/traffic-engine/hotfix/bfdd - name: bfdd-unix-socket - mountPath: {{ .Values.sce.bfdd_socket_path }} - + mountPath: {{ .Values.sce_config.bfdd_socket_path }} +{{- end }} initContainers: diff --git a/ansible/roles/traffic-engine/files/helm/values.yaml b/ansible/roles/traffic-engine/files/helm/values.yaml index cc6aebd2..3fde3168 100644 --- a/ansible/roles/traffic-engine/files/helm/values.yaml +++ b/ansible/roles/traffic-engine/files/helm/values.yaml @@ -224,8 +224,10 @@ service: shaping: enable: yes - sce: + enable: yes + +sce_config: steering_nic: nf_0_sce endpoint_nic: endpoint_0_sce nic_index: 1