Merge "Adding BNG port mapping for BBSIM"
diff --git a/deployment-configs/flex-pod1-olt.yaml b/deployment-configs/flex-pod1-olt.yaml
index 8956ba1..52d9299 100644
--- a/deployment-configs/flex-pod1-olt.yaml
+++ b/deployment-configs/flex-pod1-olt.yaml
@@ -36,6 +36,13 @@
user: 'cord'
pass: 'cord'
+fabric_switches:
+ -
+ mac: 'cc:37:ab:5b:6d:a8'
+ ip: '10.192.4.217'
+ user: 'root'
+ pass: 'onl'
+
olts:
-
ip: '10.192.4.206'
diff --git a/deployment-configs/onlab-pod1.yaml b/deployment-configs/onlab-pod1.yaml
index 3ea3560..4eece97 100644
--- a/deployment-configs/onlab-pod1.yaml
+++ b/deployment-configs/onlab-pod1.yaml
@@ -67,4 +67,4 @@
container_type: 'LXC'
container_name: 'ALPHe3d1cfde'
dst:
- dp_iface_ip_qinq: '10.11.2.254'
+ dp_iface_ip_qinq: '8.8.8.8'
diff --git a/kubernetes-configs/adtran-munich.yml b/kubernetes-configs/adtran-munich.yml
index ca59efd..1933a4e 100644
--- a/kubernetes-configs/adtran-munich.yml
+++ b/kubernetes-configs/adtran-munich.yml
@@ -16,7 +16,7 @@
tag: 'berlin-1.0.2'
vcli:
- repository: 'matteoscandolo/voltha-vcli'
+ repository: 'matteoscandolo/voltha-cli'
tag: 'berlin-1.0.2'
vcore:
diff --git a/kubernetes-configs/bbwf.yml b/kubernetes-configs/bbwf.yml
index 53e56fc..8e01c2b 100644
--- a/kubernetes-configs/bbwf.yml
+++ b/kubernetes-configs/bbwf.yml
@@ -19,7 +19,7 @@
tag: 'berlin-1.0.2'
vcli:
- repository: 'matteoscandolo/voltha-vcli'
+ repository: 'matteoscandolo/voltha-cli'
tag: 'berlin-1.0.2'
vcore:
@@ -64,13 +64,16 @@
tag: 'latest'
# kafka
-image: '192.168.100.1:30500/confluentinc/cp-kafka'
-configurationOverrides:
- "confluent.support.metrics.enable": false
+# NOTE: should make this a separate file or it will collide with other
+# definitions of 'image'
+#
+# image: '192.168.100.1:30500/confluentinc/cp-kafka'
+# configurationOverrides:
+# "confluent.support.metrics.enable": false
zookeper:
image:
- reposiroty: '192.168.100.1:30500/google_samples/k8szk'
+ repository: '192.168.100.1:30500/google_samples/k8szk'
tag: v3
etcd-operator:
diff --git a/kubernetes-configs/edgecore-pod1.yml b/kubernetes-configs/edgecore-pod1.yml
index 47c9e51..31a00a3 100644
--- a/kubernetes-configs/edgecore-pod1.yml
+++ b/kubernetes-configs/edgecore-pod1.yml
@@ -19,7 +19,7 @@
tag: 'ams-1.0.2'
vcli:
- repository: 'matteoscandolo/voltha-vcli'
+ repository: 'matteoscandolo/voltha-cli'
tag: 'ams-1.0.2'
vcore:
@@ -68,7 +68,10 @@
tag: 1.0.2
# kafka
-image: '192.168.99.181:30500/confluentinc/cp-kafka:4.1.2-2'
+# NOTE: should make this a separate file or it will collide with other
+# definitions of 'image'
+#
+# image: '192.168.99.181:30500/confluentinc/cp-kafka:4.1.2-2'
zookeper:
image: '192.168.99.181:30500/google_samples/k8szk:v3'
diff --git a/kubernetes-configs/onlab-pod1.yml b/kubernetes-configs/onlab-pod1.yml
index c2f6c56..308115b 100644
--- a/kubernetes-configs/onlab-pod1.yml
+++ b/kubernetes-configs/onlab-pod1.yml
@@ -14,7 +14,7 @@
tag: 'grpc'
vcli:
- repository: 'smbaker/voltha-vcli'
+ repository: 'smbaker/voltha-cli'
tag: 'grpc'
vcore:
diff --git a/kubernetes-configs/onlab-pod2.yml b/kubernetes-configs/onlab-pod2.yml
index a7a0720..4ba6884 100644
--- a/kubernetes-configs/onlab-pod2.yml
+++ b/kubernetes-configs/onlab-pod2.yml
@@ -9,6 +9,7 @@
volt:
image:
tag: 'master'
+
att-workflow-driver:
image:
tag: 'master'