Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SNAPS
apex
Commits
3dc99b6e
Commit
3dc99b6e
authored
Aug 17, 2016
by
Tim Rozet
Committed by
Gerrit Code Review
Aug 17, 2016
Browse files
Merge "Added VPP (including python API) to build process"
parents
85f552fe
5ed87158
Changes
2
Hide whitespace changes
Inline
Side-by-side
build/Makefile
View file @
3dc99b6e
...
...
@@ -27,7 +27,7 @@ all_networks="admin_network private_network storage_network external_network api
all
:
iso
.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
images
:
undercloud overcloud-full overcloud-opendaylight overcloud-onos overcloud-opendaylight-sfc
...
...
@@ -129,6 +129,33 @@ openstack-congress-2016.1-1.noarch.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`)'
###############
# 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 #
###############
...
...
@@ -174,7 +201,7 @@ overcloud-full-clean:
.PHONY
:
overcloud-full
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"
@
./overcloud-full.sh
...
...
build/overcloud-full.sh
View file @
3dc99b6e
...
...
@@ -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
"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
\
--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
\
--run-command
"cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz"
\
--upload
vsperf.tar.gz:/var/opt
\
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment