Update puppet-opendaylight git repo url

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

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index cdf9de0..27f43a6 100755 (executable)
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -265,6 +265,15 @@ EOI
           LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight" \
                                                    --run-command "yum -y install /root/${odl_version}/*" \
                                                    -a overcloud-full.qcow2
+EOI
+    fi
+
+    # 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