Skip to content

ovs addon: fix ifreload ovs_options clear #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PavelAF wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ovs addon: fix ifreload ovs_options clear #345

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions ifupdown2/addons/openvswitch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,16 +155,6 @@ def _addbridge (self, ifaceobj):

cmd_list = []

cmd = "--may-exist add-br %s"%(iface)
if ovsparent is not None and ovsoptions:
cmd = cmd + " %s" %(ovsoptions)

cmd_list.append(cmd)

if ovsparent is None and ovsoptions:
cmd = "set bridge %s %s" %(iface, ovsoptions)
cmd_list.append(cmd)

#update
if self.cache.link_exists (iface):
# on update, delete active ports not in the new port list
Expand Down Expand Up @@ -192,6 +182,16 @@ def _addbridge (self, ifaceobj):
cmd = "--if-exists clear interface %s mtu_request external-ids other_config options"%(iface)
cmd_list.append(cmd)

cmd = "--may-exist add-br %s"%(iface)
if ovsparent is not None and ovsoptions:
cmd = cmd + " %s" %(ovsoptions)

cmd_list.append(cmd)

if ovsparent is None and ovsoptions:
cmd = "set bridge %s %s" %(iface, ovsoptions)
cmd_list.append(cmd)

if ovsextra is not None:
cmd_list.extend(ovsextra)

Expand Down