COMAC-8 add ability to disable sriov for mcord-services
Add option to enable/disable sriov. PTP plugin can be used in case
sriov is disabled. Basically all kind of plugin can be used,
but may need some manual steps.
Also, refactor spgwu to make it more configurable and conventional.
Change-Id: I62d5d41cbd27b53b9c66dfad55123ba7bc340482
diff --git a/mcord-release/mcord-services/values.yaml b/mcord-release/mcord-services/values.yaml
index 65fab56..8008899 100644
--- a/mcord-release/mcord-services/values.yaml
+++ b/mcord-release/mcord-services/values.yaml
@@ -56,27 +56,53 @@
spgwu:
name: spgwu
- image: krsna1729/ngic-dp
- cpu: 4
- memory: 8Gi
+ images:
+ tags:
+ init: ngick8stesting/c3po-init:latest
+ spgwu: krsna1729/ngic-dp:latest
+ pullPolicy: IfNotPresent
+ resources:
+ cpu: 4
+ memory: 8Gi
+ conf:
+ dp:
+ # s1u and sgi interfaces are fixed to "s1u-net" and "sgi-net"
+ # Note that s1u_af_dev and sgi_af_dev are valid only when sriov is disabled
+ # setup-af-iface.sh script creates additional veth pair with the names here
+ s1u_af_dev: s1u-veth
+ sgi_af_dev: sgi-veth
+ # set "--no-pci --vdev eth_af_packet0,iface=s1u-dev --vdev eth_af_packet1,iface=sgi-net"
+ # when sriov is disabled
+ devices: ""
+ rtr_sgi_ip: 13.1.1.254
+ sgi_mask: 255.255.255.0
enb:
host: 10.1.11.3
port: 36412
-# Network block defines the network used by SR-IOV pods
-# ipamtype: defined the prefered IP management plugin (only support host-local or centralip)
-# subnet: defined the customized network subnet range
-# gateway: defined the default gateway for pod which attaches to current network
-# this option will be ignored when using centralip as ipam plugin
-networks:
- - name: s1u-net
- sriovtype: vfioveth
- ipamtype: centralip
- subnet: 119.0.0.0/24
- gateway: 119.0.0.254
- - name: sgi-net
- sriovtype: vfioveth
- ipamtype: centralip
- subnet: 13.1.1.0/24
- gateway: 13.1.1.254
+# Network block defines the networks
+# Note that currently we use fixed list of networks, s1u-net and sgi-net
+# type: provide what type of cni will be used
+# possible options are vfioveth and ptp
+# use vfioveth when sriov enabled, and ptp otherwise
+# ipam: provide what type of ipam will be used
+# possible options are centralip and host-local
+# note that centralip requires etcd cluster
+# subnet: provide subnet range to be assigned to the pod
+# gateway: provide default gateway of the network
+# valid only when centralip is used
+network:
+ sriov:
+ enabled: true
+ networks:
+ - name: s1u-net
+ type: vfioveth
+ ipam: centralip
+ subnet: 119.0.0.0/24
+ gateway: 119.0.0.254
+ - name: sgi-net
+ type: vfioveth
+ ipam: centralip
+ subnet: 13.1.1.0/24
+ gateway: 13.1.1.254