Merge branch 'stable-2.8' into stable-2.9
[ganeti-local] / src / Ganeti / Types.hs
index 1826075..70de831 100644 (file)
@@ -234,38 +234,41 @@ $(THH.makeJSONInstance ''VerifyOptionalChecks)
 
 -- | Cluster verify error codes.
 $(THH.declareSADT "CVErrorCode"
-  [ ("CvECLUSTERCFG",           'C.cvEclustercfgCode)
-  , ("CvECLUSTERCERT",          'C.cvEclustercertCode)
-  , ("CvECLUSTERFILECHECK",     'C.cvEclusterfilecheckCode)
-  , ("CvECLUSTERDANGLINGNODES", 'C.cvEclusterdanglingnodesCode)
-  , ("CvECLUSTERDANGLINGINST",  'C.cvEclusterdanglinginstCode)
-  , ("CvEINSTANCEBADNODE",      'C.cvEinstancebadnodeCode)
-  , ("CvEINSTANCEDOWN",         'C.cvEinstancedownCode)
-  , ("CvEINSTANCELAYOUT",       'C.cvEinstancelayoutCode)
-  , ("CvEINSTANCEMISSINGDISK",  'C.cvEinstancemissingdiskCode)
-  , ("CvEINSTANCEFAULTYDISK",   'C.cvEinstancefaultydiskCode)
-  , ("CvEINSTANCEWRONGNODE",    'C.cvEinstancewrongnodeCode)
-  , ("CvEINSTANCESPLITGROUPS",  'C.cvEinstancesplitgroupsCode)
-  , ("CvEINSTANCEPOLICY",       'C.cvEinstancepolicyCode)
-  , ("CvENODEDRBD",             'C.cvEnodedrbdCode)
-  , ("CvENODEDRBDHELPER",       'C.cvEnodedrbdhelperCode)
-  , ("CvENODEFILECHECK",        'C.cvEnodefilecheckCode)
-  , ("CvENODEHOOKS",            'C.cvEnodehooksCode)
-  , ("CvENODEHV",               'C.cvEnodehvCode)
-  , ("CvENODELVM",              'C.cvEnodelvmCode)
-  , ("CvENODEN1",               'C.cvEnoden1Code)
-  , ("CvENODENET",              'C.cvEnodenetCode)
-  , ("CvENODEOS",               'C.cvEnodeosCode)
-  , ("CvENODEORPHANINSTANCE",   'C.cvEnodeorphaninstanceCode)
-  , ("CvENODEORPHANLV",         'C.cvEnodeorphanlvCode)
-  , ("CvENODERPC",              'C.cvEnoderpcCode)
-  , ("CvENODESSH",              'C.cvEnodesshCode)
-  , ("CvENODEVERSION",          'C.cvEnodeversionCode)
-  , ("CvENODESETUP",            'C.cvEnodesetupCode)
-  , ("CvENODETIME",             'C.cvEnodetimeCode)
-  , ("CvENODEOOBPATH",          'C.cvEnodeoobpathCode)
-  , ("CvENODEUSERSCRIPTS",      'C.cvEnodeuserscriptsCode)
-  , ("CvENODEFILESTORAGEPATHS", 'C.cvEnodefilestoragepathsCode)
+  [ ("CvECLUSTERCFG",                  'C.cvEclustercfgCode)
+  , ("CvECLUSTERCERT",                 'C.cvEclustercertCode)
+  , ("CvECLUSTERFILECHECK",            'C.cvEclusterfilecheckCode)
+  , ("CvECLUSTERDANGLINGNODES",        'C.cvEclusterdanglingnodesCode)
+  , ("CvECLUSTERDANGLINGINST",         'C.cvEclusterdanglinginstCode)
+  , ("CvEINSTANCEBADNODE",             'C.cvEinstancebadnodeCode)
+  , ("CvEINSTANCEDOWN",                'C.cvEinstancedownCode)
+  , ("CvEINSTANCELAYOUT",              'C.cvEinstancelayoutCode)
+  , ("CvEINSTANCEMISSINGDISK",         'C.cvEinstancemissingdiskCode)
+  , ("CvEINSTANCEFAULTYDISK",          'C.cvEinstancefaultydiskCode)
+  , ("CvEINSTANCEWRONGNODE",           'C.cvEinstancewrongnodeCode)
+  , ("CvEINSTANCESPLITGROUPS",         'C.cvEinstancesplitgroupsCode)
+  , ("CvEINSTANCEPOLICY",              'C.cvEinstancepolicyCode)
+  , ("CvENODEDRBD",                    'C.cvEnodedrbdCode)
+  , ("CvENODEDRBDHELPER",              'C.cvEnodedrbdhelperCode)
+  , ("CvENODEFILECHECK",               'C.cvEnodefilecheckCode)
+  , ("CvENODEHOOKS",                   'C.cvEnodehooksCode)
+  , ("CvENODEHV",                      'C.cvEnodehvCode)
+  , ("CvENODELVM",                     'C.cvEnodelvmCode)
+  , ("CvENODEN1",                      'C.cvEnoden1Code)
+  , ("CvENODENET",                     'C.cvEnodenetCode)
+  , ("CvENODEOS",                      'C.cvEnodeosCode)
+  , ("CvENODEORPHANINSTANCE",          'C.cvEnodeorphaninstanceCode)
+  , ("CvENODEORPHANLV",                'C.cvEnodeorphanlvCode)
+  , ("CvENODERPC",                     'C.cvEnoderpcCode)
+  , ("CvENODESSH",                     'C.cvEnodesshCode)
+  , ("CvENODEVERSION",                 'C.cvEnodeversionCode)
+  , ("CvENODESETUP",                   'C.cvEnodesetupCode)
+  , ("CvENODETIME",                    'C.cvEnodetimeCode)
+  , ("CvENODEOOBPATH",                 'C.cvEnodeoobpathCode)
+  , ("CvENODEUSERSCRIPTS",             'C.cvEnodeuserscriptsCode)
+  , ("CvENODEFILESTORAGEPATHS",        'C.cvEnodefilestoragepathsCode)
+  , ("CvENODEFILESTORAGEPATHUNUSABLE", 'C.cvEnodefilestoragepathunusableCode)
+  , ("CvENODESHAREDFILESTORAGEPATHUNUSABLE",
+     'C.cvEnodesharedfilestoragepathunusableCode)
   ])
 $(THH.makeJSONInstance ''CVErrorCode)