Revision 17e7af2b Ganeti/HTools/Text.hs

b/Ganeti/HTools/Text.hs
60 60 
-- | Load an instance from a field list.
61 61 
loadInst :: (Monad m) =>
62 62 
            [(String, Ndx)] -> [String] -> m (String, Instance.Instance)
63 
loadInst ktn [name, mem, dsk, vcpus, status, pnode, snode] = do
63 
loadInst ktn [name, mem, dsk, vcpus, status, pnode, snode, tags] = do
64 64 
  pidx <- lookupNode ktn name pnode
65 65 
  sidx <- (if null snode then return Node.noSecondary
66 66 
           else lookupNode ktn name snode)
......
69 69 
  vvcpus <- tryRead name vcpus
70 70 
  when (sidx == pidx) $ fail $ "Instance " ++ name ++
71 71 
           " has same primary and secondary node - " ++ pnode
72 
  let newinst = Instance.create name vmem vdsk vvcpus status pidx sidx
72 
  let vtags = sepSplit ',' tags
73 
      newinst = Instance.create name vmem vdsk vvcpus status vtags pidx sidx
73 74 
  return (name, newinst)
74 75 
loadInst _ s = fail $ "Invalid/incomplete instance data: '" ++ show s ++ "'"
75 76 

  		












Also available in:
  Unified diff