openstack
/
os-net-config
Code Issues Proposed changes

Merge "Avoid openvswitch restarts during re-run"

This commit is contained in:
Zuul 2020-07-23 23:31:49 +00:00 committed by Gerrit Code Review
parent 869d3c13e8 4c95f7d087
commit c7073fb13f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os_net_config/cli.py
View File

@ -320,9 +320,15 @@ def main(argv=sys.argv):
pf_files_changed = provider.apply(cleanup=opts.cleanup,
activate=not opts.no_activate)
if not opts.noop:
restart_ovs = bool(sriovpf_member_of_bond_ovs_port_list)
# Avoid ovs restart for os-net-config re-runs, which will
# dirupt the offload configuration
if os.path.exists(utils._SRIOV_CONFIG_SERVICE_FILE):
restart_ovs = False
utils.configure_sriov_pfs(
execution_from_cli=True,
restart_openvswitch=bool(sriovpf_member_of_bond_ovs_port_list))
restart_openvswitch=restart_ovs)
for iface_json in iface_array:
# All objects other than the sriov_pf will be added here.