diff options
| author |   Ricardo Noriega <rnoriega@redhat.com> | 2018-04-18 09:50:50 -0400 |
|---|---|---|
| committer | Ricardo Noriega <rnoriega@redhat.com> | 2018-04-24 14:32:01 +0200 |
| commit | f8fd162ac74c83cd972311ee152b09bad6312999 (patch) | |
| tree | bd95df492973983e7df74a90301b919e70927b8b /build/overcloud-full.sh | |
| parent | 870c66456c3e4d600a880df5b3612e5002fd9922 (diff) | |
Fixing os-odl-sfc scenario
We need to build again OVS2.6 and apply yyang
patches.
apex-tripleo-heat-templates: I230b31dc9ed0ecc5046064628ba2f2505e589522
apex-puppet-tripleo: Icd433ddc6ae7de19a09f9e33b410a362c317138a
Change-Id: Ia61216f6bd23ecaaa87b151452268c8ca04dc193
Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
Diffstat (limited to 'build/overcloud-full.sh')
| -rwxr-xr-x | build/overcloud-full.sh | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 4740066f..d4fef46c 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -69,6 +69,7 @@ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \ --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" \ + --run-command "cd /usr/share/openstack-puppet/modules/neutron && patch -p1 < puppet-neutron-add-sfc.patch" \ --install openstack-utils \ -a overcloud-full_build.qcow2 # --upload ${BUILD_ROOT}/patches/puppet-neutron-add-external_network_bridge-option.patch:/usr/share/openstack-puppet/modules/neutron/ \ @@ -154,6 +155,32 @@ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \ # upload and install barometer packages barometer_pkgs overcloud-full_build.qcow2 + # Build OVS with NS + rm -rf ovs_nsh_patches + rm -rf ovs + git clone https://github.com/yyang13/ovs_nsh_patches.git + git clone https://github.com/openvswitch/ovs.git + pushd ovs > /dev/null + git checkout v2.6.1 + cp ../ovs_nsh_patches/v2.6.1_centos7/*.patch ./ + # Hack for build servers that have no git config + git config user.email "apex@opnfv.com" + git config user.name "apex" + git am *.patch + popd > /dev/null + tar czf ovs.tar.gz ovs + +LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \ + --upload ${BUILD_ROOT}/CentOS-Updates.repo:/etc/yum.repos.d/ \ + --run-command "yum -y install kernel-devel-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \ + --run-command "yum -y install kernel-headers-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \ + --run-command "yum -y install kernel-tools-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \ + --upload ${BUILD_ROOT}/build_ovs_nsh.sh:/root/ \ + --upload ovs.tar.gz:/root/ \ + --run-command "cd /root/ && tar xzf ovs.tar.gz" \ + --run-command "cd /root/ovs && /root/build_ovs_nsh.sh" \ + -a overcloud-full_build.qcow2 + fi # end x86_64 specific items mv -f overcloud-full_build.qcow2 overcloud-full.qcow2 |