X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=kubernetes%2Fsdc%2Fresources%2Fconfig%2Fenvironments%2FAUTO.json;h=577eb96a0e858fc0cab7f5b0e4fa863b0550b510;hb=eb2cc949f936aae25dfbf84a40a4993affad42e7;hp=ba6fe9705c501f42e80dc67cb7c1c5d39c560d30;hpb=1c63d264cc31c92643eaa9211aa52ce8cabe88db;p=oom.git

diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index ba6fe9705c..577eb96a0e 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -9,13 +9,15 @@
 
     "default_attributes": {
         "disableHttp": false,
-        "CS_VIP": "sdc-cs.{{include "common.namespace" .}}",
+        "CS_VIP": "{{.Values.global.cassandra.serviceName}}.{{include "common.namespace" .}}",
         "BE_VIP": "sdc-be.{{include "common.namespace" .}}",
         "ONBOARDING_BE_VIP": "sdc-onboarding-be.{{include "common.namespace" .}}",
+        "DCAE_BE_VIP": "sdc-dcae-be.{{include "common.namespace" .}}",
+        "DCAE_FE_VIP": "sdc-dcae-fe.{{include "common.namespace" .}}",
+        "DCAE_TOSCA_LAB_VIP": "sdc-dcae-tosca-lab.{{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"
@@ -40,7 +42,7 @@
         },
         "Nodes": {
             "CS": [
-                "sdc-cs.{{include "common.namespace" .}}"
+                "{{.Values.global.cassandra.serviceName}}.{{include "common.namespace" .}}"
             ],
             "BE": "sdc-be.{{include "common.namespace" .}}",
             "ONBOARDING_BE": "sdc-onboarding-be.{{include "common.namespace" .}}",
@@ -50,16 +52,6 @@
             ],
             "KB": "sdc-kb.{{include "common.namespace" .}}"
         },
-        "Plugins": {
-            "DCAE": {
-                "dcae_discovery_url": "{{.Values.config.environment.dcaeUrl}}",
-                "dcae_source_url": "{{.Values.config.environment.dcaeUrl}}"
-            },
-            "WORKFLOW": {
-                "workflow_discovery_url": "{{.Values.config.environment.workflowUrl}}",
-                "workflow_source_url": "{{.Values.config.environment.workflowUrl}}"
-            }
-        },
         "VnfRepo": {
             "vnfRepoPort": "{{.Values.config.environment.vnfRepoPort}}",
             "vnfRepoHost": "refrepo.{{include "common.namespace" .}}"
@@ -76,7 +68,8 @@
         },
         "ONBOARDING_BE": {
             "http_port": "8081",
-            "https_port": "8445"
+            "https_port": "8445",
+            "catalog_notification_url": "%s://%s:%s/sdc2/rest/v1/catalog/notif/vsp/"
         },
         "elasticsearch": {
             "cluster_name": "SDC-ES-",
@@ -87,6 +80,7 @@
         },
 
         "cassandra": {
+            "cassandra_port": 9042,
             "concurrent_reads": "32",
             "num_tokens": "256",
             "data_dir": "/var/lib/cassandra/data",
@@ -94,7 +88,8 @@
             "cassandra_user": "asdc_user",
             "cassandra_password": "Aa1234%^!",
             "concurrent_writes": "32",
-            "cluster_name": "SDC-CS-",
+            "cluster_name": "{{.Values.global.cassandra.clusterName}}",
+            "datacenter_name": "{{.Values.global.cassandra.dataCenter}}",
             "multithreaded_compaction": "false",
             "cache_dir": "/var/lib/cassandra/saved_caches",
             "log_file": "/var/lib/cassandra/log/system.log",
@@ -102,7 +97,8 @@
             "commitlog_dir": "/var/lib/cassandra/commitlog",
             "socket_read_timeout": "20000",
             "socket_connect_timeout": "20000",
-            "titan_connection_timeout": "10000"
+            "janusgraph_connection_timeout": "10000",
+            "replication_factor": "{{.Values.global.cassandra.replicaCount}}"
         }
     }
 }