Revision 5ce621ab
b/src/Ganeti/OpCodes.hs | ||
---|---|---|
232 | 232 |
, pUseExternalMipScript |
233 | 233 |
, pEnabledDiskTemplates |
234 | 234 |
, pModifyEtcHosts |
235 |
, pGlobalFileStorageDir
|
|
236 |
, pGlobalSharedFileStorageDir
|
|
235 |
, pClusterFileStorageDir
|
|
236 |
, pClusterSharedFileStorageDir
|
|
237 | 237 |
], |
238 | 238 |
[]) |
239 | 239 |
, ("OpClusterRedistConf", |
b/src/Ganeti/OpParams.hs | ||
---|---|---|
100 | 100 |
, pOptDiskTemplate |
101 | 101 |
, pFileDriver |
102 | 102 |
, pFileStorageDir |
103 |
, pGlobalFileStorageDir
|
|
104 |
, pGlobalSharedFileStorageDir
|
|
103 |
, pClusterFileStorageDir
|
|
104 |
, pClusterSharedFileStorageDir
|
|
105 | 105 |
, pVgName |
106 | 106 |
, pEnabledHypervisors |
107 | 107 |
, pHypervisor |
... | ... | |
541 | 541 |
withDoc "Set disk states" . |
542 | 542 |
optionalField $ simpleField "disk_state" [t| JSObject JSValue |] |
543 | 543 |
|
544 |
-- | Global directory for storing file-backed disks. |
|
545 |
pGlobalFileStorageDir :: Field |
|
546 |
pGlobalFileStorageDir = optionalNEStringField "file_storage_dir" |
|
547 |
|
|
548 |
-- | Global directory for storing shared-file-backed disks. |
|
549 |
pGlobalSharedFileStorageDir :: Field |
|
550 |
pGlobalSharedFileStorageDir = optionalNEStringField "shared_file_storage_dir" |
|
544 |
-- | Cluster-wide default directory for storing file-backed disks. |
|
545 |
pClusterFileStorageDir :: Field |
|
546 |
pClusterFileStorageDir = |
|
547 |
renameField "ClusterFileStorageDir" $ |
|
548 |
optionalStringField "file_storage_dir" |
|
549 |
|
|
550 |
-- | Cluster-wide default directory for storing shared-file-backed disks. |
|
551 |
pClusterSharedFileStorageDir :: Field |
|
552 |
pClusterSharedFileStorageDir = |
|
553 |
renameField "ClusterSharedFileStorageDir" $ |
|
554 |
optionalStringField "shared_file_storage_dir" |
|
551 | 555 |
|
552 | 556 |
-- | Volume group name. |
553 | 557 |
pVgName :: Field |
b/test/hs/Test/Ganeti/OpCodes.hs | ||
---|---|---|
177 | 177 |
emptyMUD <*> emptyMUD <*> arbitrary <*> |
178 | 178 |
arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> |
179 | 179 |
arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> |
180 |
genMaybe (genName >>= mkNonEmpty) <*>
|
|
181 |
genMaybe (genName >>= mkNonEmpty)
|
|
180 |
genMaybe genName <*>
|
|
181 |
genMaybe genName
|
|
182 | 182 |
"OP_CLUSTER_REDIST_CONF" -> pure OpCodes.OpClusterRedistConf |
183 | 183 |
"OP_CLUSTER_ACTIVATE_MASTER_IP" -> |
184 | 184 |
pure OpCodes.OpClusterActivateMasterIp |
Also available in: Unified diff