summaryrefslogtreecommitdiffstats
path: root/lib/overcloud-deploy-functions.sh
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-11-30 21:03:33 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-30 21:03:33 +0000
commit199e92bf52cc75046eb41daa917bf91a65708c9f (patch)
tree66f941cf3da63d7b5922e910b959228f0f622d00 /lib/overcloud-deploy-functions.sh
parent71b677dcf162eb6eb22f116ee1b08714efb24db3 (diff)
parentaf3976a683b8bdfd6a16d599940c2aa8dea3a077 (diff)
Merge "Updates FD.IO ODL scenarios to use Carbon ODL version"
Diffstat (limited to 'lib/overcloud-deploy-functions.sh')
-rwxr-xr-xlib/overcloud-deploy-functions.sh14
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