diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/PR_revision.log | 3 | ||||
| -rwxr-xr-x | ci/deploy.sh | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/ci/PR_revision.log b/ci/PR_revision.log index 5fd8dad0..da13a48f 100644 --- a/ci/PR_revision.log +++ b/ci/PR_revision.log @@ -4,4 +4,5 @@ #PR number, PR Title 15,Add sleep to galera and mongodb service start 18,Fix sql race condition -21,Serialize db_sync calls and increase sql-sleep timer
\ No newline at end of file +21,Serialize db_sync calls and increase sql-sleep timer +23,Fix odl env files 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 |