[SDC] Remove MR connection in SDC-BE

[oom.git] / kubernetes / sdc / resources / config / environments / AUTO.json

diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index b38b1f6..59cb865 100755 (executable)
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -8,13 +8,10 @@
     "chef_type": "environment",
 
     "default_attributes": {
-        "disableHttp": {{ .Values.global.security.disableHttp }},
-        "CS_VIP": "{{.Values.global.cassandra.serviceName}}.{{include "common.namespace" .}}",
+        "disableHttp": false,
+        "CS_VIP": "{{.Values.global.sdc_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" .}}",
         "interfaces": {
             "application": "eth0",
@@ -22,7 +19,11 @@
         },
         "ECompP": {
             "ecomp_rest_url": "https://portal-app.{{include "common.namespace" .}}:8443/ONAPPORTAL/auxapi",
+            {{- if .Values.global.kafka.useKafka }}
+            "ueb_url_list": "no-message-router.{{include "common.namespace" .}}, message-router.{{include "common.namespace" .}}",
+            {{- else }}
             "ueb_url_list": "message-router.{{include "common.namespace" .}}, message-router.{{include "common.namespace" .}}",
+            {{- end }}
             "app_secret": "XftIATw9Jr3VzAcPqt3NnJOu",
             "app_key": "x9UfO7JsDn8BESVX",
             "inbox_name": "ECOMP-PORTAL-INBOX",
@@ -34,13 +35,27 @@
             "PublicKey": "iPIxkpAMI8qTcQj8",
             "SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
             "fqdn": [
+                {{- if .Values.global.kafka.useKafka }}
+                "no-message-router.{{include "common.namespace" .}}",
+                "no-message-router.{{include "common.namespace" .}}"
+                {{- else }}
                 "message-router.{{include "common.namespace" .}}",
                 "message-router.{{include "common.namespace" .}}"
+                {{- end }}
             ]
         },
+        "Kafka": {
+             "bootstrap": "{{ include "common.release" . }}-strimzi-kafka-bootstrap:9092"
+        },
+        {{- if .Values.global.kafka.useKafka }}
+        "DistributionTopics": {
+             "notificationTopicName": "{{ .Values.global.kafka.topics.sdcDistNotifTopic }}",
+             "statusTopicName": "{{ .Values.global.kafka.topics.sdcDistStatusTopic }}"
+        },
+        {{- end }}
         "Nodes": {
             "CS": [
-                "{{.Values.global.cassandra.serviceName}}.{{include "common.namespace" .}}"
+                "{{.Values.global.sdc_cassandra.serviceName}}.{{include "common.namespace" .}}"
             ],
             "BE": "sdc-be.{{include "common.namespace" .}}",
             "ONBOARDING_BE": "sdc-onboarding-be.{{include "common.namespace" .}}",
@@ -49,6 +64,14 @@
         "VnfRepo": {
             "vnfRepoPort": "{{.Values.config.environment.vnfRepoPort}}",
             "vnfRepoHost": "refrepo.{{include "common.namespace" .}}"
+        },
+        "HelmValidator": {
+            "validator_enabled": "{{.Values.sdcHelmValidator.enabled}}",
+            "helm_version": "{{.Values.sdcHelmValidator.helmVersion}}",
+            "deployable": "{{.Values.sdcHelmValidator.deployable}}",
+            "lintable": "{{.Values.sdcHelmValidator.lintable}}",
+            "strict_lintable": "{{.Values.sdcHelmValidator.strictLintable}}",
+            "validator_url": "{{.Values.sdcHelmValidator.url}}"
         }
     },
     "override_attributes": {
@@ -74,8 +97,8 @@
             "cassandra_user": "asdc_user",
             "cassandra_password": "Aa1234%^!",
             "concurrent_writes": "32",
-            "cluster_name": "{{.Values.global.cassandra.clusterName}}",
-            "datacenter_name": "{{.Values.global.cassandra.dataCenter}}",
+            "cluster_name": "{{.Values.global.sdc_cassandra.clusterName}}",
+            "datacenter_name": "{{.Values.global.sdc_cassandra.dataCenter}}",
             "multithreaded_compaction": "false",
             "cache_dir": "/var/lib/cassandra/saved_caches",
             "log_file": "/var/lib/cassandra/log/system.log",
@@ -84,7 +107,10 @@
             "socket_read_timeout": "20000",
             "socket_connect_timeout": "20000",
             "janusgraph_connection_timeout": "10000",
-            "replication_factor": "{{.Values.global.cassandra.replicaCount}}"
+            "replication_factor": "{{.Values.global.sdc_cassandra.replicaCount}}",
+            "db_cache": "{{.Values.global.sdc_cassandra.dbCache}}",
+            "read_consistency_level": "{{.Values.global.sdc_cassandra.readConsistencyLevel}}",
+            "write_consistency_level":"{{.Values.global.sdc_cassandra.writeConsistencyLevel}}"
         },
       "DMAAP": {
          "consumer": {
@@ -104,11 +130,6 @@
             "username": "user1@sdc.com",
             "password": "password=="
          }
-      },
-      "jetty": {
-         "keystore_pwd": "${KEYSTORE_PASS}",
-         "truststore_pwd": "${TRUSTSTORE_PASS}",
-         "keymanager_pwd": "${KEYMANAGER_PASS}"
       }
     }
 }