Removes the 'sharedfile' storage type

Since storage type are supposed to represent the underlying technology
of disk templates, the storage type 'sharedfile' is superfluous, because
technically both disk templates 'file' and 'sharedfile' use the file system.
This will be of use when implementing the storage space reporting for
all disk templates.

Signed-off-by: Helga Velroyen <helgav@google.com>
Reviewed-by: Michele Tartara <mtarara@google.com>

diff --git a/lib/constants.py b/lib/constants.py
index 70a9b62..c8427dd 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -380,7 +380,6 @@ ST_FILE = "file"
 ST_LVM_PV = "lvm-pv"
 ST_LVM_VG = "lvm-vg"
 ST_RADOS = "rados"
-ST_SHARED_FILE = "sharedfile"
 
 VALID_STORAGE_TYPES = compat.UniqueFrozenset([
   ST_BLOCK,
@@ -390,7 +389,6 @@ VALID_STORAGE_TYPES = compat.UniqueFrozenset([
   ST_LVM_PV,
   ST_LVM_VG,
   ST_RADOS,
-  ST_SHARED_FILE,
   ])
 
 # Storage fields
@@ -482,7 +480,7 @@ DISK_TEMPLATES_STORAGE_TYPE = {
   DT_FILE: ST_FILE,
   DT_PLAIN: ST_LVM_VG,
   DT_RBD: ST_RADOS,
-  DT_SHARED_FILE: ST_SHARED_FILE,
+  DT_SHARED_FILE: ST_FILE,
   }
 
 # the set of network-mirrored disk templates

diff --git a/src/Ganeti/Types.hs b/src/Ganeti/Types.hs
index 810049a..ae40295 100644 (file)
--- a/src/Ganeti/Types.hs
+++ b/src/Ganeti/Types.hs
@@ -303,7 +303,6 @@ $(THH.declareSADT "StorageType"
   , ("StorageLvmPv", 'C.stLvmPv)
   , ("StorageLvmVg", 'C.stLvmVg)
   , ("StorageDiskless", 'C.stDiskless)
-  , ("StorageSharedFile", 'C.stSharedFile)
   , ("StorageBlock", 'C.stBlock)
   , ("StorageRados", 'C.stRados)
   , ("StorageExt", 'C.stExt)