summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Admin
diff options
context:
space:
mode:
authorJames Yang <jjyang@mcs.anl.gov>2009-07-07 16:47:53 +0000
committerJames Yang <jjyang@mcs.anl.gov>2009-07-07 16:47:53 +0000
commit429fae8a7c1fa9d56c1f7eca163ef5a7b9eae92b (patch)
tree231064b0805f68bc6db95d2ac20b441cb88a6e00 /src/lib/Server/Admin
parent476cb9ac769b3cb43f7da80933d6ea6126aed1dc (diff)
downloadbcfg2-429fae8a7c1fa9d56c1f7eca163ef5a7b9eae92b.tar.gz
bcfg2-429fae8a7c1fa9d56c1f7eca163ef5a7b9eae92b.tar.bz2
bcfg2-429fae8a7c1fa9d56c1f7eca163ef5a7b9eae92b.zip
Made fixes to Metadata, Client, and Init, and added methods for bcfg2-admin group and bundle.x
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5312 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Admin')
-rw-r--r--src/lib/Server/Admin/Client.py1
-rw-r--r--src/lib/Server/Admin/Init.py8
2 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/Server/Admin/Client.py b/src/lib/Server/Admin/Client.py
index db2e02761..11853f7a2 100644
--- a/src/lib/Server/Admin/Client.py
+++ b/src/lib/Server/Admin/Client.py
@@ -1,3 +1,4 @@
+import lxml.etree
import Bcfg2.Server.Admin
from Bcfg2.Server.Plugins.Metadata import MetadataConsistencyError
diff --git a/src/lib/Server/Admin/Init.py b/src/lib/Server/Admin/Init.py
index 0930fa1f3..0ad36b5d3 100644
--- a/src/lib/Server/Admin/Init.py
+++ b/src/lib/Server/Admin/Init.py
@@ -214,6 +214,12 @@ class Init(Bcfg2.Server.Admin.Mode):
continue
for plugin in plugins:
- getattr(getattr(getattr(Bcfg2.Server.Plugins, plugin), plugin), 'init_repo')(repo)
+ if plugin = 'Metadata':
+ Bcfg2.Server.Plugins.Metadata.Metadata.init_repo(repo, groups, os_selection, clients)
+ else:
+ try:
+ getattr(getattr(getattr(Bcfg2.Server.Plugins, plugin), plugin), 'init_repo')(repo)
+ except:
+ print 'Plugin setup for %s failed. Check that dependencies are installed?' % plugin
print "Repository created successfuly in %s" % (self.repopath)