From 983c23e49dd1312c7cf66d528261441be458b29e Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Wed, 17 May 2017 23:57:53 -0400 Subject: Build and deployment fixes for danube - Remove puppet-neutron-add-odl-settings.patch file, this patch is now included in overcloud images. - Add retry for pacemaker::stonith resource to avoid resource creation failure during deployment opnfv-puppet-tripleo-pr: 27 Change-Id: I8440e7ddc290d04135e8cd82b2136cc245dc980a Signed-off-by: Feng Pan --- build/overcloud-full.sh | 2 -- 1 file changed, 2 deletions(-) (limited to 'build/overcloud-full.sh') diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 917d1521..786424d9 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -146,8 +146,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "yumdownloader --destdir=/root/ovs27 openvswitch*2.7* python-openvswitch-2.7*" \ --run-command "pip install python-senlinclient" \ --run-command "sed -i -E 's/timeout=[0-9]+/timeout=60/g' /usr/share/openstack-puppet/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb" \ - --upload ${BUILD_ROOT}/patches/puppet-neutron-add-odl-settings.patch:/usr/share/openstack-puppet/modules/neutron/ \ - --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-add-odl-settings.patch" \ --upload ${CACHE_DIR}/$kvmfornfv_kernel_rpm:/root/ \ --upload ${BUILD_ROOT}/patches/puppet-neutron-vpp-ml2.patch:/usr/share/openstack-puppet/modules/neutron/ \ --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-vpp-ml2.patch" \ -- cgit 1.2.3-korg