summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-05-05 10:23:40 -0400
committerFeng Pan <fpan@redhat.com>2017-05-25 23:12:57 +0000
commit07138cf271898c9c172469b79547b894a5b60b0f (patch)
treead5bde602747884dc253b73600b5dbf1120a2585 /lib
parent5d52dc853acabfedf5d52130991650920832e801 (diff)
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>
Diffstat (limited to 'lib')
-rwxr-xr-xlib/overcloud-deploy-functions.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index cdf9de03..27f43a6f 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -267,6 +267,15 @@ EOI
-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
# Override ODL if we enable netvirt for fdio