2 files changed, 16 insertions, 16 deletions
diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index 5d6eaef94e..d35590ec67 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -8,34 +8,34 @@
    "chef_type": "environment",
 
    "default_attributes": {
-        "CS_VIP": "sdc-cs.onap-sdc",
-        "BE_VIP": "sdc-be.onap-sdc",
-        "FE_VIP": "sdc-fe.onap-sdc",
-        "ES_VIP": "sdc-es.onap-sdc",
+        "CS_VIP": "sdc-cs.{{.Values.nsPrefix}}",
+        "BE_VIP": "sdc-be.{{.Values.nsPrefix}}",
+        "FE_VIP": "sdc-fe.{{.Values.nsPrefix}}",
+        "ES_VIP": "sdc-es.{{.Values.nsPrefix}}",
         "interfaces": {
             "application": "eth0",
             "private": "eth0"
         },
                 "ECompP": {
-                    "ecomp_rest_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/auxapi",
-            "ueb_url_list": "dmaap.onap-message-router, dmaap.onap-message-router",
+                    "ecomp_rest_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/auxapi",
+            "ueb_url_list": "dmaap.{{.Values.nsPrefix}}, dmaap.{{.Values.nsPrefix}}",
             "app_secret": "XftIATw9Jr3VzAcPqt3NnJOu",
             "app_key": "x9UfO7JsDn8BESVX",
             "inbox_name": "ECOMP-PORTAL-INBOX",
-            "ecomp_redirect_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/login.htm",
+            "ecomp_redirect_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/login.htm",
             "app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1",
                         "decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
         },
         "UEB": {
             "PublicKey": "iPIxkpAMI8qTcQj8",
             "SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
-            "fqdn": ["dmaap.onap-message-router", "dmaap.onap-message-router"]
+            "fqdn": ["dmaap.{{.Values.nsPrefix}}", "dmaap.{{.Values.nsPrefix}}"]
         },
         "Nodes": {
-            "CS": "sdc-cs.onap-sdc",
-            "BE": "sdc-be.onap-sdc",
-            "FE": "sdc-fe.onap-sdc",
-            "ES": "sdc-es.onap-sdc"
+            "CS": "sdc-cs.{{.Values.nsPrefix}}",
+            "BE": "sdc-be.{{.Values.nsPrefix}}",
+            "FE": "sdc-fe.{{.Values.nsPrefix}}",
+            "ES": "sdc-es.{{.Values.nsPrefix}}"
         }
     },
     "override_attributes": {
diff --git a/kubernetes/sdc/resources/config/environments/Template.json b/kubernetes/sdc/resources/config/environments/Template.json
index ddddc78e2b..247e990f31 100755
--- 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.onap-portal:8989/ONAPPORTAL/auxapi",
-            "ueb_url_list": "dmaap.onap-message-router,dmaap.onap-message-router", 
+		    "ecomp_rest_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/auxapi",
+            "ueb_url_list": "dmaap.{{.Values.nsPrefix}},dmaap.{{.Values.nsPrefix}}", 
             "app_secret": "XftIATw9Jr3VzAcPqt3NnJOu", 
             "app_key": "x9UfO7JsDn8BESVX", 
             "inbox_name": "ECOMP-PORTAL-INBOX", 
-            "ecomp_redirect_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/login.htm", 
+            "ecomp_redirect_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/login.htm", 
             "app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1",
 			"decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
         }, 
         "UEB": {
             "PublicKey": "iPIxkpAMI8qTcQj8",
             "SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
-            "fqdn": ["dmaap.onap-message-router", "dmaap.onap-message-router"]
+            "fqdn": ["dmaap.{{.Values.nsPrefix}}", "dmaap.{{.Values.nsPrefix}}"]
         },
         "Nodes": {
             "CS": "yyy",