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

feature:TSG-X-P0906环境下chart包新增tsg_device_tag.json文件

Browse Source
This commit is contained in:
fumingwei
2022-08-30 19:32:47 +08:00
parent 86f8170f1a
commit 334a66f71d
7 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/HAL_deploy.yml
View File

@@ -144,7 +144,6 @@
roles:
- {role: k3s-install, tags: k3s-install}
- {role: tsg-os-provision, tags: tsg-os-provision}
- {role: tsg_device_tag, tags: tsg_device_tag}
- {role: tsg_sn, tags: tsg_sn}
- {role: framework, tags: framework}
- {role: mrzcpd, tags: mrzcpd}

2
ansible/roles/traffic-engine/files/helm/conf/maat.conf
View File

@@ -61,4 +61,4 @@ FULL_CFG_DIR=tsgrule/full/index/
EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json
[MAAT]
DEVICE_TAGS={"tags":[{{- include "traffic-engine.device-tag-list" . }}]}
ACCEPT_TAGS={"tags":[{{- include "traffic-engine.device-tag-list" . }}]}

2
ansible/roles/traffic-engine/files/helm/conf/tsg_device_tag.json Normal file
View File

@@ -0,0 +1,2 @@
[MAAT]
ACCEPT_TAGS={"tags":[{{- include "traffic-engine.device-tag-list" . }}]}

1
ansible/roles/traffic-engine/files/helm/templates/certstore.yaml
View File

@@ -5,3 +5,4 @@ metadata:
namespace: default
data:
cert_store.ini: {{ tpl (.Files.Get "conf/cert_store.ini") . | quote }}
tsg_device_tag.json: {{ tpl (.Files.Get "conf/tsg_device_tag.json") . | quote }}

1
ansible/roles/traffic-engine/files/helm/templates/sapp.yaml
View File

@@ -15,3 +15,4 @@ data:
wangw.conf: {{ tpl (.Files.Get "conf/wangw.conf") . | quote }}
wire_graft.conf: {{ tpl (.Files.Get "conf/wire_graft.conf") . | quote }}
vlan_flipping_map.conf: {{ tpl (.Files.Get "conf/vlan_flipping_map.conf") . | quote }}
tsg_device_tag.json: {{ tpl (.Files.Get "conf/tsg_device_tag.json") . | quote }}

1
ansible/roles/traffic-engine/files/helm/templates/tfe.yaml
View File

@@ -6,3 +6,4 @@ metadata:
data:
tfe.conf: {{ tpl (.Files.Get "conf/tfe.conf") . | quote }}
pangu_pxy.conf: {{ tpl (.Files.Get "conf/pangu_pxy.conf") . | quote }}
tsg_device_tag.json: {{ tpl (.Files.Get "conf/tsg_device_tag.json") . | quote }}

9
ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml
View File

@@ -86,6 +86,9 @@ spec:
- name: sapp
mountPath: "/opt/tsg/sapp/etc/vlan_flipping_map.conf"
subPath: "vlan_flipping_map.conf"
- name: sapp
mountPath: "/opt/tsg/etc/tsg_device_tag.json"
subPath: "tsg_device_tag.json"
- name: config-volume
mountPath: "/opt/tsg/etc/tsg_sn.json"
subPath: "opt/tsg/etc/tsg_sn.json"
@@ -119,6 +122,9 @@ spec:
- name: tfe
mountPath: "/opt/tsg/tfe/conf/pangu/pangu_pxy.conf"
subPath: "pangu_pxy.conf"
- name: tfe
mountPath: "/opt/tsg/etc/tsg_device_tag.json"
subPath: "tsg_device_tag.json"
- name: config-volume
mountPath: "/opt/tsg/etc/tsg_sn.json"
subPath: "opt/tsg/etc/tsg_sn.json"
@@ -139,6 +145,9 @@ spec:
- name: certstore
mountPath: "/opt/tsg/certstore/conf/cert_store.ini"
subPath: "cert_store.ini"
- name: certstore
mountPath: "/opt/tsg/etc/tsg_device_tag.json"
subPath: "tsg_device_tag.json"
- name: config-volume
mountPath: "/opt/tsg/etc/tsg_sn.json"
subPath: "opt/tsg/etc/tsg_sn.json"