[COMAC-134] Add CORD platform to COMAC-in-a-Box
Change-Id: Ica98dd828209da506206f3f442fdb3978ecb1237
diff --git a/comac-in-a-box/Makefile b/comac-in-a-box/Makefile
index 696b40f..c163e8a 100644
--- a/comac-in-a-box/Makefile
+++ b/comac-in-a-box/Makefile
@@ -20,7 +20,8 @@
KAFKA_CHART_VERSION ?= 0.13.3
KAFKA_POD := "pod/cord-kafka-0"
-ETCD_OPERATOR_VERSION ?= 0.8.3
+CORD_PLATFORM_VERSION ?= 7.0.0
+COMAC_PLATFORM_VERSION ?= 0.0.2
HELM_GLOBAL_ARGS ?=
HELM_NEM_ARGS ?= $(HELM_GLOBAL_ARGS)
@@ -31,8 +32,7 @@
os_vendor := $(shell lsb_release -i -s)
os_release := $(shell lsb_release -r -s)
-# TODO: include CORD platform
-ciab: $(M)/system_check $(M)/omec $(M)/oaisim
+ciab: $(M)/system_check $(M)/omec $(M)/oaisim $(M)/comac-platform
.PHONY: ciab run-test reset-test clean
@@ -116,6 +116,26 @@
mkdir -p $(WORKSPACE)/cord
cd $(WORKSPACE)/cord; git clone https://gerrit.opencord.org/helm-charts
+$(WORKSPACE)/cord/cord-platform: | $(M)/setup
+ 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
+ cd $(WORKSPACE)/cord/cord-platform && \
+ helm dep update cord-platform && \
+ helm upgrade --install $(HELM_GLOBAL_ARGS) cord-platform --version $(CORD_PLATFORM_VERSION) 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 upgrade --install $(HELM_GLOBAL_ARGS) comac-platform --version $(COMAC_PLATFORM_VERSION) comac-platform -f $(CIABVALUES)
+ touch $@
+
# TODO: need to connect ONOS
$(M)/ovs-setup: | $(M)/setup
sudo apt install -y openvswitch-switch
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 3825a54..06c1518 100644
--- a/comac-in-a-box/comac-in-a-box-values.yaml
+++ b/comac-in-a-box/comac-in-a-box-values.yaml
@@ -69,3 +69,17 @@
api_key: "465b5ce8b199b49faa5f0a2ee238a6bc"
opc: "d4416644f6154936193433dd20a0ace0"
msisdn: "1122334456"
+
+# cord-platform values
+etcd-operator:
+ enabled: false
+logging:
+ enabled: false
+nem-monitoring:
+ enabled: true
+
+# comac-platform values
+mcord-setup:
+ enabled: false
+etcd-cluster:
+ enabled: false