# parse PLC_FLAVOUR_VIRT_MAP
known_virts=['vs','lxc']
default_virt='vs'
- def virt_from_virt_map (self, fcdistro):
+ def virt_from_virt_map (self, node_fcdistro):
map={}
try:
assigns=[x.strip() for x in self.api.config.PLC_FLAVOUR_VIRT_MAP.split(';')]
(self.api.config.PLC_FLAVOUR_VIRT_MAP,GetNodeFlavour.default_virt)
traceback.print_exc()
return GetNodeFlavour.default_virt
- if fcdistro in map: return map[fcdistro]
+# print 'virt_from_virt_map, using map',map
+ if node_fcdistro in map: return map[node_fcdistro]
if 'default' in map: return map['default']
return GetNodeFlavour.default_virt
virt = GetNodeVirt (self.api,self.caller).call(auth, node_id)
if not virt:
virt = self.virt_from_virt_map (fcdistro)
- SetNodeVirt (self.api, self.caller).call (auth, node_id, virt)
+ # do not save in node - if a node was e.g. f14 and it gets set to f16
+ # we do not want to have to re-set virt
+ # SetNodeVirt (self.api, self.caller).call (auth, node_id, virt)
# xxx could use some sanity checking, and could provide fallbacks
return {