From fc13f72801b95cf5707554088c8c81c557cda2be Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Wed, 31 May 2017 12:04:43 -0400
Subject: Updates ODL source for netvirt+vpp

Change-Id: I7ffb445ba44bfc904240658b0c3a137b44af28e8
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit f88bfbcb62c2a8b3de12a325482146d1118b39f7)
---
 lib/overcloud-deploy-functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/overcloud-deploy-functions.sh')

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 0ed91ef7..445f5fb5 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -285,8 +285,8 @@ EOI
   # Override ODL if we enable netvirt for fdio
   if [[ "${deploy_options_array['odl_vpp_netvirt']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]]; then
     ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
-      LIBGUESTFS_BACKEND=direct virt-customize --run-command "rm -rf /opt/opendaylight/*" \
-                                               --run-command "tar zxvf /root/odl-netvirt-vpp-distribution.tar.gz -C /opt/opendaylight/" \
+      LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight" \
+                                               --run-command "yum -y install /root/opendaylight-7.0.0-0.1.20170531snap665.el7.noarch.rpm" \
                                                -a overcloud-full.qcow2
 EOI
   fi
-- 
cgit 1.2.3-korg