X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nm.py;fp=nm.py;h=e9ca6d6f7e0905fa8e58605c0043eba03bd15b98;hb=343fa4d2fc581c04aa7018f8e6aa2664091e22c8;hp=744ba76d978629d9e95789afe85c8500d141fd4c;hpb=2b9bd0e45ba529a3e83fcc0a1f676eadee4a700e;p=nodemanager.git diff --git a/nm.py b/nm.py index 744ba76..e9ca6d6 100755 --- a/nm.py +++ b/nm.py @@ -56,13 +56,14 @@ def GetSlivers(plc, config): logger.log("Syncing w/ PLC") data = plc.GetSlivers() getPLCDefaults(data, config) + if (options.verbose): logger.log_slivers(data) except: logger.log_exc() # XXX So some modules can at least boostrap. + logger.log("nm: Can't contact PLC to GetSlivers(). Continuing.") data = {} - if (options.verbose): - logger.log_slivers(data) - # Set i2 ip list for nodes in I2 nodegroup. + # Set i2 ip list for nodes in I2 nodegroup + # and init network interfaces (unless overridden) try: net.GetSlivers(plc, data, config) # TODO - num of args needs to be unified across mods. except: logger.log_exc() # All other callback modules