Moving dev back to LF Gerrit

[it/dep.git] / ric-platform / 50-RIC-Platform / helm / rtmgr / templates / env.yaml

diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/env.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/env.yaml
index 2f6ab6a..2fb3115 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/env.yaml
+++ b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/env.yaml
@@ -20,17 +20,16 @@ metadata:
   name: {{ include "common.configmapname.rtmgr" . }}-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.rtmgr.service.rmr.route.port }}"
-   XMURL: "http://{{ include "common.servicename.appmgr.http" . }}:8080/ric/v1/xapps"
+   DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }} 
+   RMR_RTG_SVC: {{ include "common.serviceport.rtmgr.rmr.route" . | quote }}
+   XMURL: "http://{{ include "common.servicename.appmgr.http" . }}:{{ include "common.serviceport.appmgr.http" . }}/ric/v1/xapps"
    RTFILE: "/db/rt.json"
    CFGFILE: "/cfg/rtmgr-config.json"
    RPE: "{{ .Values.rtmgr.rpe }}"
    SBI: "{{ .Values.rtmgr.sbi }}"
    SBIURL: "{{ .Values.rtmgr.sbiurl }}"
    NBI: "{{ .Values.rtmgr.nbi }}"
-   NBIURL: "{{ .Values.rtmgr.nbiurl }}"
+   NBIURL: "http://{{ include "common.servicename.rtmgr.http" . }}:{{ include "common.serviceport.rtmgr.http" . }}"
    LOGLEVEL: "{{ .Values.rtmgr.loglevel }}"
-