summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-08-28 21:54:21 -0400
committerTim Rozet <trozet@redhat.com>2016-08-29 13:32:49 +0000
commit8397c6887259317c33eaa4c9461d36454b48e402 (patch)
treeace9ff71c2cebc0dfb33d281a9ba863bc25b9cc9 /build
parent6de39f5473101ff55c74099bf7f5e6ebef2e175f (diff)
Add networking-vpp ML2 mechanism driver to overcloud image
Change-Id: Icfeb02f73b18aa6dbcca449b83d2c8c8bf0f6dab Signed-off-by: Feng Pan <fpan@redhat.com> (cherry picked from commit 2cbae61789e59ddae56e9f0fa363a8ec49651f91)
Diffstat (limited to 'build')
-rw-r--r--build/Makefile12
-rwxr-xr-xbuild/overcloud-full.sh3
2 files changed, 14 insertions, 1 deletions
diff --git a/build/Makefile b/build/Makefile
index 3a430b2..ff7a707 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -164,6 +164,7 @@ vpp-clean:
@rm -f vpp-bin.tar.gz
@rm -rf vpp-bin vpp
@rm -rf honeycomb $(MAVEN) $(MAVEN_FILE) honeycomb-1.0.0-99.noarch.rpm
+ @rm -rf networking-vpp networking-vpp.noarch.rpm
.PHONY: vpp-build
vpp-build: vpp-bin.tar.gz
@@ -195,6 +196,15 @@ $(MAVEN): $(MAVEN_FILE)
$(MAVEN_FILE):
wget http://www.webhostingjams.com/mirror/apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
+.PHONY: networking-vpp-rpm
+networking-vpp-rpm: networking-vpp.noarch.rpm
+
+networking-vpp.noarch.rpm: networking-vpp
+ pushd networking-vpp && python setup.py bdist_rpm --binary-only
+ mv networking-vpp/dist/*.rpm networking-vpp.noarch.rpm
+
+networking-vpp:
+ git clone -b stable https://github.com/naveenjoy/networking-vpp.git
###############
# UNDERCLOUD #
@@ -241,7 +251,7 @@ overcloud-full-clean:
.PHONY: overcloud-full
overcloud-full: images/overcloud-full.qcow2
-images/overcloud-full.qcow2: tacker-rpm tackerclient-rpm congress-rpm
+images/overcloud-full.qcow2: tacker-rpm tackerclient-rpm congress-rpm networking-vpp-rpm
@echo "Building the Apex Base Overcloud Image"
@./overcloud-full.sh
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 12984b2..0984a92 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -114,6 +114,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "mkdir /root/fdio" \
$dpdk_pkg_str \
$fdio_pkg_str \
+ --upload ../networking-vpp.noarch.rpm:/root/fdio \
+ --run-command "yum install -y etcd" \
+ --run-command "pip install python-etcd" \
--install "centos-release-qemu-ev" \
--run-command "yum update -y" \
--run-command "yum remove -y qemu-system-x86" \