summaryrefslogtreecommitdiffstats
path: root/build/overcloud-full.sh
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-03-18 02:59:38 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-18 02:59:38 +0000
commit8c1c4b287a989082081b218fe73670ff443c651d (patch)
tree5d1040c2477110dccabb5784d4499d3cf5033c23 /build/overcloud-full.sh
parent4d5ea2088607c032c848f284d1c44f07f24d8747 (diff)
parentdeccaf2df412d64b85eb4b9cd64af0ca24d551d6 (diff)
Merge "Fixes neutron patch to only apply when ODL + FDIO" into stable/danube
Diffstat (limited to 'build/overcloud-full.sh')
-rwxr-xr-xbuild/overcloud-full.sh2
1 files changed, 0 insertions, 2 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 59544d7b..811249b4 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -145,8 +145,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--install /root/$tackerclient_pkg \
--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/neutron-patch-NSDriver.patch:/usr/lib/python2.7/site-packages/ \
- --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron-patch-NSDriver.patch" \
--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/ \