From: Philip Joseph Date: Thu, 13 Oct 2016 06:24:52 +0000 (+0530) Subject: Bug 85: Fix VyOS package build X-Git-Tag: v2.0.2~6^2~23^2~1 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=1a6beb93a730957802aee371f987b70008aeb5eb;p=osm%2Fdevops.git Bug 85: Fix VyOS package build Signed-off-by: Philip Joseph --- diff --git a/Makefile b/Makefile index 1199c098..cf0f8cda 100644 --- a/Makefile +++ b/Makefile @@ -77,9 +77,9 @@ $(VNFD_BUILD_DIR)/6wind_vnf/charms/vpe-router: $(VNFD_BUILD_DIR)/6wind_vnf $(BUI # Copy the PE Charm into the PE vnf package directory before packaging cp -rf $(BUILD_DIR)/juju-charms/builds/vpe-router $(VNFD_BUILD_DIR)/6wind_vnf/charms -$(VNFD_BUILD_DIR)/VyOS_vnf/charms/VyOS-proxy: $(VNFD_BUILD_DIR)/VyOS_vnf $(BUILD_DIR)/juju-charms +$(VNFD_BUILD_DIR)/VyOS_vnf/charms/vyos-proxy: $(VNFD_BUILD_DIR)/VyOS_vnf $(BUILD_DIR)/juju-charms # Copy the PE Charm into the PE vnf package directory before packaging - cp -rf $(BUILD_DIR)/juju-charms/builds/VyOS-proxy $(VNFD_BUILD_DIR)/VyOS_vnf/charms + cp -rf $(BUILD_DIR)/juju-charms/builds/vyos-proxy $(VNFD_BUILD_DIR)/VyOS_vnf/charms -$(BUILD_DIR)/vnfd_pkgs/%.tar.gz: $(VNFD_BUILD_DIR)/% $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms/clearwater-aio-proxy $(VNFD_BUILD_DIR)/6wind_vnf/charms/vpe-router $(VNFD_BUILD_DIR)/VyOS_vnf/charms/VyOS-proxy +$(BUILD_DIR)/vnfd_pkgs/%.tar.gz: $(VNFD_BUILD_DIR)/% $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms/clearwater-aio-proxy $(VNFD_BUILD_DIR)/6wind_vnf/charms/vpe-router $(VNFD_BUILD_DIR)/VyOS_vnf/charms/vyos-proxy src/generate_descriptor_pkg.sh -d $(BUILD_DIR)/vnfd_pkgs $< diff --git a/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml b/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml index 79a11e51..0ac926f5 100644 --- a/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml +++ b/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml @@ -40,7 +40,7 @@ vnfd:vnfd-catalog: value: vyos seq: '1' juju: - charm: VyOS-proxy + charm: vyos-proxy connection-point: - name: eth0 type: VPORT