From cf6e7476a65122b71e071947e01dc7c268b0ea2f Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Mon, 26 Jan 2009 20:54:03 +0000 Subject: Add Version plugin type The following changes were made: * Remove VCS logic out of the Core * Add Git/Svn plugins * Remove config file directive in bcfg2.conf Use of the plugins are enabled by adding Git or Svn (or both) to the plugins line of bcfg2.conf Signed-off-by: Sol Jerome git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5044 ce84e21b-d406-0410-9b95-82705330c041 --- src/sbin/bcfg2-info | 7 +++---- src/sbin/bcfg2-server | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/sbin') diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index bd04b599a..4d4e1aea1 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -25,10 +25,10 @@ def printTabular(rows): class infoCore(cmd.Cmd, Bcfg2.Server.Core.Core): - def __init__(self, repo, plgs, passwd, vcs, encoding, event_debug): + def __init__(self, repo, plgs, passwd, encoding, event_debug): cmd.Cmd.__init__(self) try: - Bcfg2.Server.Core.Core.__init__(self, repo, plgs, passwd, vcs, + Bcfg2.Server.Core.Core.__init__(self, repo, plgs, passwd, encoding) if event_debug: self.fam.debug = True @@ -294,7 +294,6 @@ if __name__ == '__main__': 'help': Bcfg2.Options.HELP, } optinfo.update({'repo': Bcfg2.Options.SERVER_REPOSITORY, - 'vcs': Bcfg2.Options.SERVER_VCS, 'plugins': Bcfg2.Options.SERVER_PLUGINS, 'password': Bcfg2.Options.SERVER_PASSWORD, 'event debug': Bcfg2.Options.DEBUG, @@ -303,7 +302,7 @@ if __name__ == '__main__': setup.parse(sys.argv[1:]) print setup loop = infoCore(setup['repo'], setup['plugins'], - setup['password'], setup['vcs'], setup['encoding'], + setup['password'], setup['encoding'], '-d' in sys.argv) if "args" in setup and setup['args']: loop.onecmd(" ".join(setup['args'])) diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index 0c1c5d01c..e75579376 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -35,7 +35,7 @@ class Bcfg2Serv(Bcfg2.Component.Component): try: self.Core = Core(setup['repo'], setup['plugins'], setup['password'], - setup['vcs'], setup['encoding'], setup['filemonitor']) + setup['encoding'], setup['filemonitor']) except CoreInitError, msg: logger.critical("Fatal error: %s" % (msg)) raise SystemExit, 1 -- cgit v1.2.3-1-g7c22