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-opendaylight.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-opendaylight.sh')
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index f892c712..498154d8 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -80,6 +80,7 @@ populate_cache http://artifacts.opnfv.org/apex/danube/quagga/quagga.tar.gz # Patch in OPNFV custom puppet-tripleO # install Honeycomb # install quagga/zrpc +# upload neutron patch for generic NS linux interface driver + OVS for external networks LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_DIR}/opendaylight_boron.repo:/etc/yum.repos.d/opendaylight.repo \ --run-command "yum install --downloadonly --downloaddir=/root/boron/ opendaylight" \ @@ -109,6 +110,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "yum downgrade -y python-zmq-14.3.1" \ --install zeromq-4.1.4,zeromq-devel-4.1.4 \ --install capnproto-devel,capnproto-libs,capnproto \ + --upload ${BUILD_ROOT}/patches/neutron-patch-NSDriver.patch:/usr/lib/python2.7/site-packages/ \ -a overcloud-full-opendaylight_build.qcow2 LIBGUESTFS_BACKEND=direct virt-sparsify --compress overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2 |