diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-11-28 15:38:50 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-11-29 16:17:51 -0500 |
| commit | af3976a683b8bdfd6a16d599940c2aa8dea3a077 (patch) | |
| tree | 47e7265c735e15251d582425b98904c24a7f9eb3 /lib | |
| parent | c3d74dbf05ee8b0c161190b85eb1e238a69402a7 (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>
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 4b592b46..c8367c9f 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -128,10 +128,20 @@ EOI fi # Set ODL version accordingly - if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['odl_version']}" == 'boron' ]]; then + 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' + ;; + *) echo -e "${red}Invalid ODL version ${deploy_options_array['odl_version']}. Please use 'carbon' or 'boron' values.${reset}" + exit 1 + ;; + esac + 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/*" \ + --run-command "yum -y install /root/${odl_version}/*" \ -a overcloud-full.qcow2 EOI fi |