Commit 3dc99b6e authored by Tim Rozet's avatar Tim Rozet Committed by Gerrit Code Review
Browse files

Merge "Added VPP (including python API) to build process"

parents 85f552fe 5ed87158
...@@ -27,7 +27,7 @@ all_networks="admin_network private_network storage_network external_network api ...@@ -27,7 +27,7 @@ all_networks="admin_network private_network storage_network external_network api
all: iso all: iso
.PHONY: clean .PHONY: clean
clean: images-clean rpms-clean iso-clean tacker-clean congress-clean clean: images-clean rpms-clean iso-clean tacker-clean congress-clean vpp-clean
.PHONY: images .PHONY: images
images: undercloud overcloud-full overcloud-opendaylight overcloud-onos overcloud-opendaylight-sfc images: undercloud overcloud-full overcloud-opendaylight overcloud-onos overcloud-opendaylight-sfc
...@@ -129,6 +129,33 @@ openstack-congress-2016.1-1.noarch.rpm: ...@@ -129,6 +129,33 @@ openstack-congress-2016.1-1.noarch.rpm:
@echo "Building the Congress RPM" @echo "Building the Congress RPM"
rpmbuild --clean -bb --target noarch openstack-congress.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' rpmbuild --clean -bb --target noarch openstack-congress.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)'
###############
# VPP #
###############
VPP_DIR = vpp
.PHONY: vpp-clean
vpp-clean:
@rm -f vpp-bin.tar.gz
@rm -rf vpp-bin vpp
.PHONY: vpp-build
vpp-build: vpp-bin.tar.gz
vpp-bin.tar.gz: vpp
$(MAKE) -C $(VPP_DIR) UNATTENDED=yes install-dep bootstrap build pkg-rpm
$(MAKE) -C $(VPP_DIR)/build-root PLATFORM=vpp TAG=vpp_debug vpp-api-install
pushd vpp/vpp-api/python && python setup.py bdist
mkdir vpp-bin
mv vpp/build-root/*.rpm vpp-bin/
mv vpp/vpp-api/python/dist/*.tar.gz vpp-bin/
tar czf vpp-bin.tar.gz vpp-bin
vpp:
git clone https://gerrit.fd.io/r/vpp
############### ###############
# UNDERCLOUD # # UNDERCLOUD #
############### ###############
...@@ -174,7 +201,7 @@ overcloud-full-clean: ...@@ -174,7 +201,7 @@ overcloud-full-clean:
.PHONY: overcloud-full .PHONY: overcloud-full
overcloud-full: images/overcloud-full.qcow2 overcloud-full: images/overcloud-full.qcow2
images/overcloud-full.qcow2: tacker-rpm congress-rpm images/overcloud-full.qcow2: tacker-rpm congress-rpm vpp-build
@echo "Building the Apex Base Overcloud Image" @echo "Building the Apex Base Overcloud Image"
@./overcloud-full.sh @./overcloud-full.sh
......
...@@ -128,7 +128,11 @@ LIBGUESTFS_BACKEND=direct virt-customize \ ...@@ -128,7 +128,11 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "cd /usr/lib/python2.7/site-packages/congress/datasources && curl -O $doctor_driver" \ --run-command "cd /usr/lib/python2.7/site-packages/congress/datasources && curl -O $doctor_driver" \
--run-command "sed -i \"s/'--detailed-exitcodes',/'--detailed-exitcodes','-l','syslog','-l','console',/g\" /var/lib/heat-config/hooks/puppet" \ --run-command "sed -i \"s/'--detailed-exitcodes',/'--detailed-exitcodes','-l','syslog','-l','console',/g\" /var/lib/heat-config/hooks/puppet" \
--upload /tmp/fdio-master.repo:/etc/yum.repos.d/fdio-master.repo \ --upload /tmp/fdio-master.repo:/etc/yum.repos.d/fdio-master.repo \
--install unzip,vpp,honeycomb \ --upload ../vpp-bin.tar.gz:/root \
--run-command "cd /root && tar zxvf vpp-bin.tar.gz" \
--run-command "yum install -y /root/vpp-bin/*.rpm" \
--run-command "tar zxvf /root/vpp-bin/vpp_papi*.tar.gz -C /" \
--install unzip,honeycomb \
--upload puppet-fdio.tar.gz:/etc/puppet/modules \ --upload puppet-fdio.tar.gz:/etc/puppet/modules \
--run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \ --run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \
--upload vsperf.tar.gz:/var/opt \ --upload vsperf.tar.gz:/var/opt \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment