commit d2902c68d64393feb58a1ae06f270aca3f8f648a
author Andy Bavier <andy@opennetworking.org> Thu Oct 31 20:43:27 2019 +0000
committer Gerrit Code Review <gerrit@opencord.org> Thu Oct 31 20:43:27 2019 +0000
tree c34126f6db2d060d4c763ad700776b73e5f5d00b
parent 898b721f76f145369cb4ea31e356065ff1e76523
parent 07ff0a15a6c9eb8169e7d62548ff75ebf13dec6f

Merge "Remove unneeded custom images"

kubernetes-configs/flex-ocp-cord.yml

diff --git a/kubernetes-configs/flex-ocp-cord.yml b/kubernetes-configs/flex-ocp-cord.yml
index 3038df2..68afc7f 100644
--- a/kubernetes-configs/flex-ocp-cord.yml
+++ b/kubernetes-configs/flex-ocp-cord.yml
@@ -15,11 +15,6 @@
 
 # Automated deployment configuration for flex ocp cord pod build , olt/onu are connected to this
 
-images:
-  onos:
-    tag: dhcp-fix
-    repository: matteoscandolo/voltha-onos
-
 application_logs: |
   log4j.logger.org.opencord.olt = DEBUG
   log4j.logger.org.opencord.kafka = DEBUG

kubernetes-configs/voltha/flex-ocp-cord.yml

diff --git a/kubernetes-configs/voltha/flex-ocp-cord.yml b/kubernetes-configs/voltha/flex-ocp-cord.yml
index 9232d21..3a898a7 100644
--- a/kubernetes-configs/voltha/flex-ocp-cord.yml
+++ b/kubernetes-configs/voltha/flex-ocp-cord.yml
@@ -16,12 +16,6 @@
   image_tag: master
   image_pullPolicy: Always
 
-images:
-  onos:
-    tag: dhcp-fix
-    repository: matteoscandolo/voltha-onos
-    pullPolicy: Always
-
 deployments:
   etcdOperator: true
   backupOperator: false

kubernetes-configs/voltha/onf-demo-pod.yml

diff --git a/kubernetes-configs/voltha/onf-demo-pod.yml b/kubernetes-configs/voltha/onf-demo-pod.yml
index d6fd241..51e7fd6 100644
--- a/kubernetes-configs/voltha/onf-demo-pod.yml
+++ b/kubernetes-configs/voltha/onf-demo-pod.yml
@@ -19,24 +19,6 @@
   image_tag: master
   image_pullPolicy: Always
 
-images:
-  adapter_open_olt:
-    tag_go: voltha-2.1
-    pullPolicy: Always
-  onos:
-    tag: dhcp-fix
-    repository: matteoscandolo/voltha-onos
-    pullPolicy: Always
-  bbsim:
-    tag: 2.0.2
-    pullPolicy: Always
-  afrouter:
-    repository: voltha/voltha-afrouter
-    tag: master
-  afrouterd:
-    repository: voltha/voltha-afrouterd
-    tag: master
-
 deployments:
   etcdOperator: true
   backupOperator: false

kubernetes-configs/voltha/onlab-pod1.yml

diff --git a/kubernetes-configs/voltha/onlab-pod1.yml b/kubernetes-configs/voltha/onlab-pod1.yml
index 9232d21..3a898a7 100644
--- a/kubernetes-configs/voltha/onlab-pod1.yml
+++ b/kubernetes-configs/voltha/onlab-pod1.yml
@@ -16,12 +16,6 @@
   image_tag: master
   image_pullPolicy: Always
 
-images:
-  onos:
-    tag: dhcp-fix
-    repository: matteoscandolo/voltha-onos
-    pullPolicy: Always
-
 deployments:
   etcdOperator: true
   backupOperator: false