Skip to content
Snippets Groups Projects
Commit d0de443e authored by Helga Velroyen's avatar Helga Velroyen
Browse files

Add 'enabled_storage_types' to the cluster config


This patch adds the cluster's new field 'enabled_storage_types'
to the configuration objects in python and haskell.

Signed-off-by: default avatarHelga Velroyen <helgav@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent 33c730a2
No related branches found
No related tags found
No related merge requests found
...@@ -1474,6 +1474,7 @@ class Cluster(TaggableObject): ...@@ -1474,6 +1474,7 @@ class Cluster(TaggableObject):
"prealloc_wipe_disks", "prealloc_wipe_disks",
"hv_state_static", "hv_state_static",
"disk_state_static", "disk_state_static",
"enabled_storage_types",
] + _TIMESTAMPS + _UUID ] + _TIMESTAMPS + _UUID
def UpgradeConfig(self): def UpgradeConfig(self):
......
...@@ -681,6 +681,7 @@ $(buildObject "Cluster" "cluster" $ ...@@ -681,6 +681,7 @@ $(buildObject "Cluster" "cluster" $
, simpleField "primary_ip_family" [t| IpFamily |] , simpleField "primary_ip_family" [t| IpFamily |]
, simpleField "prealloc_wipe_disks" [t| Bool |] , simpleField "prealloc_wipe_disks" [t| Bool |]
, simpleField "ipolicy" [t| FilledIPolicy |] , simpleField "ipolicy" [t| FilledIPolicy |]
, simpleField "enabled_storage_types" [t| [StorageType] |]
] ]
++ timeStampFields ++ timeStampFields
++ uuidFields ++ uuidFields
......
...@@ -302,6 +302,11 @@ $(THH.declareSADT "StorageType" ...@@ -302,6 +302,11 @@ $(THH.declareSADT "StorageType"
[ ("StorageFile", 'C.stFile) [ ("StorageFile", 'C.stFile)
, ("StorageLvmPv", 'C.stLvmPv) , ("StorageLvmPv", 'C.stLvmPv)
, ("StorageLvmVg", 'C.stLvmVg) , ("StorageLvmVg", 'C.stLvmVg)
, ("StorageDiskless", 'C.stDiskless)
, ("StorageSharedFile", 'C.stSharedFile)
, ("StorageBlock", 'C.stBlock)
, ("StorageRados", 'C.stRados)
, ("StorageExt", 'C.stExt)
]) ])
$(THH.makeJSONInstance ''StorageType) $(THH.makeJSONInstance ''StorageType)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment