commit 307e4194dd412d1fa148021c7fed535ea5ff9071
author Matteo Scandolo <teo@opennetworking.org> Thu Feb 14 22:41:58 2019 +0000
committer Gerrit Code Review <gerrit@opencord.org> Thu Feb 14 22:41:58 2019 +0000
tree 893dfd60c655b9c61239ccadda87b0d020448538
parent 7517f17d5ce703e8ed729193a7bc8bd86b047738
parent 0ff5e72da1554cdfdd66934c757da0356a4c0b70

Merge "Disabling ONOS log agent"

kubernetes-configs/edgecore-pod1.yml

diff --git a/kubernetes-configs/edgecore-pod1.yml b/kubernetes-configs/edgecore-pod1.yml
index a1d2494..347c988 100644
--- a/kubernetes-configs/edgecore-pod1.yml
+++ b/kubernetes-configs/edgecore-pod1.yml
@@ -1,3 +1,86 @@
 ---
-# SEBA Values
+# Create file to override the default helm charts values (call it extend.yaml)
+global:
+  registry: 192.168.99.181:30500/
 
+# CORD platform overrides
+kafka:
+  image: 192.168.99.181:30500/confluentinc/cp-kafka
+  imageTag: 4.1.2-2
+  configurationOverrides:
+    zookeeper.connection.timeout.ms: 60000
+    zookeeper.session.timeout.ms: 60000
+
+  zookeeper:
+    image:
+      repository: 192.168.99.181:30500/gcr.io/google_samples/k8szk
+
+logging:
+  elasticsearch:
+    image:
+      repository: 192.168.99.181:30500/docker.elastic.co/elasticsearch/elasticsearch-oss
+    initImage:
+      repository: 192.168.99.181:30500/busybox
+
+  kibana:
+    image:
+      repository: 192.168.99.181:30500/docker.elastic.co/kibana/kibana-oss
+
+  logstash:
+    image:
+      repository: 192.168.99.181:30500/docker.elastic.co/logstash/logstash-oss
+
+nem-monitoring:
+  grafana:
+    image:
+      repository: 192.168.99.181:30500/grafana/grafana
+    sidecar:
+      image: 192.168.99.181:30500/kiwigrid/k8s-sidecar:0.0.3
+
+  prometheus:
+    server:
+      image:
+        repository: 192.168.99.181:30500/prom/prometheus
+    alertmanager:
+      image:
+        repository: 192.168.99.181:30500/prom/alertmanager
+    configmapReload:
+      image:
+        repository: 192.168.99.181:30500/jimmidyson/configmap-reload
+    kubeStateMetrics:
+      image:
+        repository: 192.168.99.181:30500/quay.io/coreos/kube-state-metrics
+    nodeExporter:
+      image:
+        repository: 192.168.99.181:30500/prom/node-exporter
+    pushgateway:
+      image:
+        repository: 192.168.99.181:30500/prom/pushgateway
+    initChownData:
+      image:
+        repository: 192.168.99.181:30500/busybox
+
+# SEBA specific overrides
+voltha:
+  etcd-cluster:
+    spec:
+      repository: 192.168.99.181:30500/quay.io/coreos/etcd
+    pod:
+      busyboxImage: 192.168.99.181:30500/busybox:1.28.1-glibc
+
+  etcdOperator:
+    image:
+      repository: 192.168.99.181:30500/quay.io/coreos/etcd-operator
+  backupOperator:
+    image:
+      repository: 192.168.99.181:30500/quay.io/coreos/etcd-operator
+  restoreOperator:
+    image:
+      repository: 192.168.99.181:30500/quay.io/coreos/etcd-operator
+
+seba-services:
+  oltAppUrl: http://192.168.99.181:30160/olt.oar
+  sadisAppUrl: http://192.168.99.181:30160/sadis.oar
+  dhcpL2RelayAppUrl: http://192.168.99.181:30160/dhcpl2relay.oar
+  aaaAppUrl: http://192.168.99.181:30160/aaa.oar
+  kafkaAppUrl: http://192.168.99.181:30160/kafka.oar

kubernetes-configs/onf-mcord-pod1.yml

diff --git a/kubernetes-configs/onf-mcord-pod1.yml b/kubernetes-configs/onf-mcord-pod1.yml
index 329dcb0..643566c 100644
--- a/kubernetes-configs/onf-mcord-pod1.yml
+++ b/kubernetes-configs/onf-mcord-pod1.yml
@@ -1,5 +1,8 @@
 ---
 
+log_agent:
+    enabled: false
+
 vrouter:
   image:
     repository: 'matteoscandolo/vrouter-synchronizer'