moving OVS NSH build to x86_64 specific

Change-Id: I85ae26a26d6fb07620f5ba7419cb375e6c5fd411
Signed-off-by: Dan Radez <dradez@redhat.com>

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index f1ec865..403ab8e 100755 (executable)
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -147,28 +147,26 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --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" \
     -a overcloud-full_build.qcow2
-fi
 
     # upload and install barometer packages
-if [ "$(uname -i)" == 'x86_64' ]; then
     barometer_pkgs overcloud-full_build.qcow2
-fi
-
-# Build OVS with NSH
-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/*.patch ./
-cp ${BUILD_ROOT}/patches/ovs-fix-build-on-RHEL-7.3.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
+
+    # Build OVS with NSH
+    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/*.patch ./
+    cp ${BUILD_ROOT}/patches/ovs-fix-build-on-RHEL-7.3.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}/build_ovs_nsh.sh:/root/ \
@@ -177,5 +175,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --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
 popd > /dev/null