Merge branch 'stable-2.9' into stable-2.10

[ganeti-local] / src / Ganeti / Constants.hs

diff --git a/src/Ganeti/Constants.hs b/src/Ganeti/Constants.hs
index a66c30d..4b4db3a 100644 (file)
--- a/src/Ganeti/Constants.hs
+++ b/src/Ganeti/Constants.hs
@@ -950,6 +950,9 @@ fdBlktap = Types.fileDriverToRaw FileBlktap
 fdLoop :: String
 fdLoop = Types.fileDriverToRaw FileLoop
 
+fdDefault :: String
+fdDefault = fdLoop
+
 fileDriver :: FrozenSet String
 fileDriver =
   ConstantUtils.mkSet $
@@ -2312,6 +2315,15 @@ idiskParamsTypes =
 idiskParams :: FrozenSet String
 idiskParams = ConstantUtils.mkSet (Map.keys idiskParamsTypes)
 
+modifiableIdiskParamsTypes :: Map String VType
+modifiableIdiskParamsTypes =
+  Map.fromList [(idiskMode, VTypeString),
+                (idiskName, VTypeString)]
+
+modifiableIdiskParams :: FrozenSet String
+modifiableIdiskParams =
+  ConstantUtils.mkSet (Map.keys modifiableIdiskParamsTypes)
+
 -- * inic* constants are used in opcodes, to create/change nics
 
 inicBridge :: String
@@ -4313,6 +4325,9 @@ uuidRegex = "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$"
 
 -- * Luxi constants
 
+luxiSocketPerms :: Int
+luxiSocketPerms = 0o660
+
 luxiKeyMethod :: String
 luxiKeyMethod = "method"