[SDC] Exposing new parameters in chef config

[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 2bd165b..bd76b97 100755 (executable)
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -1,6 +1,6 @@
 {
-    "name": "{{ .Values.global.env.name }}",
-    "description": "OpenSource-{{ .Values.global.env.name }}",
+    "name": "{{ .Values.env.name }}",
+    "description": "OpenSource-{{ .Values.env.name }}",
     "cookbook_versions": {
         "Deploy-SDandC": "= 1.0.0"
     },
@@ -12,9 +12,6 @@
         "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" .}}",
         "interfaces": {
             "application": "eth0",
@@ -49,6 +46,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": {
@@ -84,7 +89,10 @@
             "socket_read_timeout": "20000",
             "socket_connect_timeout": "20000",
             "janusgraph_connection_timeout": "10000",
-            "replication_factor": "{{.Values.global.cassandra.replicaCount}}"
+            "replication_factor": "{{.Values.global.cassandra.replicaCount}}",
+            "db_cache": "{{.Values.global.cassandra.dbCache}}",
+            "read_consistency_level": "{{.Values.global.cassandra.readConsistencyLevel}}",
+            "write_consistency_level":"{{.Values.global.cassandra.writeConsistencyLevel}}"
         },
       "DMAAP": {
          "consumer": {
@@ -107,7 +115,8 @@
       },
       "jetty": {
          "keystore_pwd": "${KEYSTORE_PASS}",
-         "truststore_pwd": "${TRUSTSTORE_PASS}"
+         "truststore_pwd": "${TRUSTSTORE_PASS}",
+         "keymanager_pwd": "${KEYMANAGER_PASS}"
       }
     }
 }