X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Fresources%2Fconfig%2Faai-data%2Fenvironments%2Fsimpledemo.json;h=598a3ba1c4d286c24e8e4868a80f271c63e45608;hb=53e5783c293b768caaecec7961bfaf7d18c0a0b0;hp=99edba2bed9ed4539cafc9015e19ac7ac2049a00;hpb=68e6115eb446e0a7993a2d8765a7d05c5345d1d3;p=oom.git

diff --git a/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json b/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json
index 99edba2bed..598a3ba1c4 100644
--- a/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json
+++ b/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json
@@ -33,16 +33,16 @@
 		"PROJECT_HOME": "/opt/app/aai-traversal",
 		"LOGROOT": "/opt/aai/logroot",
 		"JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64",
-		"AAI_SERVER_URL_BASE": "https://aai-service.onap-aai:8443/aai/",
-		"AAI_SERVER_URL": "https://aai-service.onap-aai:8443/aai/v11/",
-		"AAI_GLOBAL_CALLBACK_URL": "https://aai-service.onap-aai:8443/aai/",
+		"AAI_SERVER_URL_BASE": "https:/aai.{{.Release.Namespace}}:8443/aai/",
+		"AAI_SERVER_URL": "https:/aai.{{.Release.Namespace}}:8443/aai/v11/",
+		"AAI_GLOBAL_CALLBACK_URL": "https:/aai.{{.Release.Namespace}}:8443/aai/",
 		"AAI_TRUSTSTORE_FILENAME": "aai_keystore",
 		"AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
 		"AAI_KEYSTORE_FILENAME": "aai_keystore",
 		"AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
-		"APPLICATION_SERVERS": "aai-service.onap-aai",
+		"APPLICATION_SERVERS": "aai.{{.Release.Namespace}}",
 		"AAI_DMAAP_PROTOCOL": "http",
-		"AAI_DMAAP_HOST_PORT": "dmaap.onap-message-router: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",
@@ -54,11 +54,11 @@
 		"AAI_NOTIFICATION_CURRENT_VERSION": "v11",
 		"RESOURCE_VERSION_ENABLE_FLAG": "true",
 		"TXN_HBASE_TABLE_NAME": "aailogging.dev",
-		"TXN_ZOOKEEPER_QUORUM": "hbase.onap-aai",
+		"TXN_ZOOKEEPER_QUORUM": "aai-hbase.{{.Release.Namespace}}",
 		"TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181",
 		"TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
 		"AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1",
-		"STORAGE_HOSTNAME": "hbase.onap-aai",
+		"STORAGE_HOSTNAME": "aai-hbase.{{.Release.Namespace}}",
 		"STORAGE_HBASE_TABLE": "aaigraph.dev",
 		"STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
 		"DB_CACHE_CLEAN_WAIT": "20",
@@ -85,16 +85,16 @@
 		"PROJECT_HOME": "/opt/app/aai-resources",
 		"LOGROOT": "/opt/aai/logroot",
 		"JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64",
-		"AAI_SERVER_URL_BASE": "https://aai-service.onap-aai:8443/aai/",
-		"AAI_SERVER_URL": "https://aai-service.onap-aai:8443/aai/v11/",
-		"AAI_GLOBAL_CALLBACK_URL": "https://aai-service.onap-aai:8443/aai/",
+		"AAI_SERVER_URL_BASE": "https:/aai.{{.Release.Namespace}}:8443/aai/",
+		"AAI_SERVER_URL": "https:/aai.{{.Release.Namespace}}:8443/aai/v11/",
+		"AAI_GLOBAL_CALLBACK_URL": "https:/aai.{{.Release.Namespace}}:8443/aai/",
 		"AAI_TRUSTSTORE_FILENAME": "aai_keystore",
 		"AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
 		"AAI_KEYSTORE_FILENAME": "aai_keystore",
 		"AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0",
-		"APPLICATION_SERVERS": "aai-service.onap-aai",
+		"APPLICATION_SERVERS": "aai.{{.Release.Namespace}}",
 		"AAI_DMAAP_PROTOCOL": "http",
-		"AAI_DMAAP_HOST_PORT": "dmaap.onap-message-router: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",
@@ -106,11 +106,11 @@
 		"AAI_NOTIFICATION_CURRENT_VERSION": "v11",
 		"RESOURCE_VERSION_ENABLE_FLAG": "true",
 		"TXN_HBASE_TABLE_NAME": "aailogging.dev",
-		"TXN_ZOOKEEPER_QUORUM": "hbase.onap-aai",
+		"TXN_ZOOKEEPER_QUORUM": "aai-hbase.{{.Release.Namespace}}",
 		"TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181",
 		"TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
 		"AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1",
-		"STORAGE_HOSTNAME": "hbase.onap-aai",
+		"STORAGE_HOSTNAME": "aai-hbase.{{.Release.Namespace}}",
 		"STORAGE_HBASE_TABLE": "aaigraph.dev",
 		"STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase",
 		"DB_CACHE_CLEAN_WAIT": "20",