From 88127c47a0daaaff30cd6a969ac887022775992a Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Wed, 12 Dec 2012 04:20:01 +0100
Subject: [PATCH] Fix disk_template OpInstSetParams parameter
This is not a required field, but rather an optional one; we add a new
parameter and use it instead.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>
---
htools/Ganeti/OpCodes.hs | 2 +-
htools/Ganeti/OpParams.hs | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/htools/Ganeti/OpCodes.hs b/htools/Ganeti/OpCodes.hs
index f0ffd00f3..157ba8381 100644
--- a/htools/Ganeti/OpCodes.hs
+++ b/htools/Ganeti/OpCodes.hs
@@ -383,7 +383,7 @@ $(genOpCode "OpCode"
, pInstBeParams
, pRuntimeMem
, pInstHvParams
- , pDiskTemplate
+ , pOptDiskTemplate
, pRemoteNode
, pOsNameChange
, pInstOsParams
diff --git a/htools/Ganeti/OpParams.hs b/htools/Ganeti/OpParams.hs
index acb47ba60..f5f8c1354 100644
--- a/htools/Ganeti/OpParams.hs
+++ b/htools/Ganeti/OpParams.hs
@@ -97,6 +97,7 @@ module Ganeti.OpParams
, pAllowRuntimeChgs
, pInstDisks
, pDiskTemplate
+ , pOptDiskTemplate
, pFileDriver
, pFileStorageDir
, pVgName
@@ -732,6 +733,13 @@ pInstDisks = renameField "instDisks" $ simpleField "disks" [t| [IDiskParams] |]
pDiskTemplate :: Field
pDiskTemplate = simpleField "disk_template" [t| DiskTemplate |]
+-- | Instance disk template.
+pOptDiskTemplate :: Field
+pOptDiskTemplate =
+ optionalField .
+ renameField "OptDiskTemplate" $
+ simpleField "disk_template" [t| DiskTemplate |]
+
-- | File driver.
pFileDriver :: Field
pFileDriver = optionalField $ simpleField "file_driver" [t| FileDriver |]
--
GitLab