Updated format to work with gerrit 11314 patch
Change-Id: Ie0dd967aba2599b7d8a1c0c28ca1b0d879321e93
diff --git a/kubernetes-configs/adtran-munich.yml b/kubernetes-configs/adtran-munich.yml
index 3e8bd4f..ca59efd 100644
--- a/kubernetes-configs/adtran-munich.yml
+++ b/kubernetes-configs/adtran-munich.yml
@@ -1,12 +1,27 @@
+---
# SEBA Values
-envoyForEtcdImage: 'matteoscandolo/voltha-envoy:berlin-1.0.2'
-netconfImage: 'matteoscandolo/voltha-netconf:berlin-1.0.2'
-ofagentImage: 'matteoscandolo/voltha-ofagent:berlin-1.0.2'
-vcliImage: 'matteoscandolo/voltha-cli:berlin-1.0.2'
-vcoreImage: 'matteoscandolo/voltha-voltha:berlin-1.0.2'
+images:
-onosImage: 'onosproject/onos:1.13.5'
+ envoy_for_etcd:
+ repository: 'matteoscandolo/voltha-envoy'
+ tag: 'berlin-1.0.2'
+
+ netconf:
+ repository: 'matteoscandolo/voltha-netconf'
+ tag: 'berlin-1.0.2'
+
+ ofagent:
+ repository: 'matteoscandolo/voltha-ofagent'
+ tag: 'berlin-1.0.2'
+
+ vcli:
+ repository: 'matteoscandolo/voltha-vcli'
+ tag: 'berlin-1.0.2'
+
+ vcore:
+ repository: 'matteoscandolo/voltha-voltha'
+ tag: 'berlin-1.0.2'
# synchronizers
att-workflow-driver:
diff --git a/kubernetes-configs/bbwf.yml b/kubernetes-configs/bbwf.yml
index 2051ec4..53e56fc 100644
--- a/kubernetes-configs/bbwf.yml
+++ b/kubernetes-configs/bbwf.yml
@@ -1,51 +1,66 @@
+---
# SEBA Values
-envoyForEtcdImage: '192.168.100.1:30500/voltha/voltha-envoy:berlin-1.0.2'
-netconfImage: '192.168.100.1:30500/voltha/voltha-netconf:berlin-1.0.2'
-ofagentImage: '192.168.100.1:30500/voltha/voltha-ofagent:berlin-1.0.2'
-vcliImage: '192.168.100.1:30500/voltha/voltha-cli:berlin-1.0.2'
-vcoreImage: '192.168.100.1:30500/voltha/voltha-voltha:dev'
-# vcoreImage: '192.168.100.1:30500/voltha/voltha-voltha:berlin-1.0.2'
-freeradiusImage: '192.168.100.1:30500/tpdock/freeradius:latest'
-ingressControllerImage: '192.168.100.1:30500/quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.2'
-httpBackendImage: '192.168.100.1:30500/google_containers/defaultbackend:1.4'
+global:
+ registry: '192.168.100.1:30500/'
+
+images:
+
+ envoy_for_etcd:
+ repository: 'matteoscandolo/voltha-envoy'
+ tag: 'berlin-1.0.2'
+
+ netconf:
+ repository: 'matteoscandolo/voltha-netconf'
+ tag: 'berlin-1.0.2'
+
+ ofagent:
+ repository: 'matteoscandolo/voltha-ofagent'
+ tag: 'berlin-1.0.2'
+
+ vcli:
+ repository: 'matteoscandolo/voltha-vcli'
+ tag: 'berlin-1.0.2'
+
+ vcore:
+ repository: 'matteoscandolo/voltha-voltha'
+ tag: 'dev'
+
+# xos core
+ xos_core:
+ repository: xosproject/xos-core
+ tag: 2.1.9
+
+ xos_chameleon:
+ repository: xosproject/chameleon
+ tag: 2.1.9
+
+ xos_tosca:
+ repository: xosproject/xos-tosca
+ tag: 1.1.3
+
+xos-gui:
+ images:
+ xos_gui:
+ repository: xosproject/xos-gui
+ tag: 1.0.3
+ xos_ws:
+ repository: xosproject/xos-ws
+ tag: 2.0.0
+
+xos-db:
+ image:
+ repository: 'postgres'
+ tag: '10.3-alpine'
etcd-operator:
etcdCluster:
size: 1
-onosImage: '192.168.100.1:30500/onosproject/onos:1.13.5'
-
-# xos core
-images:
- xos_core:
- repository: 192.168.100.1:30500/xosproject/xos-core
- tag: 2.1.9
- xos_chameleon:
- repository: 192.168.100.1:30500/xosproject/chameleon
- tag: 2.1.9
- xos_tosca:
- repository: 192.168.100.1:30500/xosproject/xos-tosca
- tag: 1.1.3
-xos-gui:
- images:
- xos_gui:
- repository: 192.168.100.1:30500/xosproject/xos-gui
- tag: 1.0.3
- xos_ws:
- repository: 192.168.100.1:30500/xosproject/xos-ws
- tag: 2.0.0
-xos-db:
- image:
- repository: '192.168.100.1:30500/postgres'
- tag: '10.3-alpine'
-
-tosca_loaderImage: '192.168.100.1:30500/xosproject/tosca-loader:1.0.1'
-
# others
sadis-server:
image:
- repository: '192.168.100.1:30500/opencord/sadis-server'
+ repository: 'opencord/sadis-server'
tag: 'latest'
# kafka
diff --git a/kubernetes-configs/edgecore-pod1.yml b/kubernetes-configs/edgecore-pod1.yml
index 7109170..47c9e51 100644
--- a/kubernetes-configs/edgecore-pod1.yml
+++ b/kubernetes-configs/edgecore-pod1.yml
@@ -1,26 +1,35 @@
+---
# SEBA Values
-# envoyForEtcdImage: 'matteoscandolo/voltha-envoy:ams-1.0.2'
-# netconfImage: 'matteoscandolo/voltha-netconf:ams-1.0.2'
-# ofagentImage: 'matteoscandolo/voltha-ofagent:ams-1.0.2'
-# vcliImage: 'matteoscandolo/voltha-cli:ams-1.0.2'
-# vcoreImage: 'matteoscandolo/voltha-voltha:ams-1.0.2'
-
-envoyForEtcdImage: '192.168.99.181:30500/voltha/voltha-envoy:ams-1.0.2'
-netconfImage: '192.168.99.181:30500/voltha/voltha-netconf:ams-1.0.2'
-ofagentImage: '192.168.99.181:30500/voltha/voltha-ofagent:ams-1.0.2'
-vcliImage: '192.168.99.181:30500/voltha/voltha-cli:ams-1.0.2'
-vcoreImage: '192.168.99.181:30500/voltha/voltha-voltha:ams-1.0.2'
-httpBackendImage: '192.168.99.181:30500/google_containers/defaultbackend:1.4'
-ingressControllerImage: '192.168.99.181:30500/quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.2'
-
-onosImage: '192.168.99.181:30500/onos/onos:ams-1.0.0'
-
global:
registry: '192.168.99.181:30500/'
-# xos
images:
+
+ envoy_for_etcd:
+ repository: 'matteoscandolo/voltha-envoy'
+ tag: 'ams-1.0.2'
+
+ netconf:
+ repository: 'matteoscandolo/voltha-netconf'
+ tag: 'ams-1.0.2'
+
+ ofagent:
+ repository: 'matteoscandolo/voltha-ofagent'
+ tag: 'ams-1.0.2'
+
+ vcli:
+ repository: 'matteoscandolo/voltha-vcli'
+ tag: 'ams-1.0.2'
+
+ vcore:
+ repository: 'matteoscandolo/voltha-voltha'
+ tag: 'ams-1.0.2'
+
+ onos:
+ tag: 'ams-1.0.0'
+
+# xos
xos_core:
tag: 2.1.4
xos_chameleon:
diff --git a/kubernetes-configs/flex-pod1-olt.yml b/kubernetes-configs/flex-pod1-olt.yml
index 13611f1..84e0687 100644
--- a/kubernetes-configs/flex-pod1-olt.yml
+++ b/kubernetes-configs/flex-pod1-olt.yml
@@ -1,3 +1,4 @@
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,21 +17,3 @@
# This file is used to optionally customize helm charts installations
----
-
-# SEBA Values
-
-envoyForEtcdImage: 'voltha/voltha-envoy:latest'
-freeradiusImage: 'tpdock/freeradius:latest'
-netconfImage: 'voltha/voltha-netconf:latest'
-ofagentImage: 'voltha/voltha-ofagent:latest'
-vcliImage: 'voltha/voltha-cli:latest'
-vcoreImage: 'voltha/voltha-voltha:latest'
-
-onosImage: 'onosproject/onos:1.13.5'
-
-# application_logs: |
-# log4j.logger.org.opencord.olt = DEBUG
-# log4j.logger.org.opencord.kafka = DEBUG
-# log4j.logger.org.opencord.sadis = DEBUG
-# log4j.logger.org.opencord.aaa = DEBUG
diff --git a/kubernetes-configs/onlab-pod1.yml b/kubernetes-configs/onlab-pod1.yml
index d6f7290..c2f6c56 100644
--- a/kubernetes-configs/onlab-pod1.yml
+++ b/kubernetes-configs/onlab-pod1.yml
@@ -1,17 +1,28 @@
+---
# SEBA Values
-#envoyForEtcdImage: 'matteoscandolo/voltha-envoy:berlin-1.0.1'
-#netconfImage: 'matteoscandolo/voltha-netconf:berlin-1.0.1'
-#ofagentImage: 'matteoscandolo/voltha-ofagent:berlin-1.0.1'
-#vcliImage: 'matteoscandolo/voltha-cli:berlin-1.0.1'
-#vcoreImage: 'matteoscandolo/voltha-voltha:berlin-1.0.1'
+images:
+ envoy_for_etcd:
+ tag: 'latest'
-envoyForEtcdImage: 'voltha/voltha-envoy:latest'
-freeradiusImage: 'tpdock/freeradius:latest'
-netconfImage: 'smbaker/voltha-netconf:grpc'
-ofagentImage: 'smbaker/voltha-ofagent:grpc'
-vcliImage: 'smbaker/voltha-cli:grpc'
-vcoreImage: 'smbaker/voltha-voltha:grpc'
+ netconf:
+ repository: 'smbaker/voltha-netconf'
+ tag: 'grpc'
+
+ ofagent:
+ repository: 'smbaker/voltha-ofagent'
+ tag: 'grpc'
+
+ vcli:
+ repository: 'smbaker/voltha-vcli'
+ tag: 'grpc'
+
+ vcore:
+ repository: 'smbaker/voltha-voltha'
+ tag: 'grpc'
+
+ onos:
+ tag: '1.13.5'
att-workflow-driver:
image:
@@ -31,8 +42,6 @@
repository: 10.90.0.101:30500/xosproject/vsg-hw-synchronizer
tag: candidate
-onosImage: 'onosproject/onos:1.13.5'
-
application_logs: |
log4j.logger.org.opencord.olt = TRACE
log4j.logger.org.opencord.kafka = DEBUG
diff --git a/kubernetes-configs/onlab-pod2.yml b/kubernetes-configs/onlab-pod2.yml
index 2c408c4..a7a0720 100644
--- a/kubernetes-configs/onlab-pod2.yml
+++ b/kubernetes-configs/onlab-pod2.yml
@@ -1,6 +1,10 @@
+---
# SEBA Values
-vcoreImage: '10.90.0.120:30500/voltha/voltha-voltha:dev'
+images:
+ vcore:
+ repository: '10.90.0.120:30500/voltha/voltha-voltha'
+ tag: 'dev'
volt:
image: