From 8b0877e06b6e1ecae768a5bd552cb7fbc0cedee1 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Mon, 12 Jan 2009 03:00:27 +0000
Subject: 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
---
 src/sbin/bcfg2-info   | 15 +++++----------
 src/sbin/bcfg2-server |  6 +-----
 2 files changed, 6 insertions(+), 15 deletions(-)

(limited to 'src/sbin')

diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index cd868ef0d..a4c3be83b 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -24,12 +24,11 @@ def printTabular(rows):
 
 class infoCore(cmd.Cmd, Bcfg2.Server.Core.Core):
 
-    def __init__(self, repo, plgs, struct, gens, conn, passwd, svn,
-                 encoding, event_debug):
+    def __init__(self, repo, plgs, passwd, svn, encoding, event_debug):
         cmd.Cmd.__init__(self)
         try:
-            Bcfg2.Server.Core.Core.__init__(self, repo, plgs, struct, gens, 
-                                            conn, passwd, svn, encoding)
+            Bcfg2.Server.Core.Core.__init__(self, repo, plgs, passwd, svn,
+                                            encoding)
             if event_debug:
                 self.fam.debug = True
         except Bcfg2.Server.Core.CoreInitError, msg:
@@ -296,17 +295,13 @@ 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,
                     'event debug': Bcfg2.Options.DEBUG,
-                    'encoding': Bcfg2.Options.ENCODING,
-                    'connectors': Bcfg2.Options.SERVER_MCONNECT})
+                    'encoding': Bcfg2.Options.ENCODING})
     setup = Bcfg2.Options.OptionParser(optinfo)
     setup.parse(sys.argv[1:])
     print setup
-    loop = infoCore(setup['repo'], setup['plugins'], setup['structures'],
-                    setup['generators'], setup['connectors'],
+    loop = infoCore(setup['repo'], setup['plugins'], 
                     setup['password'], setup['svn'], setup['encoding'],
                     '-d' in sys.argv)
     if "args" in setup and setup['args']:
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, 
                     })
 
 
-- 
cgit v1.2.3-1-g7c22