Revision 94e05c32 Ganeti/HTools/ExtLoader.hs

b/Ganeti/HTools/ExtLoader.hs
83 83 

  		





  84
  84
  
    
-- | External tool data loader from a variety of sources.


  		





  85
  85
  
    
loadExternalData :: Options


  		





  86
  
  
    
                 -> IO (Node.List, Instance.List, String)


  		





  
  86
  
    
                 -> IO (Node.List, Instance.List, [String], String)


  		





  87
  87
  
    
loadExternalData opts = do


  		





  88
  88
  
    
  (env_node, env_inst) <- parseEnv ()


  		





  89
  89
  
    
  let nodef = if optNodeSet opts then optNodeFile opts


  		





  ......




  131
  131
  
    
          | otherwise -> wrapIO $ Text.loadData nodef instf


  		





  132
  132
  
    

  		





  133
  133
  
    
  let ldresult = input_data >>= Loader.mergeData util_data' exTags


  		





  134
  
  
    
  (loaded_nl, il, csf) <-


  		





  
  134
  
    
  (loaded_nl, il, tags, csf) <-


  		





  135
  135
  
    
      (case ldresult of


  		





  136
  136
  
    
         Ok x -> return x


  		





  137
  137
  
    
         Bad s -> do


  		





  ......




  144
  144
  
    
         hPutStrLn stderr "Warning: cluster has inconsistent data:"


  		





  145
  145
  
    
         hPutStrLn stderr . unlines . map (printf "  - %s") $ fix_msgs


  		





  146
  146
  
    

  		





  147
  
  
    
  return (fixed_nl, il, csf)


  		





  
  147
  
    
  return (fixed_nl, il, tags, csf)


  		












Also available in:
  Unified diff