Make all services independent of helm Release.Name

Issue-ID: OOM-906
Change-Id: Ic65127d3981cb0a696c784392cab59fbf06b1e66
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
diff --git a/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json b/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json
index 9795975..598a3ba 100644
--- a/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json
+++ b/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json
@@ -42,7 +42,7 @@
 		"AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
 		"APPLICATION_SERVERS": "aai.{{.Release.Namespace}}",
 		"AAI_DMAAP_PROTOCOL": "http",
-		"AAI_DMAAP_HOST_PORT": "dmaap.{{.Release.Namespace}}:3904",
+		"AAI_DMAAP_HOST_PORT": "message-router.{{.Release.Namespace}}:3904",
 		"AAI_DMAAP_TOPIC_NAME": "AAI-EVENT",
 		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
 		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",
@@ -94,7 +94,7 @@
 		"AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
 		"APPLICATION_SERVERS": "aai.{{.Release.Namespace}}",
 		"AAI_DMAAP_PROTOCOL": "http",
-		"AAI_DMAAP_HOST_PORT": "dmaap.{{.Release.Namespace}}:3904",
+		"AAI_DMAAP_HOST_PORT": "message-router.{{.Release.Namespace}}:3904",
 		"AAI_DMAAP_TOPIC_NAME": "AAI-EVENT",
 		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED",
 		"AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT",