summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-10-03 09:50:09 -0400
committerFeng Pan <fpan@redhat.com>2017-10-04 02:43:04 +0000
commit43f65e19443168ea7ab1d372902318c0129d6306 (patch)
tree858dc229819e4186b3d6d7f28f4b87c715eaae13
parent15208f52f1c9dbea048cd363e0caae3a8e95d954 (diff)
Install honeycomb and vpp in a single step
We currently install Honeycomb and VPP in 2 steps, this could potentially cause version conflicts. Change-Id: I1e54a576bced07f5115b12fef3bbdf2e95e9ab90 Signed-off-by: Feng Pan <fpan@redhat.com> (cherry picked from commit e915d21073b5b780f9abfc7ab50d6fede6b1d93a)
-rwxr-xr-xbuild/overcloud-full.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index f59dff0..4f4e9bf 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -139,8 +139,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
$vpp_nosdn_pkg_str \
--run-command "mkdir /root/fdio" \
--upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/nosdn_vpp_rpms \
- --install honeycomb \
- --install vpp-plugins,vpp,vpp-lib,vpp-api-python \
+ --install honeycomb,vpp-plugins,vpp,vpp-lib,vpp-api-python \
--run-command "rm -f /etc/sysctl.d/80-vpp.conf" \
--run-command "curl -f https://copr.fedorainfracloud.org/coprs/leifmadsen/ovs-master/repo/epel-7/leifmadsen-ovs-master-epel-7.repo > /etc/yum.repos.d/leifmadsen-ovs-master-epel-7.repo" \
--run-command "mkdir /root/ovs28" \