Merge ovs and router to fabric
Change-Id: I078c92efd013f6ab377010e7c1b4ae1f7a251a5f
diff --git a/comac-in-a-box/resources/quagga.yaml b/comac-in-a-box/resources/router.yaml
similarity index 92%
rename from comac-in-a-box/resources/quagga.yaml
rename to comac-in-a-box/resources/router.yaml
index 130fb1a..67aedae 100644
--- a/comac-in-a-box/resources/quagga.yaml
+++ b/comac-in-a-box/resources/router.yaml
@@ -1,5 +1,3 @@
-#!/bin/bash -x
-#
# Copyright 2019-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,13 +11,14 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+
---
apiVersion: v1
kind: Pod
metadata:
name: router
labels:
- app: quagga
+ app: router
annotations:
k8s.v1.cni.cncf.io/networks: '[
{ "name": "sgi-net", "interface": "sgi-rtr", "ips": "13.1.1.254/24" }
@@ -30,7 +29,6 @@
command: ["/bin/bash", "-c"]
args:
- >
- ip link set sgi-rtr address 0e:00:00:00:00:01;
trap : TERM INT; sleep infinity & wait
image: opencord/quagga
securityContext:
diff --git a/comac-in-a-box/resources/sgi-net.yaml b/comac-in-a-box/resources/sgi-net.yaml
new file mode 100644
index 0000000..75aa95e
--- /dev/null
+++ b/comac-in-a-box/resources/sgi-net.yaml
@@ -0,0 +1,26 @@
+# Copyright 2019-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+apiVersion: "k8s.cni.cncf.io/v1"
+kind: NetworkAttachmentDefinition
+metadata:
+ name: sgi-net
+spec:
+ config: '{
+ "type": "simpleovs",
+ "ipam": {
+ "type": "static"
+ }
+ }'