Revision 8472a321 Ganeti/HTools/CLI.hs

b/Ganeti/HTools/CLI.hs
98 98
-- | External tool data loader from a variety of sources
99 99
loadExternalData :: (EToolOptions a) =>
100 100
                    a
101
                 -> IO (NodeList, InstanceList, String, NameList, NameList)
101
                 -> IO (NodeList, InstanceList, String)
102 102
loadExternalData opts = do
103 103
  (env_node, env_inst) <- parseEnv ()
104 104
  let nodef = if nodeSet opts then nodeFile opts
......
111 111
        host -> Rapi.loadData host
112 112

  
113 113
  let ldresult = input_data >>= Loader.mergeData
114
  (loaded_nl, il, csf, ktn, kti) <-
114
  (loaded_nl, il, csf) <-
115 115
      (case ldresult of
116 116
         Ok x -> return x
117 117
         Bad s -> do
......
124 124
         putStrLn "Warning: cluster has inconsistent data:"
125 125
         putStrLn . unlines . map (\s -> printf "  - %s" s) $ fix_msgs
126 126

  
127
  return (fixed_nl, il, csf, ktn, kti)
127
  return (fixed_nl, il, csf)

Also available in: Unified diff