From 783bead17dbff69b3f07fc99bafb784987b59d94 Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Thu, 23 Mar 2017 09:43:18 -0400
Subject: FDIO package version pinning

We are seeing some instability in latest FDIO packages, so pinning
them for now.

Change-Id: Iaf851bfe2f8c8ba9fe0e2da6979e61f71abeccbe
Signed-off-by: Feng Pan <fpan@redhat.com>
(cherry picked from commit 5f50df9743156ea805256e2f65815ed0075881f6)
---
 lib/overcloud-deploy-functions.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index de7263f3..8362964d 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -214,14 +214,14 @@ EOI
   fi
 
   # Override any previous packages if FDIO and ODL L2
-  if [[ "${deploy_options_array['vpp']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['sdn_l3']}" == "False" ]]; then
-    ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
-         LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight vpp vpp-api-python vpp-lib vpp-plugins honeycomb" \
-                                                  --run-command "yum -y install /root/fdio_l2/*.rpm" \
-                                                  --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \
-                                                  -a overcloud-full.qcow2
-EOI
-  fi
+  #if [[ "${deploy_options_array['vpp']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['sdn_l3']}" == "False" ]]; then
+  #  ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+  #       LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight vpp vpp-api-python vpp-lib vpp-plugins honeycomb" \
+  #                                                --run-command "yum -y install /root/fdio_l2/*.rpm" \
+  #                                                --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \
+  #                                                -a overcloud-full.qcow2
+#EOI
+  #fi
 
   # check if ceph should be enabled
   if [ "${deploy_options_array['ceph']}" == 'True' ]; then
-- 
cgit 1.2.3-korg