gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature: TSG-17429 update clixon to 1.2.2

Browse Source
This commit is contained in:
wangmenglan
2023-11-01 14:43:23 +08:00
parent 57462f6196
commit 5aa986532d
5 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/install_config/group_vars/rpm_version.yml
View File

@@ -110,7 +110,7 @@ hasp_tools_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.2.1.3c9fda4
tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.2.2.63d0cea
sce_rpm_version:
sce: sce-1.1.0.db51761

22
ansible/roles/traffic-engine/files/helm/conf/sce.conf
View File

@@ -43,14 +43,18 @@ max_chaining_size=32
# bypass_traffic:3 bypass decrypted traffic
bypass_traffic=0
rx_burst_max=128
min_timeout_ms=900
app_symbol=sce_{{ .Values.app_symbol_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 }}
dev_nf_name={{ .Values.sce_config.steering_nic }}
# 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
# dev_endpoint_src_mac=aa:aa:aa:aa:aa:aa
# dev_endpoint_l2 for vlan
dev_endpoint_l2_name={{ .Values.sce_config.vlan_config.endpoint_nic }}
vlan_encapsulate_replace_orig_vlan_header=0
# dev_endpoint_l3 for vxlan
dev_endpoint_l3_name={{ .Values.sce_config.vxlan_config.endpoint_nic }}
dev_endpoint_l3_ip={{ .Values.sce_config.vxlan_config.endpoint_ip }}
# dev_endpoint_l3_mac=aa:aa:aa:aa:aa:aa
[stat]
output_file=log/sce.fs2
@@ -72,8 +76,10 @@ telegraf_listen_port=8300
[bfdd]
enable=1
# use default_gw_mac when enable = 0
default_gw_mac=aa:aa:aa:aa:aa:aa
path=/run/frr/bfdd.vty
device={{ .Values.sce_config.endpoint_nic }}
device={{ .Values.sce_config.vxlan_config.endpoint_nic }}
local_address=127.0.0.1
gateway={{ .Values.sce_config.endpoint_gateway }}
gateway={{ .Values.sce_config.vxlan_config.endpoint_gateway }}
icmp_cycle_time_s=10

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

@@ -186,14 +186,14 @@ enable_breakpad_upload=0
{{- end -}}
{{- define "traffic-engine.init.sce" -}}
{{ 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
{{ if .Values.sce_config.vxlan_config.endpoint_nic }}
ip tuntap add dev {{ .Values.sce_config.vxlan_config.endpoint_nic }} mode tap
ip link set dev {{ .Values.sce_config.vxlan_config.endpoint_nic }} up
ip route add {{ .Values.sce_config.vxlan_config.endpoint_netip }}/{{ .Values.sce_config.vxlan_config.endpoint_mask }} dev {{ .Values.sce_config.vxlan_config.endpoint_nic }} table 10
{{ if .Values.sce_config.vxlan_config.endpoint_gateway }}
ip route add default via {{ .Values.sce_config.vxlan_config.endpoint_gateway }} table 10
{{- end }}
ip a a {{ .Values.sce_config.endpoint_ip }}/{{ .Values.sce_config.endpoint_mask }} dev {{ .Values.sce_config.endpoint_nic }} noprefixroute
ip a a {{ .Values.sce_config.vxlan_config.endpoint_ip }}/{{ .Values.sce_config.vxlan_config.endpoint_mask }} dev {{ .Values.sce_config.vxlan_config.endpoint_nic }} noprefixroute
ip rule add dport 3784 table 10
{{- end }}
{{- end -}}

2
ansible/roles/traffic-engine/files/helm/templates/deployment-service-chaining.yaml
View File

@@ -1,4 +1,4 @@
{{- if and (eq .Values.service_chaining.enable .Values.define_enable_val_yes) (.Values.sce_config.endpoint_nic) }}
{{- if eq .Values.service_chaining.enable .Values.define_enable_val_yes }}
apiVersion: apps/v1
kind: Deployment
metadata:

14
ansible/roles/traffic-engine/files/helm/values.yaml
View File

@@ -208,12 +208,14 @@ service_chaining:
sce_config:
steering_nic: nf_0_sce
endpoint_nic: endpoint_0_sce
endpoint_ip: 127.0.0.1
endpoint_gateway: 127.0.0.1
endpoint_netip: 127.0.0.1
endpoint_mask: 24
affinity: [1]
vxlan_config:
endpoint_nic: ep_0_sce_l3
endpoint_ip: 127.0.0.1
endpoint_gateway: 127.0.0.1
endpoint_netip: 127.0.0.1
endpoint_mask: 24
vlan_config:
endpoint_nic: ep_0_sce_l2
proxy_config:
proxy_nic: nf_1_proxy