diff options
| author | fumingwei <[email protected]> | 2024-08-27 19:53:27 +0800 |
|---|---|---|
| committer | 付明卫 <[email protected]> | 2024-08-30 10:20:36 +0000 |
| commit | b3acbb1a4fdbd986c9a733cf7905e1c74a0d0e27 (patch) | |
| tree | 1f60659c34e8b773e162e8e0eec83a6f8ef35a0b | |
| parent | 02090e172f309db2f26929d8c3841a08824f4579 (diff) | |
feature:support clixon cm connection builtin option in traffic-engine and dp-trace.
| -rw-r--r-- | ansible/roles/dp-trace-telemetry/files/helm/templates/dp-trace.yaml | 3 | ||||
| -rw-r--r-- | ansible/roles/traffic-engine/files/helm/templates/_config.tpl | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ansible/roles/dp-trace-telemetry/files/helm/templates/dp-trace.yaml b/ansible/roles/dp-trace-telemetry/files/helm/templates/dp-trace.yaml index affa7591..7056778b 100644 --- a/ansible/roles/dp-trace-telemetry/files/helm/templates/dp-trace.yaml +++ b/ansible/roles/dp-trace-telemetry/files/helm/templates/dp-trace.yaml @@ -46,6 +46,9 @@ data: {{- if eq .Values.datapath_trace.cm.connectivity "local_cache"}} maat_redis_server={{ .Values.datapath_trace.cm.local_cache.cache_name }}-redis-master.tsg-os-system.svc maat_redis_port_range=6379 + {{- else if eq .Values.datapath_trace.cm.connectivity "builtin" }} + maat_redis_server=tsg-cm.tsg-os-system.svc + maat_redis_port_range=7002 {{- else }} maat_redis_server={{ .Values.datapath_trace.cm.direct.address}} maat_redis_port_range={{ .Values.datapath_trace.cm.direct.port}} diff --git a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl index 416a7a5f..eec1b52b 100644 --- a/ansible/roles/traffic-engine/files/helm/templates/_config.tpl +++ b/ansible/roles/traffic-engine/files/helm/templates/_config.tpl @@ -173,6 +173,8 @@ Requires "traffic-engine.volume.mrzcpd" {{- define "traffic-engine.global.cm.server-ip" -}} {{- if eq .Values.external_resources.cm.connectivity "direct" }} {{- print .Values.external_resources.cm.direct.address }} +{{- else if eq .Values.external_resources.cm.connectivity "builtin" }} +{{- print "tsg-cm.tsg-os-system.svc" }} {{- else }} {{- print .Values.external_resources.cm.local_cache.cache_name "-redis-master.tsg-os-system.svc" }} {{- end }} @@ -181,6 +183,8 @@ Requires "traffic-engine.volume.mrzcpd" {{- define "traffic-engine.global.cm.server-port" -}} {{- if eq .Values.external_resources.cm.connectivity "direct" }} {{- print .Values.external_resources.cm.direct.port }} +{{- else if eq .Values.external_resources.cm.connectivity "builtin" }} +{{- print "7002" }} {{- else }} {{- print "6379" }} {{- end }} |