From 0a78a0e5da0e9db70188340d7d3ffa283bfe7b6b Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Fri, 26 May 2017 14:39:02 -0400
Subject: Update puppet-opendaylight git repo url

puppet-opendaylight moved from github to opendaylight.org, updating
url for git clone.

JIRA: APEX-455

Change-Id: I8e4a919d9c8b3dedb62c12135cc1b2741413bc34
Signed-off-by: Feng Pan <fpan@redhat.com>
---
 lib/overcloud-deploy-functions.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'lib')

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 990a05f6..0ed91ef7 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -271,6 +271,15 @@ 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
-- 
cgit 1.2.3-korg