mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

Merge pull request #3 in CRMC/ifupdown2 from dev to release/cl-stable

Browse Source 
* commit '1cf891d101dab5569129c7f9d61d60bc53b67ffd':
  Staging cl3u3 version for merge to stable and release
  ifupdownaddons: iproute2: warn when using keywords and better parsing vlanid in ip link show output
  addons: vrf: error on no master only when ALL interfaces are being brought up
This commit is contained in:
John Berezovik
2016-06-05 09:05:13 -07:00
parent 4280a55299 1cf891d101
commit 9ef35dcd9f
3 changed files with 68 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
addons/vrf.py
View File

@@ -365,7 +365,7 @@ class vrf(moduleBase):
master_exists = False
if master_exists:
rtnetlink_api.rtnl_api.link_set(ifacename, "up")
else:
elif ifupdownflags.flags.ALL:
self.log_error('vrf %s not around, skipping vrf config'
%(vrfname), ifaceobj)
except Exception, e: