From: Feng Pan <fpan@redhat.com>
Date: Wed, 12 Jul 2017 15:04:15 +0000 (-0400)
Subject: Update ODL version for fdio_l2 and fdio_l3 scenarios
X-Git-Tag: danube.3.1^0
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fstable%2Fdanube;p=apex.git

Update ODL version for fdio_l2 and fdio_l3 scenarios

Change-Id: Iaa44b21ee92f601f645e350177c6ba56c140649d
Signed-off-by: Feng Pan <fpan@redhat.com>
---

diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 3eb09865..0ba50699 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -81,6 +81,9 @@ populate_cache http://artifacts.opnfv.org/apex/danube/quagga/quagga-3.tar.gz
 # Download ODL netvirt for VPP
 populate_cache http://artifacts.opnfv.org/apex/danube/fdio_netvirt/opendaylight-7.0.0-0.1.20170531snap665.el7.noarch.rpm
 
+# Download ODL for fdio scenarios
+populate_cache http://artifacts.opnfv.org/apex/danube/fdio_odls/fdio_odl_carbon.tar.gz
+
 # install ODL packages
 # Patch in OPNFV custom puppet-tripleO
 # install Honeycomb
@@ -117,6 +120,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "sudo usermod -a -G quaggavt quagga" \
     --upload ${BUILD_ROOT}/patches/neutron-patch-NSDriver.patch:/usr/lib/python2.7/site-packages/ \
     --upload ${CACHE_DIR}/opendaylight-7.0.0-0.1.20170531snap665.el7.noarch.rpm:/root/ \
+    --upload ${CACHE_DIR}/fdio_odl_carbon.tar.gz:/root/ \
     -a overcloud-full-opendaylight_build.qcow2
 
 LIBGUESTFS_BACKEND=direct virt-sparsify --compress overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 445f5fb5..ed454514 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -282,13 +282,22 @@ EOI
     fi
   fi
 
-  # Override ODL if we enable netvirt for fdio
+  # Override ODL for fdio scenarios
   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 "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
+  elif [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['dataplane']}" == 'fdio' ]]; then
+    if [[ "${deploy_options_array['odl_vpp_routing_node']}" != 'dvr' ]]; then
+      ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+        LIBGUESTFS_BACKEND=direct virt-customize --run-command "rm -rf /opt/opendaylight/*" \
+                                                 --run-command "tar zxvf /root/fdio_odl_carbon.tar.gz -C /opt/opendaylight/ --strip-components=1" \
+                                                 --run-command "chown odl:odl -R /opt/opendaylight" \
+                                                 -a overcloud-full.qcow2
+EOI
+    fi
   fi
 
   # check if ceph should be enabled