From d6cc43a39fbb79763db0d9de19b5ab0b4af630f7 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Fri, 17 Mar 2017 15:20:10 -0400 Subject: Fixes neutron patch to only apply when ODL + FDIO We don't want the neutorn patch which hardcodes router external interface to OVS and adds generic NS linux interface driver to be applied for every scenario. JIRA: APEX-406 Change-Id: I0fd7ed07a5ff58f9e1565831f4f469c11b501385 Signed-off-by: Tim Rozet --- 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 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/ \ -- cgit 1.2.3-korg