Revision a69ff623

b/htools/Ganeti/HTools/CLI.hs
8 8

  
9 9
{-
10 10

  
11
Copyright (C) 2009, 2010 Google Inc.
11
Copyright (C) 2009, 2010, 2011 Google Inc.
12 12

  
13 13
This program is free software; you can redistribute it and/or modify
14 14
it under the terms of the GNU General Public License as published by
......
82 82
import Text.Printf (printf)
83 83

  
84 84
import qualified Ganeti.HTools.Version as Version(version)
85
import qualified Ganeti.Constants as C
85 86
import Ganeti.HTools.Types
86 87
import Ganeti.HTools.Utils
87 88

  
88 89
-- | The default value for the luxi socket
89 90
defaultLuxiSocket :: FilePath
90
defaultLuxiSocket = "/var/run/ganeti/socket/ganeti-master"
91
defaultLuxiSocket = C.masterSocket
91 92

  
92 93
-- | Command line options structure.
93 94
data Options = Options
b/htools/Ganeti/HTools/Rapi.hs
47 47
import qualified Ganeti.HTools.Group as Group
48 48
import qualified Ganeti.HTools.Node as Node
49 49
import qualified Ganeti.HTools.Instance as Instance
50
import qualified Ganeti.Constants as C
50 51

  
51 52
-- | Read an URL via curl and return the body if successful.
52 53
getUrl :: (Monad m) => String -> IO (m String)
......
76 77
formatHost :: String -> String
77 78
formatHost master =
78 79
    if ':' `elem` master then  master
79
    else "https://" ++ master ++ ":5080"
80
    else "https://" ++ master ++ ":" ++ show C.defaultRapiPort
80 81

  
81 82
-- | Parse a instance list in JSON format.
82 83
getInstances :: NameAssoc

Also available in: Unified diff