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=a62fb84f104337d2b4a99797a42b937b31e4e2e3;hp=bb5df2bf90bcdcfb7e2213ea5586ab7d46d6e05d;hpb=5cae549b61235f9fb4d64893aa4bd9601bc17bc0;p=oom.git

diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index bb5df2bf90..577eb96a0e 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -9,7 +9,7 @@
 
     "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" .}}",
@@ -42,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" .}}",
@@ -80,6 +80,7 @@
         },
 
         "cassandra": {
+            "cassandra_port": 9042,
             "concurrent_reads": "32",
             "num_tokens": "256",
             "data_dir": "/var/lib/cassandra/data",
@@ -87,8 +88,8 @@
             "cassandra_user": "asdc_user",
             "cassandra_password": "Aa1234%^!",
             "concurrent_writes": "32",
-            "cluster_name": "SDC-CS-",
-            "datacenter_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",
@@ -96,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}}"
         }
     }
 }