diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-06-10 02:19:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-10 02:19:02 +0000 |
| commit | 5d889e95dbcab85e6d073b7b6d29e3ea5b47f87d (patch) | |
| tree | a037df4d8de8d97e87a8df06bcfc03734c64896f /ci | |
| parent | 8d51e6f2214efbfb618b70d34b5814f2143983e7 (diff) | |
| parent | 88e800cde8e61acb05b60bff5997cb843ec6e133 (diff) | |
Merge "Parameterizes ODL version to deploy options"
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 11 |
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 |