X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdc%2Fresources%2Fconfig%2Fenvironments%2FAUTO.json;h=ba6fe9705c501f42e80dc67cb7c1c5d39c560d30;hb=2680070c8031c94d9d65a9b2ee7281ed19bb0209;hp=5ae381c74675ddfe824f6d0f9fd46b5dc6f0c8d9;hpb=a57d055fa31650fcdeadc8514a1f9f551be395c0;p=oom.git

diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index 5ae381c746..b642e859f7 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -8,51 +8,53 @@
     "chef_type": "environment",
 
     "default_attributes": {
-        "disableHttp": false,
-        "CS_VIP": "{{.Release.Name}}-sdc-cs.{{include "common.namespace" .}}",
-        "BE_VIP": "{{.Release.Name}}-sdc-be.{{include "common.namespace" .}}",
-        "FE_VIP": "{{.Release.Name}}-sdc-fe.{{include "common.namespace" .}}",
-        "ES_VIP": "{{.Release.Name}}-sdc-es.{{include "common.namespace" .}}",
-        "KB_VIP": "{{.Release.Name}}-sdc-kb.{{include "common.namespace" .}}",
+        "disableHttp": true,
+        "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"
         },
         "ECompP": {
-            "ecomp_rest_url": "http://{{.Release.Name}}-portalapps.{{include "common.namespace" .}}:8989/ONAPPORTAL/auxapi",
-            "ueb_url_list": "{{.Release.Name}}-dmaap.{{include "common.namespace" .}}, {{.Release.Name}}-dmaap.{{include "common.namespace" .}}",
+            "ecomp_rest_url": "http://portal-app.{{include "common.namespace" .}}:8989/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://{{.Release.Name}}-portalapps.{{include "common.namespace" .}}:8989/ONAPPORTAL/login.htm",
+            "ecomp_redirect_url": "http://portal-app.{{include "common.namespace" .}}:8989/ONAPPORTAL/login.htm",
             "app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1",
             "decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
         },
         "UEB": {
             "PublicKey": "iPIxkpAMI8qTcQj8",
             "SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
-            "fqdn": ["{{.Release.Name}}-dmaap.{{include "common.namespace" .}}", "{{.Release.Name}}-dmaap.{{include "common.namespace" .}}"]
+            "fqdn": [
+                "message-router.{{include "common.namespace" .}}",
+                "message-router.{{include "common.namespace" .}}"
+            ]
         },
         "Nodes": {
-            "CS": "{{.Release.Name}}-sdc-cs.{{include "common.namespace" .}}",
-            "BE": "{{.Release.Name}}-sdc-be.{{include "common.namespace" .}}",
-            "FE": "{{.Release.Name}}-sdc-fe.{{include "common.namespace" .}}",
-            "ES": "{{.Release.Name}}-sdc-es.{{include "common.namespace" .}}",
-            "KB": "{{.Release.Name}}-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}}"
-            }
+            "CS": [
+                "{{.Values.global.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" .}}"
         },
         "VnfRepo": {
             "vnfRepoPort": "{{.Values.config.environment.vnfRepoPort}}",
-            "vnfRepoHost": "{{.Values.config.environment.vnfRepoHost}}"
+            "vnfRepoHost": "refrepo.{{include "common.namespace" .}}"
         }
     },
     "override_attributes": {
@@ -64,6 +66,11 @@
             "http_port": "8080",
             "https_port": "8443"
         },
+        "ONBOARDING_BE": {
+            "http_port": "8081",
+            "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",
@@ -73,6 +80,7 @@
         },
 
         "cassandra": {
+            "cassandra_port": 9042,
             "concurrent_reads": "32",
             "num_tokens": "256",
             "data_dir": "/var/lib/cassandra/data",
@@ -80,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",
@@ -88,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}}"
         }
     }
-}
\ No newline at end of file
+}