diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-08-15 03:30:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-15 03:30:58 +0000 |
| commit | 16821de4807132ab784926e21059d793e36667ce (patch) | |
| tree | fdb33606710601efaeabcb59dd6f52062ce035e4 /lib/overcloud-deploy-functions.sh | |
| parent | 12e2bf17f56d7a83b2779468e543857550f9f68a (diff) | |
| parent | 7d9495aec0340d743bf0e59db5b7360bef013004 (diff) | |
Merge "Fixes OpenDaylight version"
Diffstat (limited to 'lib/overcloud-deploy-functions.sh')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 0fe838d0..9c9ea188 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -281,7 +281,9 @@ EOI case "${deploy_options_array['odl_version']}" in carbon) odl_version='' ;; - *) echo -e "${red}Invalid ODL version ${deploy_options_array['odl_version']}. Please use 'carbon'.${reset}" + nitrogen) odl_version='nitrogen' + ;; + *) echo -e "${red}Invalid ODL version ${deploy_options_array['odl_version']}. Please use 'carbon' or 'nitrogen'.${reset}" exit 1 ;; esac @@ -290,18 +292,11 @@ EOI ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight" \ --run-command "yum -y install /root/${odl_version}/*" \ + --run-command "rm -rf /etc/puppet/modules/opendaylight" \ + --run-command "cd /etc/puppet/modules/ && tar xzf /root/puppet-opendaylight-master.tar.gz" \ -a overcloud-full.qcow2 EOI fi - - # Overwrite puppet-opendaylight with carbon. By default we install boron branch. - if [ "${deploy_options_array['odl_version']}" == 'carbon' ]; then - ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI - LIBGUESTFS_BACKEND=direct virt-customize --run-command "rm -rf /etc/puppet/modules/opendaylight" \ - --run-command "cd /etc/puppet/modules/ && tar xzf /root/puppet-opendaylight-carbon.tar.gz" \ - -a overcloud-full.qcow2 -EOI - fi fi # Override ODL for fdio scenarios |