Commit 57ccc712 authored by Jose A. Lopes's avatar Jose A. Lopes

Move metadata daemon to its own directory

Currently, the metadata daemon is mainly a web server.  However, a new
configuration server will be introduced along with other metadata
related modules.  Therefore, this patch moves the current metadata
daemon web server to its own directory.  This module is also renamed
from 'Server' to 'WebServer'.
Signed-off-by: default avatarJose A. Lopes <jabolopes@google.com>
Reviewed-by: default avatarHrvoje Ribicic <riba@google.com>
parent a1d7c167
......@@ -129,6 +129,7 @@ HS_DIRS = \
src/Ganeti/Locking \
src/Ganeti/Logging \
src/Ganeti/Monitoring \
src/Ganeti/Metad \
src/Ganeti/Objects \
src/Ganeti/Query \
src/Ganeti/Storage \
......@@ -772,8 +773,8 @@ HS_LIB_SRCS = \
src/Ganeti/Logging.hs \
src/Ganeti/Logging/Lifted.hs \
src/Ganeti/Luxi.hs \
src/Ganeti/Metad/WebServer.hs \
src/Ganeti/Monitoring/Server.hs \
src/Ganeti/Metad.hs \
src/Ganeti/Network.hs \
src/Ganeti/Objects.hs \
src/Ganeti/Objects/Lens.hs \
......
......@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-}
module Ganeti.Metad (start) where
module Ganeti.Metad.WebServer (start) where
import Control.Applicative
import Control.Monad.IO.Class (liftIO)
......
......@@ -28,7 +28,7 @@ module Main (main) where
import qualified Ganeti.Constants as Constants
import Ganeti.Daemon (OptType)
import qualified Ganeti.Daemon as Daemon
import qualified Ganeti.Metad as Metad
import qualified Ganeti.Metad.WebServer as WebServer
import qualified Ganeti.Runtime as Runtime
options :: [OptType]
......@@ -45,4 +45,4 @@ main =
Daemon.genericMain Runtime.GanetiMetad options
(\_ -> return . Right $ ())
(\_ _ -> return ())
(\opts _ _ -> Metad.start opts)
(\opts _ _ -> WebServer.start opts)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment