X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Fsteps%2FGetAndUpdateNodeDetails.py;fp=source%2Fsteps%2FGetAndUpdateNodeDetails.py;h=9f66bc7ca4e808880b15f3377eebd6a3a1ba59fc;hb=a52fb5e71120bbecbf8580acdc9496fc6c4c7b2b;hp=f38423943aa7b1b8e48b3a4d46cd4fe49d2d81d9;hpb=7b5214d6358e7aa2599abf78e455dcd0cd96cf96;p=bootmanager.git diff --git a/source/steps/GetAndUpdateNodeDetails.py b/source/steps/GetAndUpdateNodeDetails.py index f384239..9f66bc7 100644 --- a/source/steps/GetAndUpdateNodeDetails.py +++ b/source/steps/GetAndUpdateNodeDetails.py @@ -118,14 +118,18 @@ def Run( vars, log ): for line in lines: log.write(line) raise BootManagerException ("Could not call GetNodeFlavour - need PLCAPI-5.2") - # 'vs' or 'lxc' - vars['virt'] = node_flavour['virt'] - # the basename for downloading nodeimage - vars['nodefamily'] = node_flavour['nodefamily'] - # extensions to be applied on top of the base nodeimage - vars['extensions'] = node_flavour ['extensions'] - # false if compressed image, true if not - vars['plain'] = node_flavour ['plain'] + flavour_keys = [ + 'virt',# 'vs' or 'lxc' + 'nodefamily',# the basename for downloading nodeimage + 'extensions',# extensions to be applied on top of the base nodeimage + 'plain'# false if compressed image, true if not + ] + + for k in flavour_keys: + # Support MyPLC <5.2 + if (not vars.has_key(k)): + vars['virt'] = node_flavour['virt'] + log.write ("NodeFlavour as returned from PLC: %s\n"%node_flavour) return 1