diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-11-28 15:38:50 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-12-01 09:44:02 -0500 |
| commit | 20accc70e41ac4a533fe65868438bd099196f492 (patch) | |
| tree | e271c1818515289d9d59ae50843ece8c6526b630 /lib | |
| parent | 916ff520b1626ae8cd4f93ccc55080164dcee9fa (diff) | |
Updates FD.IO ODL scenarios to use Carbon ODL version
JIRA: APEX-346
Change-Id: I9ffa32da906f50441dfc05610d0668e84c992e81
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit af3976a683b8bdfd6a16d599940c2aa8dea3a077)
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 |