Revision ec629280 htools/Ganeti/HTools/Text.hs
b/htools/Ganeti/HTools/Text.hs | ||
---|---|---|
107 | 107 |
(Instance.vcpus inst) (instanceStatusToRaw (Instance.runSt inst)) |
108 | 108 |
(if Instance.autoBalance inst then "Y" else "N") |
109 | 109 |
pnode snode (diskTemplateToRaw (Instance.diskTemplate inst)) |
110 |
(intercalate "," (Instance.tags inst)) (Instance.spindleUsage inst)
|
|
110 |
(intercalate "," (Instance.tags inst)) (Instance.spindleUse inst) |
|
111 | 111 |
|
112 | 112 |
-- | Generate instance file data from instance objects. |
113 | 113 |
serializeInstances :: Node.List -> Instance.List -> String |
... | ... | |
223 | 223 |
"' for instance " ++ name |
224 | 224 |
disk_template <- annotateResult ("Instance " ++ name) |
225 | 225 |
(diskTemplateFromRaw dt) |
226 |
spindle_usage <- tryRead name su
|
|
226 |
spindle_use <- tryRead name su |
|
227 | 227 |
when (sidx == pidx) $ fail $ "Instance " ++ name ++ |
228 | 228 |
" has same primary and secondary node - " ++ pnode |
229 | 229 |
let vtags = commaSplit tags |
230 | 230 |
newinst = Instance.create name vmem vdsk vvcpus vstatus vtags |
231 |
auto_balance pidx sidx disk_template spindle_usage
|
|
231 |
auto_balance pidx sidx disk_template spindle_use |
|
232 | 232 |
return (name, newinst) |
233 | 233 |
|
234 | 234 |
loadInst ktn [ name, mem, dsk, vcpus, status, auto_bal, pnode, snode |
Also available in: Unified diff