Revision 5cbf7832 src/Ganeti/OpParams.hs
b/src/Ganeti/OpParams.hs | ||
---|---|---|
52 | 52 |
, pTagsName |
53 | 53 |
, pOutputFields |
54 | 54 |
, pShutdownTimeout |
55 |
, pShutdownTimeout' |
|
55 | 56 |
, pShutdownInstance |
56 | 57 |
, pForce |
57 | 58 |
, pIgnoreOfflineNodes |
... | ... | |
572 | 573 |
pEnabledHypervisors = |
573 | 574 |
withDoc "List of enabled hypervisors" . |
574 | 575 |
optionalField $ |
575 |
simpleField "enabled_hypervisors" [t| Hypervisor |]
|
|
576 |
simpleField "enabled_hypervisors" [t| [Hypervisor] |]
|
|
576 | 577 |
|
577 | 578 |
pClusterHvParams :: Field |
578 | 579 |
pClusterHvParams = |
... | ... | |
616 | 617 |
pUidPool = |
617 | 618 |
withDoc "Set UID pool, must be list of lists describing UID ranges\ |
618 | 619 |
\ (two items, start and end inclusive)" . |
619 |
optionalField $ simpleField "uid_pool" [t| [[(Int, Int)]] |]
|
|
620 |
optionalField $ simpleField "uid_pool" [t| [(Int, Int)] |]
|
|
620 | 621 |
|
621 | 622 |
pAddUids :: Field |
622 | 623 |
pAddUids = |
623 | 624 |
withDoc "Extend UID pool, must be list of lists describing UID\ |
624 | 625 |
\ ranges (two items, start and end inclusive)" . |
625 |
optionalField $ simpleField "add_uids" [t| [[(Int, Int)]] |]
|
|
626 |
optionalField $ simpleField "add_uids" [t| [(Int, Int)] |]
|
|
626 | 627 |
|
627 | 628 |
pRemoveUids :: Field |
628 | 629 |
pRemoveUids = |
629 | 630 |
withDoc "Shrink UID pool, must be list of lists describing UID\ |
630 | 631 |
\ ranges (two items, start and end inclusive) to be removed" . |
631 |
optionalField $ simpleField "remove_uids" [t| [[(Int, Int)]] |]
|
|
632 |
optionalField $ simpleField "remove_uids" [t| [(Int, Int)] |]
|
|
632 | 633 |
|
633 | 634 |
pMaintainNodeHealth :: Field |
634 | 635 |
pMaintainNodeHealth = |
... | ... | |
704 | 705 |
pEnabledDiskTemplates = |
705 | 706 |
withDoc "List of enabled disk templates" . |
706 | 707 |
optionalField $ |
707 |
simpleField "enabled_disk_templates" [t| DiskTemplate |]
|
|
708 |
simpleField "enabled_disk_templates" [t| [DiskTemplate] |]
|
|
708 | 709 |
|
709 | 710 |
pQueryWhat :: Field |
710 | 711 |
pQueryWhat = |
... | ... | |
796 | 797 |
|
797 | 798 |
pPrimaryIp :: Field |
798 | 799 |
pPrimaryIp = |
799 |
withDoc "Primary IP address" $ |
|
800 |
withDoc "Primary IP address" . |
|
801 |
optionalField $ |
|
800 | 802 |
simpleField "primary_ip" [t| NonEmptyString |] |
801 | 803 |
|
802 | 804 |
pSecondaryIp :: Field |
... | ... | |
979 | 981 |
|
980 | 982 |
pDiskTemplate :: Field |
981 | 983 |
pDiskTemplate = |
982 |
withDoc "List of instance disks" $
|
|
984 |
withDoc "Disk template" $
|
|
983 | 985 |
simpleField "disk_template" [t| DiskTemplate |] |
984 | 986 |
|
985 | 987 |
pFileDriver :: Field |
... | ... | |
1151 | 1153 |
defaultField [| forceNonNeg C.defaultShutdownTimeout |] $ |
1152 | 1154 |
simpleField "shutdown_timeout" [t| NonNegative Int |] |
1153 | 1155 |
|
1156 |
-- | Another name for the shutdown timeout, because we like to be |
|
1157 |
-- inconsistent. |
|
1158 |
pShutdownTimeout' :: Field |
|
1159 |
pShutdownTimeout' = |
|
1160 |
withDoc "How long to wait for instance to shut down" . |
|
1161 |
renameField "InstShutdownTimeout" . |
|
1162 |
defaultField [| forceNonNeg C.defaultShutdownTimeout |] $ |
|
1163 |
simpleField "timeout" [t| NonNegative Int |] |
|
1164 |
|
|
1154 | 1165 |
pIgnoreFailures :: Field |
1155 | 1166 |
pIgnoreFailures = |
1156 | 1167 |
withDoc "Whether to ignore failures during removal" $ |
... | ... | |
1373 | 1384 |
pTagsName = |
1374 | 1385 |
withDoc "Name of object" . |
1375 | 1386 |
renameField "TagsGetName" . |
1376 |
optionalField $ simpleField "name" [t| NonEmptyString |]
|
|
1387 |
optionalField $ simpleField "name" [t| String |] |
|
1377 | 1388 |
|
1378 | 1389 |
pTagsList :: Field |
1379 | 1390 |
pTagsList = |
Also available in: Unified diff