Revision cdbab531

b/htools/Ganeti/HTools/Loader.hs
285 285
      lkp_unknown = filter (not . goodLookupResult) (selinst_lkp ++ exinst_lkp)
286 286
      selinst_names = map lrContent selinst_lkp
287 287
      exinst_names = map lrContent exinst_lkp
288
      il4 = Container.map (filterExTags allextags .
289
                           updateMovable selinst_names exinst_names) il3
290
      nl2 = foldl' fixNodes nl (Container.elems il4)
291
      nl3 = Container.map (`Node.buildPeers` il4) nl2
292 288
      node_names = map Node.name (Container.elems nl)
293 289
      common_suffix = longestDomain (node_names ++ inst_names)
294
      snl = Container.map (computeAlias common_suffix) nl3
295
      sil = Container.map (computeAlias common_suffix) il4
290
      il4 = Container.map (computeAlias common_suffix .
291
                           filterExTags allextags .
292
                           updateMovable selinst_names exinst_names) il3
293
      nl2 = foldl' fixNodes nl (Container.elems il4)
294
      nl3 = Container.map (computeAlias common_suffix .
295
                           (`Node.buildPeers` il4)) nl2
296 296
  in if' (null lkp_unknown)
297
         (Ok cdata { cdNodes = snl, cdInstances = sil })
297
         (Ok cdata { cdNodes = nl3, cdInstances = il4 })
298 298
         (Bad $ "Unknown instance(s): " ++ show(map lrContent lkp_unknown))
299 299

  
300 300
-- | Checks the cluster data for consistency.

Also available in: Unified diff