Merge "Remove leftover from old plugin configurations"

7 files changed, 0 insertions, 7 deletions

diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
index 71f2771a5..24fa1785d 100644
--- a/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
+++ b/build/f_isoroot/f_bgpvpn-pluginbuild/Makefile
@@ -32,7 +32,6 @@ release:.bgpvpnbuild
 	@mkdir -p ../release/bgpvpn
 	@cp bgpvpn*.rpm ../release/opnfv/
 	cp gitinfo_bgpvpnplugin.txt $(BUILD_BASE)
-	cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins
 
 .bgpvpnbuild:
 	rm -rf fuel-plugin-bgpvpn
diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
index 4ae81dd11..36614a0ce 100644
--- a/build/f_isoroot/f_odlpluginbuild/Makefile
+++ b/build/f_isoroot/f_odlpluginbuild/Makefile
@@ -25,7 +25,6 @@ release:.odlbuild
 	@mkdir -p ../release/opnfv
 	@cp opendaylight*.rpm ../release/opnfv/
 	cp gitinfo_odlplugin.txt $(BUILD_BASE)
-	cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins
 .odlbuild:
 	rm -rf fuel-plugin-opendaylight
 	sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
diff --git a/build/f_isoroot/f_onosfwpluginbuild/Makefile b/build/f_isoroot/f_onosfwpluginbuild/Makefile
index 9516e3d46..355292d6d 100644
--- a/build/f_isoroot/f_onosfwpluginbuild/Makefile
+++ b/build/f_isoroot/f_onosfwpluginbuild/Makefile
@@ -31,7 +31,6 @@ release:.onosbuild
 	@mkdir -p ../release/opnfv
 	@cp onos*.rpm ../release/opnfv/
 	cp gitinfo_onos-plugin.txt $(BUILD_BASE)
-	cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins
 
 .onosbuild:
 	@rm -rf fuel-plugin-onos
diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
index f89f8d980..b4844b420 100644
--- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
+++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
@@ -31,7 +31,6 @@ release:.ovsbuild
 	@mkdir -p ../release/opnfv
 	@cp fuel-plugin-ovs*.rpm ../release/opnfv/
 	cp gitinfo_ovs-nsh-dpdk-plugin.txt $(BUILD_BASE)
-	cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins
 
 .ovsbuild:
 	@rm -rf fuel-plugin-ovs
diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
index a74687307..6bc5769a5 100644
--- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
+++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/Makefile
@@ -31,7 +31,6 @@ release:.ovsnfvbuild
 	@mkdir -p ../release/opnfv
 	@cp fuel-plugin-ovsnfv*.rpm ../release/opnfv/
 	cp gitinfo_ovsnfv-dpdk-plugin.txt $(BUILD_BASE)
-	cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins
 
 .ovsnfvbuild:
 	@rm -rf fuel-plugin-ovsnfv
diff --git a/build/f_isoroot/f_qemupluginbuild/Makefile b/build/f_isoroot/f_qemupluginbuild/Makefile
index 0f245aec3..2e3a34f7b 100644
--- a/build/f_isoroot/f_qemupluginbuild/Makefile
+++ b/build/f_isoroot/f_qemupluginbuild/Makefile
@@ -31,7 +31,6 @@ release:.qemubuild
 	@mkdir -p ../release/opnfv
 	@cp fuel-plugin-qemu*.rpm ../release/opnfv/
 	cp gitinfo_qemu-plugin.txt $(BUILD_BASE)
-	cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins
 
 .qemubuild:
 	@rm -rf fuel-plugin-qemu
diff --git a/build/f_isoroot/f_vsperfpluginbuild/Makefile b/build/f_isoroot/f_vsperfpluginbuild/Makefile
index f45aecb88..d713882fe 100644
--- a/build/f_isoroot/f_vsperfpluginbuild/Makefile
+++ b/build/f_isoroot/f_vsperfpluginbuild/Makefile
@@ -31,7 +31,6 @@ release:.vsperfbuild
 	@mkdir -p ../release/opnfv
 	@cp fuel-plugin-vsperf*.rpm ../release/opnfv/
 	cp gitinfo_vsperf-plugin.txt $(BUILD_BASE)
-	cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins
 
 .vsperfbuild:
 	@rm -rf vswitchperf