summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-11-27 12:26:32 -0500
committerFeng Pan <fpan@redhat.com>2016-11-27 22:48:06 -0500
commitd9232d5a77879ce381142e866cd53ed1fc46e32d (patch)
treefee395985395e73de5a2c6a2812d204bd9ea50db /build
parent9c9e9a64d472be177892049bf8dcb920c4fbc0d1 (diff)
Build failure fixes
- Remove puppet debug from overcloud image - file /var/lib/heat-config/hooks/puppet no longer exist in overcloud image. - Revert networking-vpp to known working version until fix is committed upstream. Change-Id: I9add838a60014a43774d4001ccd84ccad21a3343 Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'build')
-rw-r--r--build/Makefile1
-rwxr-xr-xbuild/overcloud-full.sh1
2 files changed, 1 insertions, 1 deletions
diff --git a/build/Makefile b/build/Makefile
index c693e895..2ff7c8eb 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -204,6 +204,7 @@ networking-vpp.noarch.rpm: networking-vpp
networking-vpp:
git clone https://git.openstack.org/openstack/networking-vpp
+ pushd networking-vpp && git reset --hard 343e8584e445e3dfc10975041d78df8abee1796d
###############
# UNDERCLOUD #
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index fa4444a4..148b0f0a 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -127,7 +127,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--upload puppet-congress.tar.gz:/etc/puppet/modules/ \
--run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \
--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 "yum install -y /root/fdio/*.rpm" \
--run-command "rm -f /etc/sysctl.d/80-vpp.conf" \
--install unzip \