diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-08-29 13:32:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-29 13:32:34 +0000 |
| commit | 54a53b36c783729424c3596ec4612bad4465de0a (patch) | |
| tree | 964a1cb8f249a4f597afc0d813d05cb10db4d846 | |
| parent | 38a4ac1614905066b24071c682170736e4779e79 (diff) | |
| parent | 2cbae61789e59ddae56e9f0fa363a8ec49651f91 (diff) | |
Merge "Add networking-vpp ML2 mechanism driver to overcloud image"
| -rw-r--r-- | build/Makefile | 12 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/build/Makefile b/build/Makefile index 74a2a610..89aa647c 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 12984b2d..0984a923 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" \ |