COMAC-97 Apply the latest changes to comac-in-a-box
Tested with the latest patch: https://gerrit.opencord.org/#/c/15057/
Change-Id: I584df922cddc739142d4bf6435b2223354101527
diff --git a/comac-in-a-box/comac-in-a-box-values.yaml b/comac-in-a-box/comac-in-a-box-values.yaml
index 06c1518..785790a 100644
--- a/comac-in-a-box/comac-in-a-box-values.yaml
+++ b/comac-in-a-box/comac-in-a-box-values.yaml
@@ -12,44 +12,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
----
-# etcd-cluster
-etcdNodePort: 32379
-clusterSize: 1
+resources:
+ enabled: false
-# mcord-services values
-hssdb:
- cpu: 1
-hss:
- cpu: 0.5
-spgwc:
- image: omecproject/ngic-cp:0.1.0-dev-debug
- cpu: 0.5
-spgwu:
- images:
- tags:
- spgwu: omecproject/ngic-dp:0.1.0-dev-debug
- resources:
- cpu: 1
- conf:
- dp:
- devices: "--no-pci --vdev eth_af_packet0,iface=s1u-net --vdev eth_af_packet1,iface=sgi-net"
-mme:
- type: openmme
- resources:
- cpu: 0.5
-network:
+cassandra:
+ config:
+ cluster_size: 1
+
+config:
sriov:
enabled: false
- s1u:
- cni_plugin: simpleovs
- ipam: host-local
- sgi:
- cni_plugin: simpleovs
- ipam: host-local
-
-# oaisim values
-conf:
+ spgwu:
+ devices: "--no-pci --vdev eth_af_packet0,iface=s1u-net --vdev eth_af_packet1,iface=sgi-net"
plmn:
name: "COMAC Test Network"
short_name: "COMAC"
@@ -70,6 +44,10 @@
opc: "d4416644f6154936193433dd20a0ace0"
msisdn: "1122334456"
+networks:
+ cniPlugin: simpleovs
+ ipam: static
+
# cord-platform values
etcd-operator:
enabled: false