diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-29 11:37:31 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-03-29 21:11:13 +0000 |
| commit | 1a667b0f76e3c281946d22a8a8b951498be23872 (patch) | |
| tree | bea05ce8ee2f6a92de2c5f79c52dc16229a51469 /lib/overcloud-deploy-functions.sh | |
| parent | 8d22b800fe8d26748abc35f59c034936624a29b3 (diff) | |
Pins ODL L3 VPP/HC packages
JIRA: APEX-421
Change-Id: I18a1624af96be772820938e3138666c51b10301c
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 621bfd97aa74877177039ada39c0c8f9578a0220)
Diffstat (limited to 'lib/overcloud-deploy-functions.sh')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 37e8229b..e7abdd03 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -264,12 +264,20 @@ EOI fi # Override ODL if FDIO and ODL L2 - if [[ "${deploy_options_array['vpp']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['sdn_l3']}" == "False" ]]; then - ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI + if [[ "${deploy_options_array['vpp']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]]; then + if [ "${deploy_options_array['sdn_l3']}" == "False" ]; 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/fdio_l2/opendaylight*.rpm" \ -a overcloud-full.qcow2 EOI + else + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI + LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum remove -y vpp vpp-api-python vpp-lib vpp-plugins honeycomb" \ + --run-command "yum -y install /root/fdio_l3/*.rpm" \ + -a overcloud-full.qcow2 +EOI + fi fi # check if ceph should be enabled |