standardizing SDC helm charts

[oom.git] / kubernetes / sdc / resources / config / environments / Template.json

diff --git a/kubernetes/sdc/resources/config/environments/Template.json b/kubernetes/sdc/resources/config/environments/Template.json
index 247e990..cb173ab 100755 (executable)
--- a/kubernetes/sdc/resources/config/environments/Template.json
+++ b/kubernetes/sdc/resources/config/environments/Template.json
@@ -17,19 +17,19 @@
             "private": "eth1"
         },
                "ECompP": {
-                   "ecomp_rest_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/auxapi",
-            "ueb_url_list": "dmaap.{{.Values.nsPrefix}},dmaap.{{.Values.nsPrefix}}", 
+                   "ecomp_rest_url": "http://portalapps.{{include "common.namespace" .}}:8989/ONAPPORTAL/auxapi",
+            "ueb_url_list": "dmaap.{{include "common.namespace" .}},dmaap.{{include "common.namespace" .}}", 
             "app_secret": "XftIATw9Jr3VzAcPqt3NnJOu", 
             "app_key": "x9UfO7JsDn8BESVX", 
             "inbox_name": "ECOMP-PORTAL-INBOX", 
-            "ecomp_redirect_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/login.htm", 
+            "ecomp_redirect_url": "http://portalapps.{{include "common.namespace" .}}:8989/ONAPPORTAL/login.htm", 
             "app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1",
                        "decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
         }, 
         "UEB": {
             "PublicKey": "iPIxkpAMI8qTcQj8",
             "SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
-            "fqdn": ["dmaap.{{.Values.nsPrefix}}", "dmaap.{{.Values.nsPrefix}}"]
+            "fqdn": ["dmaap.{{include "common.namespace" .}}", "dmaap.{{include "common.namespace" .}}"]
         },
         "Nodes": {
             "CS": "yyy",