Revision 7dd14211 htools/Ganeti/HTools/Text.hs
b/htools/Ganeti/HTools/Text.hs | ||
---|---|---|
95 | 95 |
in |
96 | 96 |
printf "%s|%d|%d|%d|%s|%s|%s|%s|%s|%s" |
97 | 97 |
iname (Instance.mem inst) (Instance.dsk inst) |
98 |
(Instance.vcpus inst) (Instance.runSt inst)
|
|
98 |
(Instance.vcpus inst) (instanceStatusToRaw (Instance.runSt inst))
|
|
99 | 99 |
(if Instance.autoBalance inst then "Y" else "N") |
100 | 100 |
pnode snode (diskTemplateToRaw (Instance.diskTemplate inst)) |
101 | 101 |
(intercalate "," (Instance.tags inst)) |
... | ... | |
162 | 162 |
vmem <- tryRead name mem |
163 | 163 |
vdsk <- tryRead name dsk |
164 | 164 |
vvcpus <- tryRead name vcpus |
165 |
vstatus <- instanceStatusFromRaw status |
|
165 | 166 |
auto_balance <- case auto_bal of |
166 | 167 |
"Y" -> return True |
167 | 168 |
"N" -> return False |
... | ... | |
172 | 173 |
when (sidx == pidx) $ fail $ "Instance " ++ name ++ |
173 | 174 |
" has same primary and secondary node - " ++ pnode |
174 | 175 |
let vtags = sepSplit ',' tags |
175 |
newinst = Instance.create name vmem vdsk vvcpus status vtags |
|
176 |
newinst = Instance.create name vmem vdsk vvcpus vstatus vtags
|
|
176 | 177 |
auto_balance pidx sidx disk_template |
177 | 178 |
return (name, newinst) |
178 | 179 |
loadInst _ s = fail $ "Invalid/incomplete instance data: '" ++ show s ++ "'" |
Also available in: Unified diff