summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-03-18 02:59:31 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-18 02:59:31 +0000
commitf5aa679fc3a96291b4d77ffd43117a6bec0cc488 (patch)
treecc670e3e7c119c128bd8700c4a7c64dce1096a81 /build
parent5b6c18edc9bed2a213518f05d0cf6dc227da39db (diff)
parentd6cc43a39fbb79763db0d9de19b5ab0b4af630f7 (diff)
Merge "Fixes neutron patch to only apply when ODL + FDIO"
Diffstat (limited to 'build')
-rwxr-xr-xbuild/overcloud-full.sh2
-rwxr-xr-xbuild/overcloud-opendaylight.sh2
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