diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2006-11-22 21:33:39 +0000 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2006-11-22 21:33:39 +0000 |
commit | 83bfca94f8d864846e22ad79a9d96bf805e1b515 (patch) | |
tree | 3cc0fa24f7d94f75e09495f1aaf54c197a801ac7 /src/lib/Server/Core.py | |
parent | c57c79a36f1e4d2b66ef7f01bc0a82ef7d5996e8 (diff) | |
download | bcfg2-83bfca94f8d864846e22ad79a9d96bf805e1b515.tar.gz bcfg2-83bfca94f8d864846e22ad79a9d96bf805e1b515.tar.bz2 bcfg2-83bfca94f8d864846e22ad79a9d96bf805e1b515.zip |
Part 1 of metadata changes
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2522 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Core.py')
-rw-r--r-- | src/lib/Server/Core.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py index 1ca4cdea1..95b9fb08e 100644 --- a/src/lib/Server/Core.py +++ b/src/lib/Server/Core.py @@ -219,19 +219,13 @@ class Core(object): except: self.svn = False - mpath = self.cfile.get('server','repository') - try: - self.metadata = Bcfg2.Server.Metadata.Metadata(self.fam, mpath) - except OSError: - raise CoreInitError, "metadata path incorrect" - self.stats = Statistics("%s/etc/statistics.xml" % (mpath)) structures = self.cfile.get('server', 'structures').split(',') generators = self.cfile.get('server', 'generators').split(',') [data.remove('') for data in [structures, generators] if '' in data] - for plugin in structures + generators: + for plugin in structures + generators + ['Metadata']: if not self.plugins.has_key(plugin): try: mod = getattr(__import__("Bcfg2.Server.Plugins.%s" % @@ -247,6 +241,7 @@ class Core(object): except: logger.error("Unexpected initiantiation failure for plugin %s" % (plugin), exc_info=1) + self.metadata = self.plugins['Metadata'] for plugin in structures: if self.plugins.has_key(plugin): self.structures.append(self.plugins[plugin]) |