summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/Makefile31
-rwxr-xr-xbuild/overcloud-full.sh6
-rwxr-xr-xbuild/undercloud.sh2
-rwxr-xr-xci/util.sh11
4 files changed, 45 insertions, 5 deletions
diff --git a/build/Makefile b/build/Makefile
index 96711d23..91b1fc5a 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -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
@@ -130,6 +130,33 @@ openstack-congress-2016.1-1.noarch.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
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index a7d04eeb..636ac596 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -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 \
diff --git a/build/undercloud.sh b/build/undercloud.sh
index 43884b16..75aa265a 100755
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -59,7 +59,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "sed -i '/SERVICE_LIST/a\\ \x27tacker\x27: {\x27password_field\x27: \x27OVERCLOUD_TACKER_PASSWORD\x27},' /usr/lib/python2.7/site-packages/tripleoclient/constants.py" \
--run-command "sed -i '/PASSWORD_NAMES =/a\\ \"OVERCLOUD_TACKER_PASSWORD\",' /usr/lib/python2.7/site-packages/tripleoclient/utils.py" \
--run-command "sed -i '/AodhPassword/a\\ parameters\[\x27TackerPassword\x27\] = passwords\[\x27OVERCLOUD_TACKER_PASSWORD\x27\]' /usr/lib/python2.7/site-packages/tripleoclient/v1/overcloud_deploy.py" \
- --run-command "sed -i '/^SERVICES/a\ \x27tacker\x27: {\x27description\x27: \x27Tacker Service\x27, \x27type\x27: \x27servicevm\x27, \x27path\x27: \x27/\x27, \x27port\x27: 1789 },' /usr/lib/python2.7/site-packages/os_cloud_config/keystone.py" \
+ --run-command "sed -i '/^SERVICES/a\ \x27tacker\x27: {\x27description\x27: \x27Tacker Service\x27, \x27type\x27: \x27servicevm\x27, \x27path\x27: \x27/\x27, \x27port\x27: 8888 },' /usr/lib/python2.7/site-packages/os_cloud_config/keystone.py" \
--upload /tmp/tacker.repo:/etc/yum.repos.d/ \
--install "python-tackerclient" \
--install "python2-aodhclient" \
diff --git a/ci/util.sh b/ci/util.sh
index bcb3a3a7..8c09278a 100755
--- a/ci/util.sh
+++ b/ci/util.sh
@@ -91,19 +91,28 @@ parse_cmdline() {
;;
mock-detached)
if [ "$2" == "on" ]; then
+ echo "Ensuring we can talk to gerrit.opnfv.org"
+ iptables -A OUTPUT -p tcp -d gerrit.opnfv.org --dport 443 -j ACCEPT
echo "Blocking output http (80) traffic"
iptables -A OUTPUT -p tcp --dport 80 -j REJECT
+ iptables -A FORWARD -p tcp --dport 80 -j REJECT
echo "Blocking output https (443) traffic"
iptables -A OUTPUT -p tcp --dport 443 -j REJECT
+ iptables -A FORWARD -p tcp --dport 443 -j REJECT
echo "Blocking output dns (53) traffic"
- iptables -A OUTPUT -p tcp --dport 53 -j REJECT
+ iptables -A FORWARD -p tcp --dport 53 -j REJECT
elif [ "$2" == "off" ]; then
+ echo "Cleaning gerrit.opnfv.org specific rule"
+ iptables -D OUTPUT -p tcp -d gerrit.opnfv.org --dport 443 -j ACCEPT
echo "Allowing output http (80) traffic"
iptables -D OUTPUT -p tcp --dport 80 -j REJECT
+ iptables -D FORWARD -p tcp --dport 80 -j REJECT
echo "Allowing output https (443) traffic"
iptables -D OUTPUT -p tcp --dport 443 -j REJECT
+ iptables -D FORWARD -p tcp --dport 443 -j REJECT
echo "Allowing output dns (53) traffic"
iptables -D OUTPUT -p tcp --dport 53 -j REJECT
+ iptables -D FORWARD -p tcp --dport 53 -j REJECT
else
display_usage
fi