diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-18 02:59:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-18 02:59:38 +0000 |
| commit | 8c1c4b287a989082081b218fe73670ff443c651d (patch) | |
| tree | 5d1040c2477110dccabb5784d4499d3cf5033c23 /build | |
| parent | 4d5ea2088607c032c848f284d1c44f07f24d8747 (diff) | |
| parent | deccaf2df412d64b85eb4b9cd64af0ca24d551d6 (diff) | |
Merge "Fixes neutron patch to only apply when ODL + FDIO" into stable/danube
Diffstat (limited to 'build')
| -rwxr-xr-x | build/overcloud-full.sh | 2 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 2 |
2 files changed, 2 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/ \ 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 |