diff options
| author |   Feng Pan <fpan@redhat.com> | 2016-12-01 19:49:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-01 19:49:37 +0000 |
| commit | bdc8b51164dff9f47be11bbd7a5cbf9789068489 (patch) | |
| tree | 5d1556122fa9ce6f602f30b688143c908faaa6c0 /lib | |
| parent | 20986cfd6a55a98e3e9994aeaca7c5390463c4b3 (diff) | |
| parent | 20accc70e41ac4a533fe65868438bd099196f492 (diff) | |
Merge "Updates FD.IO ODL scenarios to use Carbon ODL version" into stable/colorado
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index f23390b7..54a1b3ee 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -130,12 +130,26 @@ EOI fi # Set ODL version accordingly - if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['odl_version']}" == 'boron' ]]; then - ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI - LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight" \ - --run-command "yum -y install /root/boron/*" \ - -a overcloud-full.qcow2 + if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && -n "${deploy_options_array['odl_version']}" ]]; then + case "${deploy_options_array['odl_version']}" in + boron) odl_version='boron' + ;; + cabron) odl_version='master' + ;; + beryllium) odl_version='' + ;; + *) echo -e "${red}Invalid ODL version ${deploy_options_array['odl_version']}. Please use 'carbon' or 'boron' values.${reset}" + exit 1 + ;; + esac + + if [ -n "$odl_version" ]; then + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<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 fi # Add performance deploy options if they have been set |