diff options
| author |   Feng Pan <fpan@redhat.com> | 2016-11-27 12:26:32 -0500 |
|---|---|---|
| committer | Feng Pan <fpan@redhat.com> | 2016-11-28 15:43:30 +0000 |
| commit | 53ec4e9c172cfb527ec3b154ddd28109926f46b7 (patch) | |
| tree | e5b9581022f231dcce306e9bc6bb7e5d4760b5a1 /build | |
| parent | 011c7a4b750b11c138728e5537a6e8f65a5d43fa (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>
(cherry picked from commit d9232d5a77879ce381142e866cd53ed1fc46e32d)
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile | 1 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/build/Makefile b/build/Makefile index b6efdf60..5d97d3c4 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 8ffa2b40..8ec7af6b 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -136,7 +136,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 \ |