From 1ffbd99a2757af8e10d0f6af46177c646364f91b Mon Sep 17 00:00:00 2001
From: BorislavG <Borislav.Glozman@amdocs.com>
Date: Tue, 24 Apr 2018 07:56:27 +0000
Subject: Make all services independent of helm Release.Name

Issue-ID: OOM-906
Change-Id: Ic65127d3981cb0a696c784392cab59fbf06b1e66
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
---
 .../sdc/resources/config/environments/AUTO.json    | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'kubernetes/sdc/resources')

diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index 5ae381c746..2732bea10e 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -9,36 +9,36 @@
 
     "default_attributes": {
         "disableHttp": false,
-        "CS_VIP": "{{.Release.Name}}-sdc-cs.{{include "common.namespace" .}}",
-        "BE_VIP": "{{.Release.Name}}-sdc-be.{{include "common.namespace" .}}",
-        "FE_VIP": "{{.Release.Name}}-sdc-fe.{{include "common.namespace" .}}",
-        "ES_VIP": "{{.Release.Name}}-sdc-es.{{include "common.namespace" .}}",
-        "KB_VIP": "{{.Release.Name}}-sdc-kb.{{include "common.namespace" .}}",
+        "CS_VIP": "sdc-cs.{{include "common.namespace" .}}",
+        "BE_VIP": "sdc-be.{{include "common.namespace" .}}",
+        "FE_VIP": "sdc-fe.{{include "common.namespace" .}}",
+        "ES_VIP": "sdc-es.{{include "common.namespace" .}}",
+        "KB_VIP": "sdc-kb.{{include "common.namespace" .}}",
         "interfaces": {
             "application": "eth0",
             "private": "eth0"
         },
         "ECompP": {
-            "ecomp_rest_url": "http://{{.Release.Name}}-portalapps.{{include "common.namespace" .}}:8989/ONAPPORTAL/auxapi",
-            "ueb_url_list": "{{.Release.Name}}-dmaap.{{include "common.namespace" .}}, {{.Release.Name}}-dmaap.{{include "common.namespace" .}}",
+            "ecomp_rest_url": "http://portal-app.{{include "common.namespace" .}}:8989/ONAPPORTAL/auxapi",
+            "ueb_url_list": "message-router.{{include "common.namespace" .}}, message-router.{{include "common.namespace" .}}",
             "app_secret": "XftIATw9Jr3VzAcPqt3NnJOu",
             "app_key": "x9UfO7JsDn8BESVX",
             "inbox_name": "ECOMP-PORTAL-INBOX",
-            "ecomp_redirect_url": "http://{{.Release.Name}}-portalapps.{{include "common.namespace" .}}:8989/ONAPPORTAL/login.htm",
+            "ecomp_redirect_url": "http://portal-app.{{include "common.namespace" .}}:8989/ONAPPORTAL/login.htm",
             "app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1",
             "decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
         },
         "UEB": {
             "PublicKey": "iPIxkpAMI8qTcQj8",
             "SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
-            "fqdn": ["{{.Release.Name}}-dmaap.{{include "common.namespace" .}}", "{{.Release.Name}}-dmaap.{{include "common.namespace" .}}"]
+            "fqdn": ["message-router.{{include "common.namespace" .}}", "message-router.{{include "common.namespace" .}}"]
         },
         "Nodes": {
-            "CS": "{{.Release.Name}}-sdc-cs.{{include "common.namespace" .}}",
-            "BE": "{{.Release.Name}}-sdc-be.{{include "common.namespace" .}}",
-            "FE": "{{.Release.Name}}-sdc-fe.{{include "common.namespace" .}}",
-            "ES": "{{.Release.Name}}-sdc-es.{{include "common.namespace" .}}",
-            "KB": "{{.Release.Name}}-sdc-kb.{{include "common.namespace" .}}"
+            "CS": "sdc-cs.{{include "common.namespace" .}}",
+            "BE": "sdc-be.{{include "common.namespace" .}}",
+            "FE": "sdc-fe.{{include "common.namespace" .}}",
+            "ES": "sdc-es.{{include "common.namespace" .}}",
+            "KB": "sdc-kb.{{include "common.namespace" .}}"
         },
         "Plugins": {
             "DCAE": {
@@ -91,4 +91,4 @@
             "titan_connection_timeout": "10000"
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit 1.2.3-korg