From 0cd3c6cef32adb1bf9d26414ed73bd9373b0c407 Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Thu, 15 Mar 2018 19:44:39 -0400 Subject: Enable nosdn-fdio scenarios for Fraser release - Update neutron NSDriver patch - Update os-net-config to fix config errors for vpp uio-driver - Update puppet-tripleo to add configuration of physnets and type_driver in vpp agent - Update THT to change VPP environment file for vpp-agent, and add common.yaml for vpp interface mapping - Update VPP and networking-vpp version to 18.01 - Fix networking-vpp rpm build to enable proper uninstall. - Update networking settings file to use ovs_bridge as default external interface type JIRA: APEX-578 JIRA: APEX-568 JIRA: APEX-576 JIRA: APEX-577 apex-os-net-config: I915d5455acb8d496438b9c9e851639d3a43e6fa9 apex-puppet-tripleo: I472879b8f67e64b571638a0385943597a9120e6c apex-tripleo-heat-templates: I5dfaf85d67fb038109edaf5c5d8a3e901b9148f4 Change-Id: I369bee232bfafef260d2ef19ac32614fdc487271 Signed-off-by: Feng Pan --- build/overcloud-full.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build/overcloud-full.sh') diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index a4006c4a..f7d55e58 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -67,10 +67,10 @@ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \ --upload ${BUILD_ROOT}/patches/neutron_openstackclient_dps.patch:/usr/lib/python2.7/site-packages/ \ --upload ${BUILD_ROOT}/patches/puppet-neutron-add-sfc.patch:/usr/share/openstack-puppet/modules/neutron/ \ --upload ${BUILD_ROOT}/patches/congress-parallel-execution.patch:/usr/lib/python2.7/site-packages/ \ + --upload ${BUILD_ROOT}/patches/puppet-neutron-vpp-ml2-type_drivers-setting.patch:/usr/share/openstack-puppet/modules/neutron/ \ + --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-vpp-ml2-type_drivers-setting.patch" \ --install openstack-utils \ -a overcloud-full_build.qcow2 -# --upload ${BUILD_ROOT}/patches/puppet-neutron-vpp-ml2-type_drivers-setting.patch:/usr/share/openstack-puppet/modules/neutron/ \ -# --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-vpp-ml2-type_drivers-setting.patch" \ # --upload ${BUILD_ROOT}/patches/puppet-neutron-add-external_network_bridge-option.patch:/usr/share/openstack-puppet/modules/neutron/ \ # --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-add-external_network_bridge-option.patch" \ -- cgit 1.2.3-korg