diff options
| -rw-r--r-- | environments/kubernetes_simpledemo.json | 1 | ||||
| -rw-r--r-- | environments/simpledemo.json | 25 |
2 files changed, 12 insertions, 14 deletions
diff --git a/environments/kubernetes_simpledemo.json b/environments/kubernetes_simpledemo.json index 39bf5cf..8b7e935 100644 --- a/environments/kubernetes_simpledemo.json +++ b/environments/kubernetes_simpledemo.json @@ -15,7 +15,6 @@ "default_attributes": { "aai-traversal-config": { "SERVICE_API_VERSION": "1.0.1", - "SOA_CLOUD_NAMESPACE": "org.openecomp.aai", "AJSC_SERVICE_NAMESPACE": "traversal", "AFTSWM_ACTION_ARTIFACT_NAME": "traversal", "AJSC_JETTY_ThreadCount_MAX": "500", diff --git a/environments/simpledemo.json b/environments/simpledemo.json index 4b9fd0f..ca247b0 100644 --- a/environments/simpledemo.json +++ b/environments/simpledemo.json @@ -15,7 +15,6 @@ "default_attributes": { "aai-traversal-config": { "SERVICE_API_VERSION": "1.0.1", - "SOA_CLOUD_NAMESPACE": "org.openecomp.aai", "AJSC_SERVICE_NAMESPACE": "traversal", "AFTSWM_ACTION_ARTIFACT_NAME": "traversal", "AJSC_JETTY_ThreadCount_MAX": "500", @@ -33,16 +32,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.api.simpledemo.openecomp.org:8443/aai/", - "AAI_SERVER_URL": "https://aai.api.simpledemo.openecomp.org:8443/aai/v11/", - "AAI_GLOBAL_CALLBACK_URL": "https://aai.api.simpledemo.openecomp.org:8443/aai/", + "AAI_SERVER_URL_BASE": "https://aai.api.simpledemo.onap.org:8443/aai/", + "AAI_SERVER_URL": "https://aai.api.simpledemo.onap.org:8443/aai/v11/", + "AAI_GLOBAL_CALLBACK_URL": "https://aai.api.simpledemo.onap.org: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.api.simpledemo.openecomp.org", + "APPLICATION_SERVERS": "aai.api.simpledemo.onap.org", "AAI_DMAAP_PROTOCOL": "http", - "AAI_DMAAP_HOST_PORT": "mr.api.simpledemo.openecomp.org:3904", + "AAI_DMAAP_HOST_PORT": "mr.api.simpledemo.onap.org:3904", "AAI_DMAAP_TOPIC_NAME": "AAI-EVENT", "AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED", "AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT", @@ -58,7 +57,7 @@ "TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181", "TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase", "AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1", - "STORAGE_HOSTNAME": "aai.hbase.simpledemo.openecomp.org", + "STORAGE_HOSTNAME": "aai.hbase.simpledemo.onap.org", "STORAGE_HBASE_TABLE": "aaigraph.dev", "STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase", "DB_CACHE_CLEAN_WAIT": "20", @@ -85,16 +84,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.api.simpledemo.openecomp.org:8443/aai/", - "AAI_SERVER_URL": "https://aai.api.simpledemo.openecomp.org:8443/aai/v11/", - "AAI_GLOBAL_CALLBACK_URL": "https://aai.api.simpledemo.openecomp.org:8443/aai/", + "AAI_SERVER_URL_BASE": "https://aai.api.simpledemo.onap.org:8443/aai/", + "AAI_SERVER_URL": "https://aai.api.simpledemo.onap.org:8443/aai/v11/", + "AAI_GLOBAL_CALLBACK_URL": "https://aai.api.simpledemo.onap.org: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.api.simpledemo.openecomp.org", + "APPLICATION_SERVERS": "aai.api.simpledemo.onap.org", "AAI_DMAAP_PROTOCOL": "http", - "AAI_DMAAP_HOST_PORT": "mr.api.simpledemo.openecomp.org:3904", + "AAI_DMAAP_HOST_PORT": "mr.api.simpledemo.onap.org:3904", "AAI_DMAAP_TOPIC_NAME": "AAI-EVENT", "AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED", "AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT", @@ -110,7 +109,7 @@ "TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181", "TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase", "AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1", - "STORAGE_HOSTNAME": "aai.hbase.simpledemo.openecomp.org", + "STORAGE_HOSTNAME": "aai.hbase.simpledemo.onap.org", "STORAGE_HBASE_TABLE": "aaigraph.dev", "STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase", "DB_CACHE_CLEAN_WAIT": "20", |