diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-05-26 12:56:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-26 12:56:45 +0000 |
| commit | a1387030f8c54b441fad620712d119359d0e6e24 (patch) | |
| tree | d6cfb49ecefe8f0f54b09b973196716b5c908d67 /lib/overcloud-deploy-functions.sh | |
| parent | 8a973df23bf27f14c601100b63fa9f8ccbee0b76 (diff) | |
| parent | 07138cf271898c9c172469b79547b894a5b60b0f (diff) | |
Merge "Update puppet-opendaylight git repo url"
Diffstat (limited to 'lib/overcloud-deploy-functions.sh')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 9 |
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 |