diff options
9 files changed, 9 insertions, 9 deletions
diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index 7f01d837..c3276d2a 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -107,7 +107,7 @@ packet_adapter_rpm_version: packet_adapter: packet_adapter-2.0.2.4f48b59 nic_uio_binder_rpm_version: - nic_uio_binder: nic-uio-binder-1.0.10-c67fa3b + nic_uio_binder: nic-uio-binder-1.0.11-08f054a dp_trace_rpm_version: dp_trace: dp_trace_telemetry-0.2.1.c48d240 diff --git a/ansible/roles/dp-trace-telemetry/files/helm/templates/_config.tpl b/ansible/roles/dp-trace-telemetry/files/helm/templates/_config.tpl index 0a2f97bb..36965b5d 100644 --- a/ansible/roles/dp-trace-telemetry/files/helm/templates/_config.tpl +++ b/ansible/roles/dp-trace-telemetry/files/helm/templates/_config.tpl @@ -2,7 +2,7 @@ {{- if eq .Values.datapath_trace.debug.enable_interactive_startup .Values.define_enable_val_yes -}} while true; do sleep 10;done {{- else -}} - exec /opt/tsg/dp_trace_telemetry/bin/dp_trace_telemetry -c /opt/tsg/dp_trace_telemetry/etc/dp_trace.conf -d /opt/tsg/dp_trace_telemetry/etc/dp_trace_dy.conf 2>&1|tee >(systemd-cat -t $DEPLOYMENT_NAME) + exec /opt/tsg/dp_trace_telemetry/bin/dp_trace_telemetry -c /opt/tsg/dp_trace_telemetry/etc/dp_trace.conf -d /opt/tsg/dp_trace_telemetry/etc/dp_trace_dy.conf {{- end }} {{- end -}} diff --git a/ansible/roles/k3s-install/files/log-collector.yaml b/ansible/roles/k3s-install/files/log-collector.yaml index d63bd620..a0042159 100644 --- a/ansible/roles/k3s-install/files/log-collector.yaml +++ b/ansible/roles/k3s-install/files/log-collector.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: log-collector - image: registry.gdnt-cloud.website/tsg-log-collector:%%NIC_UIO_BINDER_IMAGE_TAR%% + image: registry.gdnt-cloud.website/tsg-log-collector:%%LOG_COLLECTOR_IMAGE_TAR%% command: - "bash" - "-ec" diff --git a/ansible/roles/mrzcpd/files/helm/templates/_config.tpl b/ansible/roles/mrzcpd/files/helm/templates/_config.tpl index 3f2a3c0e..e3dbcae3 100644 --- a/ansible/roles/mrzcpd/files/helm/templates/_config.tpl +++ b/ansible/roles/mrzcpd/files/helm/templates/_config.tpl @@ -10,7 +10,7 @@ {{- if eq .Values.mrzcpd.debug.enable_interactive_startup .Values.define_enable_val_yes -}} while true; do sleep 10;done {{- else -}} - exec /opt/tsg/mrzcpd/bin/mrzcpd -c /opt/tsg/mrzcpd/etc/mrglobal.conf -s /opt/tsg/mrzcpd/etc/mrglobal.dynamic.conf 2>&1|tee >(systemd-cat -t $DEPLOYMENT_NAME) + exec /opt/tsg/mrzcpd/bin/mrzcpd -c /opt/tsg/mrzcpd/etc/mrglobal.conf -s /opt/tsg/mrzcpd/etc/mrglobal.dynamic.conf {{- end }} {{- end -}} diff --git a/ansible/roles/packet_adapter/files/helm/templates/_config.tpl b/ansible/roles/packet_adapter/files/helm/templates/_config.tpl index e6096380..e490dfcf 100644 --- a/ansible/roles/packet_adapter/files/helm/templates/_config.tpl +++ b/ansible/roles/packet_adapter/files/helm/templates/_config.tpl @@ -84,7 +84,7 @@ {{- if eq .Values.debug.inject_adapter.enable_interactive_startup .Values.define_enable_val_yes -}} while true; do sleep 10;done {{- else -}} - exec /opt/tsg/packet_adapter/bin/packet_adapter 2>&1 | tee >(systemd-cat -t $DEPLOYMENT_NAME) + exec /opt/tsg/packet_adapter/bin/packet_adapter {{- end }} {{- end -}} diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml index f760a87e..01b82adf 100644 --- a/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml +++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-firewall.yaml @@ -90,7 +90,7 @@ spec: {{- if eq .Values.debug.firewall.enable_interactive_startup .Values.define_enable_val_yes }} while true; do sleep 10;done {{- else }} - exec /opt/tsg/sapp/sapp 2>&1|tee >(systemd-cat -t $DEPLOYMENT_NAME) + exec /opt/tsg/sapp/sapp {{- end }} ports: - containerPort: 9273 diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml index e21d33a5..a2b6f518 100644 --- a/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml +++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-proxy.yaml @@ -63,7 +63,7 @@ spec: {{- if eq .Values.debug.proxy.enable_interactive_startup .Values.define_enable_val_yes }} while true; do sleep 10;done {{- else }} - exec /opt/tsg/tfe/bin/tfe 2>&1|tee >(systemd-cat -t $DEPLOYMENT_NAME) + exec /opt/tsg/tfe/bin/tfe {{- end }} ports: - containerPort: 9001 diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-sce.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-sce.yaml index e0b7b254..a057d70f 100644 --- a/ansible/roles/traffic-engine/files/helm/templates/deployment-sce.yaml +++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-sce.yaml @@ -63,7 +63,7 @@ spec: {{- if eq .Values.debug.service_chaining.enable_interactive_startup .Values.define_enable_val_yes }} while true; do sleep 10;done {{- else }} - exec /opt/tsg/sce/bin/sce 2>&1|tee >(systemd-cat -t $DEPLOYMENT_NAME) + exec /opt/tsg/sce/bin/sce {{- end }} ports: - containerPort: 9006 diff --git a/ansible/roles/traffic-engine/files/helm/templates/deployment-shaping.yaml b/ansible/roles/traffic-engine/files/helm/templates/deployment-shaping.yaml index 87cc76ff..1daa3574 100644 --- a/ansible/roles/traffic-engine/files/helm/templates/deployment-shaping.yaml +++ b/ansible/roles/traffic-engine/files/helm/templates/deployment-shaping.yaml @@ -77,7 +77,7 @@ spec: {{- if eq .Values.debug.shaping.enable_interactive_startup .Values.define_enable_val_yes }} while true; do sleep 10;done {{- else }} - exec /opt/tsg/shaping_engine/bin/shaping_engine 2>&1|tee >(systemd-cat -t $DEPLOYMENT_NAME) + exec /opt/tsg/shaping_engine/bin/shaping_engine {{- end }} ports: - containerPort: 8551 |