Add Gluster type to the node storage reporting set

This patch, adds the 'gluster' storage type to the set of storage types
for which full node storage reporting is available. This set is used by
the 'LUNodeQueryStorage' logical unit for getting information on storage
units on node(s).
Signed-off-by: Dimitris Bliablias <bl.dimitris@gmail.com>
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

lib/client/gnt_node.py

@@ -90,6 +90,7 @@ _USER_STORAGE_TYPE = {
   constants.ST_LVM_PV: "lvm-pv",
   constants.ST_LVM_VG: "lvm-vg",
   constants.ST_SHARED_FILE: "sharedfile",
+  constants.ST_GLUSTER: "gluster",
   }
 
 _STORAGE_TYPE_OPT = \

lib/cmdlib/node.py

@@ -1147,13 +1147,9 @@ def _GetStorageTypeArgs(cfg, storage_type):
   if storage_type == constants.ST_FILE:
     return [[cfg.GetFileStorageDir()]]
   elif storage_type == constants.ST_SHARED_FILE:
-    dts = cfg.GetClusterInfo().enabled_disk_templates
-    paths = []
-    if constants.DT_SHARED_FILE in dts:
-      paths.append(cfg.GetSharedFileStorageDir())
-    if constants.DT_GLUSTER in dts:
-      paths.append(cfg.GetGlusterStorageDir())
-    return [paths]
+    return [[cfg.GetSharedFileStorageDir()]]
+  elif storage_type == constants.ST_GLUSTER:
+    return [[cfg.GetGlusterStorageDir()]]
   else:
     return []
 

lib/storage/container.py

@@ -471,6 +471,7 @@ _STORAGE_TYPES = {
   constants.ST_LVM_PV: LvmPvStorage,
   constants.ST_LVM_VG: LvmVgStorage,
   constants.ST_SHARED_FILE: FileStorage,
+  constants.ST_GLUSTER: FileStorage,
   }
 
 

man/gnt-node.rst

@@ -451,7 +451,7 @@ parsing by scripts. In both cases, the ``--units`` option can be
 used to enforce a given output unit.
 
 The ``--storage-type`` option can be used to choose a storage unit
-type. Possible choices are lvm-pv, lvm-vg or file.
+type. Possible choices are lvm-pv, lvm-vg, file, sharedfile and gluster.
 
 The ``-o (--output)`` option takes a comma-separated list of output
 fields. The available fields and their meaning are:

src/Ganeti/Constants.hs

@@ -737,7 +737,9 @@ stsReport = ConstantUtils.mkSet [stFile, stLvmPv, stLvmVg]
 -- | (as used by LUQueryNodeStorage)
 stsReportNodeStorage :: FrozenSet String
 stsReportNodeStorage = ConstantUtils.union stsReport $
-                                           ConstantUtils.mkSet [stSharedFile]
+                                           ConstantUtils.mkSet [ stSharedFile
+                                                               , stGluster
+                                                               ]
 
 -- * Storage fields
 -- ** First two are valid in LU context only, not passed to backend