[Pkg-ganeti-devel] [ganeti] 55/165: Add an option to query Xen-specific data

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ganeti.

commit ba04334dc284572ed59bb8d15950e890521deaa2
Author: Klaus Aehlig <aehlig at google.com>
Date:   Wed Feb 18 17:49:12 2015 +0100

    Add an option to query Xen-specific data
    
    ...when htools query the monitoring daemon at all. The
    default is not to, to be compatible with the current
    behavior.
    
    Signed-off-by: Klaus Aehlig <aehlig at google.com>
    Reviewed-by: Petr Pudlak <pudlak at google.com>
---
 src/Ganeti/HTools/CLI.hs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Ganeti/HTools/CLI.hs b/src/Ganeti/HTools/CLI.hs
index 527add0..1f16dbd 100644
--- a/src/Ganeti/HTools/CLI.hs
+++ b/src/Ganeti/HTools/CLI.hs
@@ -60,6 +60,7 @@ module Ganeti.HTools.CLI
   , oDynuFile
   , oMonD
   , oMonDDataFile
+  , oMonDXen
   , oEvacMode
   , oFirstJobGroup
   , oRestrictedMigrate
@@ -149,6 +150,8 @@ data Options = Options
   , optMonD        :: Bool           -- ^ Query MonDs
   , optMonDFile    :: Maybe FilePath -- ^ Optional file with data provided
                                      -- by MonDs
+  , optMonDXen     :: Bool           -- ^ Should Xen-specific collectors be
+                                     -- considered (only if MonD is queried)
   , optEvacMode    :: Bool           -- ^ Enable evacuation mode
   , optRestrictedMigrate :: Bool     -- ^ Disallow replace-primary moves
   , optExInst      :: [String]       -- ^ Instances to be excluded
@@ -215,6 +218,7 @@ defaultOptions  = Options
   , optDynuFile    = Nothing
   , optMonD        = False
   , optMonDFile = Nothing
+  , optMonDXen     = False
   , optEvacMode    = False
   , optRestrictedMigrate = False
   , optExInst      = []
@@ -338,6 +342,13 @@ oMonDDataFile =
    "Import data provided by MonDs from the given FILE",
    OptComplFile)
 
+oMonDXen :: OptType
+oMonDXen =
+  (Option "" ["mond-xen"]
+    (NoArg (\ opts -> Ok opts { optMonDXen = True }))
+    "also consider xen-specific collectors in MonD queries",
+    OptComplNone)
+
 oDiskTemplate :: OptType
 oDiskTemplate =
   (Option "" ["disk-template"]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git