Apply the latest changes on COMAC charts
Also create separate target for brining up oaisim in CiaB.
Change-Id: I6d4b5086c7992a1998213d67485bbb1f8cc17898
diff --git a/comac-in-a-box/Makefile b/comac-in-a-box/Makefile
index 3dee26c..bfdaa3e 100644
--- a/comac-in-a-box/Makefile
+++ b/comac-in-a-box/Makefile
@@ -29,9 +29,10 @@
os_vendor := $(shell lsb_release -i -s)
os_release := $(shell lsb_release -r -s)
-ciab: $(M)/system-check $(M)/omec $(M)/oaisim $(M)/comac-platform
+ciab: $(M)/system-check $(M)/platform $(M)/omec
+oaisim: $(M)/oaisim
-.PHONY: ciab test reset-test clean
+.PHONY: ciab oaisim test reset-test clean
$(M):
mkdir -p $(M)
@@ -117,20 +118,13 @@
mkdir -p $(WORKSPACE)/cord
cd $(WORKSPACE)/cord; git clone https://gerrit.opencord.org/cord-platform
-$(WORKSPACE)/cord/comac-helm-charts: | $(M)/setup
- mkdir -p $(WORKSPACE)/cord
- cd $(WORKSPACE)/cord; git clone https://gerrit.opencord.org/comac-helm-charts
-
-$(M)/cord-platform: | $(M)/helm-ready $(WORKSPACE)/cord/cord-platform
+$(M)/platform: | $(M)/helm-ready $(WORKSPACE)/cord/helm-charts $(WORKSPACE)/cord/cord-platform
cd $(WORKSPACE)/cord/cord-platform && \
helm dep update cord-platform && \
helm install $(HELM_GLOBAL_ARGS) --name cord-platform cord-platform -f $(CIABVALUES)
- touch $@
-
-$(M)/comac-platform: | $(M)/helm-ready $(WORKSPACE)/cord/comac-helm-charts $(M)/cord-platform
- cd $(WORKSPACE)/cord/comac-helm-charts && \
- helm dep update comac-platform && \
- helm install $(HELM_GLOBAL_ARGS) --name comac-platform comac-platform -f $(CIABVALUES)
+ cd $(WORKSPACE)/cord/helm-charts && \
+ helm dep update comac && \
+ helm install $(HELM_GLOBAL_ARGS) --name comac comac -f $(CIABVALUES)
touch $@
/opt/cni/bin/simpleovs: | $(M)/k8s-ready
@@ -178,7 +172,7 @@
--tag omecproject/lte-uesoftmodem:1.0.0
touch $@
-$(M)/oaisim: | $(M)/omec $(M)/ue-image
+$(M)/oaisim: | $(M)/ue-image $(M)/omec
sudo ip addr add 127.0.0.2/8 dev lo || true
$(eval mme_iface=$(shell ip -4 route list default | awk -F 'dev' '{ print $$2; exit }' | awk '{ print $$1 }'))
cd $(WORKSPACE)/cord/helm-charts; \
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 20874e9..3e8da2d 100644
--- a/comac-in-a-box/comac-in-a-box-values.yaml
+++ b/comac-in-a-box/comac-in-a-box-values.yaml
@@ -20,11 +20,14 @@
nem-monitoring:
enabled: true
-# comac-platform values
-mcord-setup:
+# comac values
+seba-services:
enabled: false
-etcd-cluster:
- enabled: false
+mcord-services:
+ fabric:
+ enabled: false
+ progran:
+ enabled: false
# cassandra values
cassandra:
diff --git a/comac/sample/override-values-multi.yaml b/comac/sample/override-values-multi.yaml
index c5d4227..c4acd8f 100644
--- a/comac/sample/override-values-multi.yaml
+++ b/comac/sample/override-values-multi.yaml
@@ -416,14 +416,7 @@
# cord-platform values
etcd-operator:
enabled: false
-logging:
- enabled: false
-nem-monitoring:
- enabled: true
-# comac-platform values
-mcord-setup:
+# comac values
+seba-services:
enabled: false
-etcd-cluster:
- enabled: false
-
diff --git a/comac/sample/override-values-single.yaml b/comac/sample/override-values-single.yaml
index a9ec13a..bcae6a4 100644
--- a/comac/sample/override-values-single.yaml
+++ b/comac/sample/override-values-single.yaml
@@ -405,14 +405,7 @@
# cord-platform values
etcd-operator:
enabled: false
-logging:
- enabled: false
-nem-monitoring:
- enabled: true
-# comac-platform values
-mcord-setup:
+# comac values
+seba-services:
enabled: false
-etcd-cluster:
- enabled: false
-