X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-platform%2F50-RIC-Platform%2Fhelm%2Fa1mediator%2Ftemplates%2Fenv.yaml;h=e60850a9882e52c8a5a50a78d500e2df8ed93416;hb=8195fb061b7fd8b9d1fabea509ed841b885655b3;hp=3b4203aa35c7175cf95c42da5f70375e0e691285;hpb=0309475769b27702c8c886411222882da8b519b1;p=it%2Fdep.git

diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/env.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/env.yaml
index 3b4203aa..e60850a9 100644
--- a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/env.yaml
+++ b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/env.yaml
@@ -20,10 +20,14 @@ metadata:
   name: {{ include "common.configmapname.a1mediator" . }}-env
 data:
   DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_SERVICE_PORT: "6379"
+  DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
   DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
-  DBAAS_PORT_6379_TCP_PORT: "6379"
-  RMR_RTG_SVC: "{{ .Values.a1mediator.service.rmr.route.port }}"
-  PYTHONUNBUFFERED: "0"
-  RMR_RCV_RETRY_INTERVAL: "{{ .Values.a1mediator.rmr_timeout_config.rcv_retry_interval_ms }}"
-  RMR_RETRY_TIMES: "{{ .Values.a1mediator.rmr_timeout_config.rcv_retry_times }}"
+  DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
+  RMR_RTG_SVC: {{ include "common.serviceport.a1mediator.rmr.route" . | quote }}
+  PYTHONUNBUFFERED: "1"
+  A1_RMR_RETRY_TIMES: "{{ .Values.a1mediator.rmr_timeout_config.a1_rcv_retry_times }}"
+  # this sets the source field in messages from a1 to point back to a1s service name, rather than it's random pod name
+  # In my private testing, this is needed! however it wasn't here in it/dep. If routing doesn't work, possibly add this back.
+  # RMR_SRC_ID: curlybrace curlybrace .Values.rmrservice.name curlybrace curlybrace
+  INSTANCE_DELETE_NO_RESP_TTL: "{{ .Values.a1mediator.rmr_timeout_config.ins_del_no_resp_ttl }}"
+  INSTANCE_DELETE_RESP_TTL: "{{ .Values.a1mediator.rmr_timeout_config.ins_del_resp_ttl }}"