Re: [PATCH master 30/52] Read the disk templates part of the ipolicy

2012-01-11 Thread René Nussbaumer 
On Mon, Jan 9, 2012 at 11:58, Iustin Pop  wrote:
> The default value is badly defined (hardcoded defaults)…
> ---
>  htools/Ganeti/HTools/Types.hs |    6 ++
>  1 files changed, 6 insertions(+), 0 deletions(-)

LGTM.

René

[PATCH master 30/52] Read the disk templates part of the ipolicy

2012-01-09 Thread Iustin Pop 
The default value is badly defined (hardcoded defaults)…
---
 htools/Ganeti/HTools/Types.hs |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/htools/Ganeti/HTools/Types.hs b/htools/Ganeti/HTools/Types.hs
index 57bc3d8..946a25b 100644
--- a/htools/Ganeti/HTools/Types.hs
+++ b/htools/Ganeti/HTools/Types.hs
@@ -197,6 +197,8 @@ $(THH.buildObject "IPolicy" "iPolicy"
   [ THH.renameField "StdSpec" $ THH.simpleField "std" [t| ISpec |]
   , THH.renameField "MinSpec" $ THH.simpleField "min" [t| ISpec |]
   , THH.renameField "MaxSpec" $ THH.simpleField "max" [t| ISpec |]
+  , THH.renameField "DiskTemplates" $
+  THH.simpleField "disk_templates" [t| [DiskTemplate] |]
   ])
 
 -- | Converts an ISpec type to a RSpec one.
@@ -211,6 +213,10 @@ defIPolicy :: IPolicy
 defIPolicy = IPolicy { iPolicyStdSpec = defStdISpec
  , iPolicyMinSpec = defMinISpec
  , iPolicyMaxSpec = defMaxISpec
+ -- hardcoding here since Constants.hs exports the
+ -- string values, not the actual type; and in
+ -- htools, we are mostly looking at DRBD
+ , iPolicyDiskTemplates = [DTDrbd8, DTPlain]
  }
 
 -- | The dynamic resource specs of a machine (i.e. load or load
-- 
1.7.3.1