Revision b9666288 src/Ganeti/Config.hs

b/src/Ganeti/Config.hs
60 60
import qualified Text.JSON as J
61 61

  
62 62
import Ganeti.BasicTypes
63
import qualified Ganeti.ConstantUtils as C
64 63
import qualified Ganeti.Constants as C
65 64
import Ganeti.Errors
66 65
import Ganeti.JSON
......
243 242

  
244 243
-- | Retrieves the instance hypervisor params, missing values filled with
245 244
-- cluster defaults.
246
getFilledInstHvParams :: ConfigData -> Instance -> HvParams
247
getFilledInstHvParams cfg inst =
245
getFilledInstHvParams :: [String] -> ConfigData -> Instance -> HvParams
246
getFilledInstHvParams globals cfg inst =
248 247
  -- First get the defaults of the parent
249 248
  let hvName = hypervisorToRaw . instHypervisor $ inst
250 249
      hvParamMap = fromContainer . clusterHvparams $ configCluster cfg
......
257 256
  -- Then the child
258 257
      childHvParams = fromContainer . instHvparams $ inst
259 258
  -- Helper function
260
      fillFn con val = fillDict con val $ C.toList C.hvcGlobals
259
      fillFn con val = fillDict con val globals
261 260
  in GenericContainer $ fillFn (fillFn parentHvParams osHvParams) childHvParams
262 261

  
263 262
-- | Retrieves the instance backend params, missing values filled with cluster

Also available in: Unified diff