summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-06-09 17:24:28 -0400
committerDan Radez <dradez@redhat.com>2016-06-10 00:05:43 +0000
commit88e800cde8e61acb05b60bff5997cb843ec6e133 (patch)
tree64fd40fae799dd7ba2473dd5de41c867054002ad /ci
parentb9947ec813fea9c71b7c3208df36d110eca90b55 (diff)
Parameterizes ODL version to deploy options
Changes include: - Minor syntax fix to dataplane check - Adds 'odl_version' to deploy options - Builds ODL overcloud image with boron rpm included - If user specifies 'boron' as odl_version then, package is upgraded on overcloud image Change-Id: I37436cb8cc4d6cff1fede6c13836f26a4cc57f49 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh11
1 files changed, 10 insertions, 1 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 8d82b423..f9a5f0c7 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -804,7 +804,7 @@ function undercloud_prep_overcloud_deploy {
fi
# Handle different dataplanes
- if [ "${deploy_options_array['dataplane']}" != 'ovs']; then
+ if [ "${deploy_options_array['dataplane']}" != 'ovs' ]; then
echo "${red}ovs is the only currently available dataplane. ${deploy_options_array['dataplane']} not implemented${reset}"
exit 1
fi
@@ -846,6 +846,15 @@ 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
+EOI
+ fi
+
# Add performance deploy options if they have been set
if [ ! -z "${deploy_options_array['performance']}" ]; then