commit 69802f5ddbdab1b201529203a514659be94b5322
author Gopinath Taget <gopinath@opennetworking.org> Mon Jun 25 15:13:55 2018 +0000
committer Gopinath Taget <gopinath@opennetworking.org> Mon Jun 25 15:13:55 2018 +0000
tree d68d882575edc50bd0c0dd7243a1f686d664c84c
parent d9ce07cc9aa8487f288778cc4ca8bbd23abc6f21

Revert "Remove etcd and kafka dependencies from voltha"

This reverts commit d9ce07cc9aa8487f288778cc4ca8bbd23abc6f21.

Change-Id: I63a335712cea962c536359cacc41991ebb409598

voltha/values.yaml

diff --git a/voltha/values.yaml b/voltha/values.yaml
index 32616d1..4cc250f 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -47,28 +47,10 @@
           port: 50555
           targetPort: 50555
 
-kafka:
-  enabled: false
-  persistence:
-    enabled: false
-  zookeeper:
-    persistence:
-      enabled: false
-
-etcd:
-  operator:
-    enabled: true
 etcd-operator:
   customResources:
-    size: 1
     createEtcdClusterCRD: true
 
-kafkaReleaseName: voltha-kafka
-etcdReleaseName: voltha-etcd
-
-consul:
-  enabled: false
-
 envoyForEtcdImage: 'voltha/voltha-envoy:latest'
 freeradiusImage: 'tpdock/freeradius:latest'
 grafanaImage: 'kamon/grafana_graphite:3.0'
@@ -79,10 +61,39 @@
 vcliImage: 'voltha/voltha-cli:latest'
 vcoreImage: 'voltha/voltha-voltha:latest'
 
+kafka:
+  enabled: true
+  persistence:
+    enabled: false
+  zookeeper:
+    persistence:
+      enabled: false
+etcd:
+  operator:
+    enabled: true
+consul:
+  enabled: false
+
+
 # Need the namespace global for kafka
 global:
   namespace: voltha
 
+stats:
+  #dashd_args:
+  #- "/dashd/dashd/main.py"
+  #- "--kafka={{ .Release.Name }}-kafka.default.svc.cluster.local"
+  #- "--grafana_url=http://admin:admin@grafana.$(NAMESPACE).svc.cluster.local:80/api"
+  #- "--topic=voltha.kpis"
+  #- "--consul=consul:8500"
+
+  #shovel_args:
+  #- "/shovel/shovel/main.py"
+  #- "--kafka={{ .Release.Name }}-kafka.default.svc.cluster.local"
+  #- "--host=grafana.voltha.svc.cluster.local"
+  #- "--topic=voltha.kpis"
+  #- "--consul=consul:8500"
+
 vcli_args:
 - "/cli/cli/setup.sh"
 - "-C consul:8500"
@@ -90,6 +101,18 @@
 - "-s voltha:18880"
 - "-G"
 
+#vcore_etcd_args:
+#- "voltha/voltha/main.py"
+#- "-v"
+#- "--etcd=etcd-restore-operator.default.svc.cluster.local:2379"
+#- "--kafka={{ .Release.Name }}-kafka.default.svc.cluster.local"
+#- "--rest-port=8880"
+#- "--grpc-port=50556"
+#- "--interface=eth1"
+#- "--backend=etcd"
+#- "--pon-subnet=10.38.0.0/12"
+#- "--ponsim-comm=grpc"
+
 ofagent_args:
 - "/ofagent/ofagent/main.py"
 - "-v"