From be3024dfe9b6c06419c6f4a5f724a01b7e0ab103 Mon Sep 17 00:00:00 2001 From: Konrad Bańka Date: Fri, 24 Jan 2020 11:06:14 +0100 Subject: Correct CBA package for vFW_CNF_CDS usecase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes change helm and cba content to enable instantiation with some workarounds. Data dictionary in this review is not ready yet, as well as there are many workarounds within. Signed-off-by: Konrad Bańka Issue-ID: INT-1260 Change-Id: I4833fa11772b7bd2b65d04f0d81ffad22570d309 --- heat/vFW_CNF_CDS/templates/Makefile | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'heat/vFW_CNF_CDS/templates/Makefile') diff --git a/heat/vFW_CNF_CDS/templates/Makefile b/heat/vFW_CNF_CDS/templates/Makefile index 244f9232..98b2890d 100644 --- a/heat/vFW_CNF_CDS/templates/Makefile +++ b/heat/vFW_CNF_CDS/templates/Makefile @@ -1,20 +1,27 @@ -.PHONY: all clean helm base +.PHONY: all clean helm base cba +CSAR_NAME ?= vfw_k8s_demo +CBA_NAME ?= vFW_CDS_CNF -all: csar/ helm base - cd csar/ && zip -r vfw_k8s_demo.csar . - mv csar/vfw_k8s_demo.csar . +all: csar/ helm base cba + #Can't use .csar extension or SDC will panic + cd csar/ && zip -r $(CSAR_NAME).zip . + mv csar/$(CSAR_NAME).zip . helm: csar/ make -C helm - cp helm/*.tgz csar/ + mv helm/*.tgz csar/ base: csar/ cp base/* csar/ +cba: csar/ + cd cba/ && zip -r $(CBA_NAME).zip . + mv cba/$(CBA_NAME).zip csar/ + csar/: mkdir csar/ clean: rm -rf csar/ - rm -f vfw_k8s_demo.csar + rm -f $(CSAR_NAME).zip -- cgit 1.2.3-korg