From d3ff8f323b2827dc14ee550a99a5661fee2294cb Mon Sep 17 00:00:00 2001 From: Carlos Goncalves Date: Mon, 26 Jun 2017 11:16:00 +0200 Subject: Backport Neutron port data plane status JIRA: APEX-444 JIRA: DOCTOR-102 Change-Id: Idc40aa549fb1aae077a9e6b84225833a9c7c5b72 Signed-off-by: Carlos Goncalves --- build/overcloud-full.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'build/overcloud-full.sh') diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 5f50c1d5..cb1b94bc 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -45,6 +45,7 @@ qemu-img resize overcloud-full_build.qcow2 +900MB # expand file system to max disk size # installing forked apex-puppet-tripleo +# upload neutron port data plane status LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "xfs_growfs /dev/sda" \ --upload ${BUILD_DIR}/apex-puppet-tripleo.tar.gz:/etc/puppet/modules \ @@ -62,6 +63,22 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_DIR}/vsperf.tar.gz:/var/opt \ --run-command "cd /var/opt && tar xzf vsperf.tar.gz" \ --run-command "sed -i -E 's/timeout=[0-9]+/timeout=60/g' /usr/share/openstack-puppet/modules/rabbitmq/lib/puppet/provider/rabbitmqctl.rb" \ + --install patch \ + --upload ${BUILD_ROOT}/patches/neutron_lib_dps.patch:/usr/lib/python2.7/site-packages/ \ + --upload ${BUILD_ROOT}/patches/neutron_server_dps.patch:/usr/lib/python2.7/site-packages/ \ + --upload ${BUILD_ROOT}/patches/neutron_openstacksdk_dps.patch:/usr/lib/python2.7/site-packages/ \ + --upload ${BUILD_ROOT}/patches/neutron_openstackclient_dps.patch:/usr/lib/python2.7/site-packages/ \ + -a overcloud-full_build.qcow2 + +# apply neutron port data plane status patches +# https://specs.openstack.org/openstack/neutron-specs/specs/backlog/ocata/port-data-plane-status.html +# Requirement from Doctor project +# TODO(cgoncalves): code merged in Pike dev cycle. drop from >= OpenStack Pike / > OPNFV Euphrates +LIBGUESTFS_BACKEND=direct virt-customize \ + --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron_lib_dps.patch " \ + --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron_server_dps.patch" \ + --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron_openstacksdk_dps.patch" \ + --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron_openstackclient_dps.patch" \ -a overcloud-full_build.qcow2 # Arch dependent on x86 -- cgit 1.2.3-korg