diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-17 15:20:10 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-03-17 15:34:53 -0400 |
| commit | d6cc43a39fbb79763db0d9de19b5ab0b4af630f7 (patch) | |
| tree | 4f26df5c2dc038c15a0c9a0319eaa12b204dc0f5 /build/overcloud-full.sh | |
| parent | cdeac78e8253804bbb486d8fc24fefbec928d796 (diff) | |
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 <trozet@redhat.com>
Diffstat (limited to 'build/overcloud-full.sh')
| -rwxr-xr-x | build/overcloud-full.sh | 2 |
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/ \ |