Alon Bar-Lev has posted comments on this change.
Change subject: packaging: Move defaults out of service script
......................................................................
Patch Set 1: (2 inline comments)
....................................................
File packaging/fedora/engine-service.py
Line 111:
Line 112:
Line 113: def loadConfig():
Line 114: # Load the defaults:
Line 115: engineDefaultsFile =
"/usr/share/ovirt-engine/conf/engine.conf.defaults"
This also need to be environment, as /etc/ovirt-engine.
Line 116: if not os.path.exists(engineDefaultsFile):
Line 117: raise Exception("The engine configuration defaults file
\"%s\" doesn't exist." % engineDefaultsFile)
Line 118: global engineConfig
Line 119: engineConfig = Config(engineDefaultsFile)
Line 122: engineConfigFile = os.getenv("ENGINE_VARS",
"/etc/sysconfig/ovirt-engine")
Line 123: if not os.path.exists(engineConfigFile):
Line 124: raise Exception("The engine configuration file \"%s\" doesn't
exist." % engineConfigFile)
Line 125: engineConfigOverrides = Config(engineConfigFile)
Line 126: engineConfig.merge(engineConfigOverrides)
I think that the above should be in the constructor...
The Config constructor should be able to get array of files to merge...
engineConfig = Config([engineDefaultsFile, engineConfigFile])
Line 127:
Line 128: # Get the id of the engine user:
Line 129: global engineUser
Line 130: global engineUid
--
To view, visit http://gerrit.ovirt.org/7387
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I062bb033bf20db9a0d68b8286151345a3653cb03
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <[email protected]>
Gerrit-Reviewer: Alex Lourie <[email protected]>
Gerrit-Reviewer: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Moran Goldboim <[email protected]>
Gerrit-Reviewer: oVirt Jenkins CI Server
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
