summaryrefslogtreecommitdiffstats
path: root/src/sbin/bcfg2-server
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-01-12 03:00:27 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-01-12 03:00:27 +0000
commit8b0877e06b6e1ecae768a5bd552cb7fbc0cedee1 (patch)
treeb6acda0c10b7a4681cd3d9a3c0291b54c2affe27 /src/sbin/bcfg2-server
parentdf00a6dab51f7a61059b367b935017a194afa73d (diff)
downloadbcfg2-8b0877e06b6e1ecae768a5bd552cb7fbc0cedee1.tar.gz
bcfg2-8b0877e06b6e1ecae768a5bd552cb7fbc0cedee1.tar.bz2
bcfg2-8b0877e06b6e1ecae768a5bd552cb7fbc0cedee1.zip
Plugin configuration change: all plugins now need to be specified in the plugins line in bcfg2.conf (no more structures, generators, or connectors lines)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5014 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin/bcfg2-server')
-rwxr-xr-xsrc/sbin/bcfg2-server6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index 5d0b9d6bb..98274be4a 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -33,8 +33,7 @@ class Bcfg2Serv(Bcfg2.Component.Component):
def __init__(self, setup):
try:
- self.Core = Core(setup['repo'], setup['plugins'], setup['structures'],
- setup['generators'], setup['connectors'],
+ self.Core = Core(setup['repo'], setup['plugins'],
setup['password'],
setup['svn'], setup['encoding'], setup['filemonitor'])
except CoreInitError, msg:
@@ -200,8 +199,6 @@ if __name__ == '__main__':
OPTINFO.update({'repo': Bcfg2.Options.SERVER_REPOSITORY,
'svn': Bcfg2.Options.SERVER_SVN,
'plugins': Bcfg2.Options.SERVER_PLUGINS,
- 'structures': Bcfg2.Options.SERVER_STRUCTURES,
- 'generators': Bcfg2.Options.SERVER_GENERATORS,
'password': Bcfg2.Options.SERVER_PASSWORD,
'filemonitor': Bcfg2.Options.SERVER_FILEMONITOR,
})
@@ -211,7 +208,6 @@ if __name__ == '__main__':
'static' : Bcfg2.Options.SERVER_STATIC,
'encoding' : Bcfg2.Options.ENCODING,
'filelog' : Bcfg2.Options.LOGGING_FILE_PATH,
- 'connectors': Bcfg2.Options.SERVER_MCONNECT,
})