Revert "Reset sriov_numvfs to 0 before leapp upgrade"

This reverts commit b3ec034649.

Reason for revert: The patch was introduced as a workaround
to fix the leapp issue reproduced in v0.10.0 which throws
exception when the interface is not found. But with the
recent version of the leapp package, the issue is not
reproducible. The leapp upgrade completes succesfully
even with VFs present. Though the actual leapp commit which
fixed the issue not traced, the issue is no more present.
This workaround can be removed from TripleO, so that
nic paritioning FFU can be supported.

This revert is required for nic paritioning FFU, because
resetting the VFs will hang, when one of the VF is bound
to the vfio-pci (DPDK) driver.

Change-Id: I5ab1d2925989fc3da62e6045e56a7bd017c8ec4c
(cherry picked from commit c4d75bc147)
This commit is contained in:
Saravanan KR 2021-01-12 10:57:41 +00:00
parent 6909f9bc80
commit 81a1840330
1 changed files with 1 additions and 30 deletions

View File

@ -239,33 +239,4 @@ outputs:
- []
metadata_settings:
get_attr: [NeutronBase, role_data, metadata_settings]
upgrade_tasks:
- name: upgrade prepare for leapp to remove extra sriov vfs
tags:
- never
- system_upgrade
- system_upgrade_prepare
when:
- step|int == 3
- upgrade_leapp_enabled
block:
- name: reset all vfs as leapp will look for all interfaces on reboot
shell: |
for item in $(find /sys/class/net/ -type l); do
DEVPATH="$item/device/sriov_numvfs"
if [ -f $DEVPATH ]; then
NUM_VFS=$(cat $DEVPATH)
if [[ $NUM_VFS != 0 ]]; then
echo 0 >$DEVPATH
fi
fi
done
- name: remove sriov_config service for leapp upgrade
file:
path: "/etc/systemd/system/sriov_config.service"
state: absent
register: sriov_config_remove_result
- name: reload systemd daemon after removing sriov_config service
systemd:
daemon-reload: yes
when: sriov_config_remove_result['changed']
upgrade_tasks: []