Update ODL version for fdio_l2 and fdio_l3 scenarios

[apex.git] / lib / overcloud-deploy-functions.sh

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index ec53db9..ed45451 100755 (executable)
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -122,7 +122,6 @@ EOI
       ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
       LIBGUESTFS_BACKEND=direct virt-customize \
          --run-command "systemctl enable zrpcd" \
-         --run-command "systemctl enable bgpd" \
          -a overcloud-full.qcow2
 EOI
   fi
@@ -272,15 +271,33 @@ EOI
                                                --run-command "yum -y install /root/${odl_version}/*" \
                                                -a overcloud-full.qcow2
 EOI
+
+    # Overwrite puppet-opendaylight with carbon. By default we install boron branch.
+    if [ "${deploy_options_array['odl_version']}" == 'carbon' ]; then
+      ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+        LIBGUESTFS_BACKEND=direct virt-customize --run-command "rm -rf /etc/puppet/modules/opendaylight" \
+                                                 --run-command "cd /etc/puppet/modules/ && tar xzf /root/puppet-opendaylight-carbon.tar.gz" \
+                                                 -a overcloud-full.qcow2
+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 "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
+  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