Revision c09359ee src/Ganeti/HTools/Backend/Text.hs

b/src/Ganeti/HTools/Backend/Text.hs
34 34
  , loadISpec
35 35
  , loadMultipleMinMaxISpecs
36 36
  , loadIPolicy
37
  , serializeInstance
37 38
  , serializeInstances
38 39
  , serializeNode
39 40
  , serializeNodes
......
248 249
  disk_template <- annotateResult ("Instance " ++ name)
249 250
                   (diskTemplateFromRaw dt)
250 251
  spindle_use <- tryRead name su
251
  when (sidx == pidx) . fail $ "Instance " ++ name ++
252
           " has same primary and secondary node - " ++ pnode
253 252
  let vtags = commaSplit tags
254 253
      newinst = Instance.create name vmem vdsk [vdsk] vvcpus vstatus vtags
255 254
                auto_balance pidx sidx disk_template spindle_use []
255
  when (Instance.hasSecondary newinst && sidx == pidx) . fail $
256
    "Instance " ++ name ++ " has same primary and secondary node - " ++ pnode
256 257
  return (name, newinst)
257 258

  
258 259
loadInst ktn [ name, mem, dsk, vcpus, status, auto_bal, pnode, snode

Also available in: Unified diff