2
0
mirror of https://github.com/xcat2/confluent.git synced 2026-09-21 16:39:32 +00:00

Accept lastchance in every network manager

The retry pass calls apply_configuration with lastchance=True, which only
NetworkManager accepts. It is unreachable today, since only NetworkManager
returns the 1 that fills the retry list, but it springs the moment either of
the others grows a return, or the retry selection is brought in line with the
first pass. Matching the signatures costs nothing.
This commit is contained in:
Markus Hilger
2026-08-10 04:39:28 +02:00
parent e1071317ed
commit 461385522c
2 changed files with 4 additions and 4 deletions
@@ -159,7 +159,7 @@ class NetplanManager(object):
currinfo[devname]['routes'] = routeinfo
currcfg[devname] = currinfo[devname]
def apply_configuration(self, cfg):
def apply_configuration(self, cfg, lastchance=False):
devnames = cfg['interfaces']
if len(devnames) > 1:
teammode = cfg['settings'].get('team_mode', None)
@@ -342,7 +342,7 @@ class WickedManager(object):
v = v.strip()
currcfg[k] = v
def apply_configuration(self, cfg):
def apply_configuration(self, cfg, lastchance=False):
stgs = cfg['settings']
ipcfg = 'STARTMODE=auto\n'
routecfg = ''
@@ -151,7 +151,7 @@ class NetplanManager(object):
nicinfo[devname]['routes'] = routeinfo
self.cfgbydev[devname] = nicinfo[devname]
def apply_configuration(self, cfg):
def apply_configuration(self, cfg, lastchance=False):
devnames = cfg['interfaces']
if len(devnames) != 1:
raise Exception('Multi-nic team/bonds not yet supported')
@@ -266,7 +266,7 @@ class WickedManager(object):
v = v.strip()
currcfg[k] = v
def apply_configuration(self, cfg):
def apply_configuration(self, cfg, lastchance=False):
stgs = cfg['settings']
ipcfg = 'STARTMODE=auto\n'
routecfg = ''