Merge "standardizing SDC helm charts"

2 files changed, 44 insertions, 99 deletions

diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index d35590ec67..5ae381c746 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -1,41 +1,58 @@
 {
-   "name": "AUTO",
-   "description": "OpenSource-AUTO",
-   "cookbook_versions": {
-            "Deploy-SDandC": "= 1.0.0"
-   },
-   "json_class": "Chef::Environment",
-   "chef_type": "environment",
+    "name": "{{ .Values.global.env.name }}",
+    "description": "OpenSource-{{ .Values.global.env.name }}",
+    "cookbook_versions": {
+        "Deploy-SDandC": "= 1.0.0"
+    },
+    "json_class": "Chef::Environment",
+    "chef_type": "environment",
 
-   "default_attributes": {
-        "CS_VIP": "sdc-cs.{{.Values.nsPrefix}}",
-        "BE_VIP": "sdc-be.{{.Values.nsPrefix}}",
-        "FE_VIP": "sdc-fe.{{.Values.nsPrefix}}",
-        "ES_VIP": "sdc-es.{{.Values.nsPrefix}}",
+    "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" .}}",
         "interfaces": {
             "application": "eth0",
             "private": "eth0"
         },
-                "ECompP": {
-                    "ecomp_rest_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/auxapi",
-            "ueb_url_list": "dmaap.{{.Values.nsPrefix}}, dmaap.{{.Values.nsPrefix}}",
+        "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" .}}",
             "app_secret": "XftIATw9Jr3VzAcPqt3NnJOu",
             "app_key": "x9UfO7JsDn8BESVX",
             "inbox_name": "ECOMP-PORTAL-INBOX",
-            "ecomp_redirect_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/login.htm",
+            "ecomp_redirect_url": "http://{{.Release.Name}}-portalapps.{{include "common.namespace" .}}:8989/ONAPPORTAL/login.htm",
             "app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1",
-                        "decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
+            "decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
         },
         "UEB": {
             "PublicKey": "iPIxkpAMI8qTcQj8",
             "SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
-            "fqdn": ["dmaap.{{.Values.nsPrefix}}", "dmaap.{{.Values.nsPrefix}}"]
+            "fqdn": ["{{.Release.Name}}-dmaap.{{include "common.namespace" .}}", "{{.Release.Name}}-dmaap.{{include "common.namespace" .}}"]
         },
         "Nodes": {
-            "CS": "sdc-cs.{{.Values.nsPrefix}}",
-            "BE": "sdc-be.{{.Values.nsPrefix}}",
-            "FE": "sdc-fe.{{.Values.nsPrefix}}",
-            "ES": "sdc-es.{{.Values.nsPrefix}}"
+            "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}}"
+            }
+        },
+        "VnfRepo": {
+            "vnfRepoPort": "{{.Values.config.environment.vnfRepoPort}}",
+            "vnfRepoHost": "{{.Values.config.environment.vnfRepoHost}}"
         }
     },
     "override_attributes": {
@@ -68,7 +85,10 @@
             "cache_dir": "/var/lib/cassandra/saved_caches",
             "log_file": "/var/lib/cassandra/log/system.log",
             "phi_convict_threshold": "8",
-            "commitlog_dir": "/var/lib/cassandra/commitlog"
+            "commitlog_dir": "/var/lib/cassandra/commitlog",
+            "socket_read_timeout": "20000",
+            "socket_connect_timeout": "20000",
+            "titan_connection_timeout": "10000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/kubernetes/sdc/resources/config/environments/Template.json b/kubernetes/sdc/resources/config/environments/Template.json
deleted file mode 100755
index 247e990f31..0000000000
--- a/kubernetes/sdc/resources/config/environments/Template.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-   "name": "xxx",
-   "description": "OpenSource-xxx",
-   "cookbook_versions": {
-            "Deploy-SDandC": "= 1.0.0"
-   },
-   "json_class": "Chef::Environment",
-   "chef_type": "environment",
-
-   "default_attributes": {
-        "CS_VIP": "yyy",
-        "BE_VIP": "yyy",
-        "FE_VIP": "yyy",
-        "ES_VIP": "yyy",
-        "interfaces": {
-            "application": "eth0",
-            "private": "eth1"
-        },
-		"ECompP": {
-		    "ecomp_rest_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/auxapi",
-            "ueb_url_list": "dmaap.{{.Values.nsPrefix}},dmaap.{{.Values.nsPrefix}}", 
-            "app_secret": "XftIATw9Jr3VzAcPqt3NnJOu", 
-            "app_key": "x9UfO7JsDn8BESVX", 
-            "inbox_name": "ECOMP-PORTAL-INBOX", 
-            "ecomp_redirect_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/login.htm", 
-            "app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1",
-			"decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
-        }, 
-        "UEB": {
-            "PublicKey": "iPIxkpAMI8qTcQj8",
-            "SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
-            "fqdn": ["dmaap.{{.Values.nsPrefix}}", "dmaap.{{.Values.nsPrefix}}"]
-        },
-        "Nodes": {
-            "CS": "yyy",
-            "BE": "yyy",
-            "FE": "yyy",
-            "ES": "yyy"
-        }
-    },
-    "override_attributes": {
-        "FE": {
-            "http_port": "8181",
-            "https_port": "9443"
-        },
-        "BE": {
-            "http_port": "8080",
-            "https_port": "8443"
-        },
-        "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": {
-            "concurrent_reads": "32",
-            "num_tokens": "256",
-            "data_dir": "/var/lib/cassandra/data",
-            "hinted_handoff_enabled": "true",
-            "cassandra_user": "asdc_user",
-            "cassandra_password": "Aa1234%^!",
-            "concurrent_writes": "32",
-            "cluster_name": "SDC-CS-",
-            "multithreaded_compaction": "false",
-            "cache_dir": "/var/lib/cassandra/saved_caches",
-            "log_file": "/var/lib/cassandra/log/system.log",
-            "phi_convict_threshold": "8",
-            "commitlog_dir": "/var/lib/cassandra/commitlog"
-        }
-    }
-}
-