X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdc%2Fresources%2Fconfig%2Fenvironments%2FAUTO.json;h=3b03205ffc3f7a84b8c6c1494c61a9f510b49ea8;hb=fd450c4959d9cb4d4ae18218aa8b4e597139ce56;hp=577eb96a0e858fc0cab7f5b0e4fa863b0550b510;hpb=5e82a3af9ba19c2388e121e87c16cfbe5a775284;p=oom.git

diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index 577eb96a0e..3b03205ffc 100755
--- 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"
     },
@@ -8,27 +8,22 @@
     "chef_type": "environment",
 
     "default_attributes": {
-        "disableHttp": false,
-        "CS_VIP": "{{.Values.global.cassandra.serviceName}}.{{include "common.namespace" .}}",
+        "disableHttp": {{ .Values.global.security.disableHttp }},
+        "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" .}}",
-        "ES_VIP": "sdc-es.{{include "common.namespace" .}}",
-        "KB_VIP": "sdc-kb.{{include "common.namespace" .}}",
         "interfaces": {
             "application": "eth0",
             "private": "eth0"
         },
         "ECompP": {
-            "ecomp_rest_url": "http://portal-app.{{include "common.namespace" .}}:8989/ONAPPORTAL/auxapi",
+            "ecomp_rest_url": "https://portal-app.{{include "common.namespace" .}}:8443/ONAPPORTAL/auxapi",
             "ueb_url_list": "message-router.{{include "common.namespace" .}}, message-router.{{include "common.namespace" .}}",
             "app_secret": "XftIATw9Jr3VzAcPqt3NnJOu",
             "app_key": "x9UfO7JsDn8BESVX",
             "inbox_name": "ECOMP-PORTAL-INBOX",
-            "ecomp_redirect_url": "http://portal-app.{{include "common.namespace" .}}:8989/ONAPPORTAL/login.htm",
+            "ecomp_redirect_url": "https://portal-app.{{include "common.namespace" .}}:30225/ONAPPORTAL/login.htm",
             "app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1",
             "decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
         },
@@ -42,19 +37,23 @@
         },
         "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" .}}",
-            "FE": "sdc-fe.{{include "common.namespace" .}}",
-            "ES": [
-                "sdc-es.{{include "common.namespace" .}}"
-            ],
-            "KB": "sdc-kb.{{include "common.namespace" .}}"
+            "FE": "sdc-fe.{{include "common.namespace" .}}"
         },
         "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": {
@@ -71,14 +70,6 @@
             "https_port": "8445",
             "catalog_notification_url": "%s://%s:%s/sdc2/rest/v1/catalog/notif/vsp/"
         },
-        "elasticsearch": {
-            "cluster_name": "SDC-ES-",
-            "ES_path_home": "/usr/share/elasticsearch",
-            "ES_path_data": "/usr/share/elasticsearch/data",
-            "num_of_replicas": "0",
-            "num_of_shards": "1"
-        },
-
         "cassandra": {
             "cassandra_port": 9042,
             "concurrent_reads": "32",
@@ -88,8 +79,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",
@@ -98,7 +89,34 @@
             "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": {
+            "host": "dcae-mrtr.com:3905",
+            "topic": "operationalEnvironmentEvent",
+            "serviceName": "dcae-mrtr.com:3905/events",
+            "environment": "TEST",
+            "partner": "BOT_R",
+            "username": "user1@sdc.com",
+            "password": "password=="
+         },
+         "producer": {
+            "host": "olsd004.com:3905",
+            "topic": "SDC-FACADE-NOTIF-v1 ",
+            "serviceName": "dmaap.com:3905/events",
+            "environment": "TEST",
+            "username": "user1@sdc.com",
+            "password": "password=="
+         }
+      },
+      "jetty": {
+         "keystore_pwd": "${KEYSTORE_PASS}",
+         "truststore_pwd": "${TRUSTSTORE_PASS}",
+         "keymanager_pwd": "${KEYMANAGER_PASS}"
+      }
     }
 }