summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-05-26 22:12:04 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-26 22:12:04 +0000
commitadf74f577852779302ed77b1d45584af9830c1e2 (patch)
tree129bb7d488826c78c4f6cc9c095dcdcd65717e47 /lib
parent05ab832380db398a79bbc9b7bc28993175178346 (diff)
parent0a78a0e5da0e9db70188340d7d3ffa283bfe7b6b (diff)
Merge "Update puppet-opendaylight git repo url" into stable/danube
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 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