Include VCS version in `gnt-cluster version`

[ganeti-local] / src / Ganeti / Query / Server.hs

diff --git a/src/Ganeti/Query/Server.hs b/src/Ganeti/Query/Server.hs
index 6d4dd3c..ef2f6b5 100644 (file)
--- a/src/Ganeti/Query/Server.hs
+++ b/src/Ganeti/Query/Server.hs
@@ -96,6 +96,7 @@ handleCall cdata QueryClusterInfo =
             , ("config_version", showJSON C.configVersion)
             , ("os_api_version", showJSON $ maximum C.osApiVersions)
             , ("export_version", showJSON C.exportVersion)
+            , ("vcs_version", showJSON C.vcsVersion)
             , ("architecture", showJSON arch_tuple)
             , ("name", showJSON $ clusterClusterName cluster)
             , ("master", showJSON $ clusterMasterNode cluster)
@@ -239,17 +240,17 @@ listener creader socket = do
 -- | Type alias for prepMain results
 type PrepResult = (FilePath, S.Socket, IORef (Result ConfigData))
 
--- | Check function for queryd.
+-- | Check function for luxid.
 checkMain :: CheckFn ()
 checkMain _ = return $ Right ()
 
--- | Prepare function for queryd.
+-- | Prepare function for luxid.
 prepMain :: PrepFn () PrepResult
 prepMain _ _ = do
   socket_path <- Path.defaultQuerySocket
   cleanupSocket socket_path
   s <- describeError "binding to the Luxi socket"
-         Nothing (Just socket_path) $ getServer socket_path
+         Nothing (Just socket_path) $ getServer True socket_path
   cref <- newIORef (Bad "Configuration not yet loaded")
   return (socket_path, s, cref)