diff options
Diffstat (limited to 'src/sbin')
| -rwxr-xr-x | src/sbin/bcfg2-info | 26 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-server | 12 |
2 files changed, 19 insertions, 19 deletions
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index c0c2673a5..bf88b1bfe 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -24,12 +24,12 @@ def printTabular(rows): class infoCore(cmd.Cmd, Bcfg2.Server.Core.Core): - def __init__(self, repo, plgs, struct, gens, passwd, svn, + def __init__(self, repo, plgs, struct, gens, conn, passwd, svn, encoding, event_debug): cmd.Cmd.__init__(self) try: Bcfg2.Server.Core.Core.__init__(self, repo, plgs, struct, gens, - passwd, svn, encoding) + conn, passwd, svn, encoding) if event_debug: self.fam.debug = True except Bcfg2.Server.Core.CoreInitError, msg: @@ -124,7 +124,7 @@ Usage: [quit|exit]""" if len(args.split()) == 2: fname, client = args.split() entry = lxml.etree.Element('ConfigFile', name=fname) - metadata = self.metadata.get_metadata(client) + metadata = self.build_metadata(client) self.Bind(entry, metadata) print lxml.etree.tostring(entry, encoding="UTF-8", xml_declaration=True) else: @@ -162,7 +162,7 @@ Usage: [quit|exit]""" return client = args.split()[0] try: - meta = self.metadata.get_metadata(client) + meta = self.build_metadata(client) except Bcfg2.Server.Plugins.Metadata.MetadataConsistencyError: print "Unable to find metadata for host %s" % client return @@ -268,7 +268,7 @@ Usage: [quit|exit]""" def do_cfgdebug(self, args): try: - meta = self.metadata.get_metadata(args) + meta = self.build_metadata(args) except Bcfg2.Server.Plugins.Metadata.MetadataConsistencyError: print "Unable to find metadata for host %s" % client return @@ -301,17 +301,15 @@ if __name__ == '__main__': 'generators': Bcfg2.Options.SERVER_GENERATORS, 'password': Bcfg2.Options.SERVER_PASSWORD, 'event debug': Bcfg2.Options.DEBUG, - 'encoding': Bcfg2.Options.ENCODING}) + 'encoding': Bcfg2.Options.ENCODING, + 'connectors': Bcfg2.Options.SERVER_MCONNECT}) setup = Bcfg2.Options.OptionParser(optinfo) setup.parse(sys.argv[1:]) - if "-d" in sys.argv: - loop = infoCore(setup['repo'], setup['plugins'], setup['structures'], - setup['generators'], setup['password'], setup['svn'], - setup['encoding'], True) - else: - loop = infoCore(setup['repo'], setup['plugins'], setup['structures'], - setup['generators'], setup['password'], setup['svn'], - setup['encoding'], False) + print setup + loop = infoCore(setup['repo'], setup['plugins'], setup['structures'], + setup['generators'], setup['connectors'], + setup['password'], setup['svn'], setup['encoding'], + '-d' in sys.argv) if "args" in setup and setup['args']: loop.onecmd(" ".join(setup['args'])) raise SystemExit(0) diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index c1d678a76..b190a6e16 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -34,7 +34,8 @@ class Bcfg2Serv(Bcfg2.Component.Component): def __init__(self, setup): try: self.Core = Core(setup['repo'], setup['plugins'], setup['structures'], - setup['generators'], setup['password'], + setup['generators'], setup['connectors'], + setup['password'], setup['svn'], setup['encoding'], setup['filemonitor']) except CoreInitError, msg: logger.critical("Fatal error: %s" % (msg)) @@ -105,7 +106,7 @@ class Bcfg2Serv(Bcfg2.Component.Component): resp = Element('probes') try: name = self.Core.metadata.resolve_client(address) - meta = self.Core.metadata.get_metadata(name) + meta = self.Core.build_metadata(name) for plugin in [p for p in self.Core.plugins.values() \ if isinstance(p, Bcfg2.Server.Plugin.ProbingPlugin)]: @@ -123,7 +124,7 @@ class Bcfg2Serv(Bcfg2.Component.Component): '''Receive probe data from clients''' try: name = self.Core.metadata.resolve_client(address) - meta = self.Core.metadata.get_metadata(name) + meta = self.Core.build_metadata(name) except Bcfg2.Server.Plugins.Metadata.MetadataConsistencyError: warning = 'metadata consistency error' self.logger.warning(warning) @@ -177,7 +178,7 @@ class Bcfg2Serv(Bcfg2.Component.Component): # Versioned stats to prevent tied client/server upgrade if state.get('version') >= '2.0': client = self.Core.metadata.resolve_client(address) - meta = self.Core.metadata.get_metadata(client) + meta = self.Core.build_metadata(client) # Update statistics self.Core.stats.StoreStatistics(meta, sdata) @@ -191,7 +192,7 @@ class Bcfg2Serv(Bcfg2.Component.Component): def Bcfg2GetDecisionList(self, address, mode): client = self.Core.metadata.resolve_client(address) - meta = self.Core.metadata.get_metadata(client) + meta = self.Core.build_metadata(client) return self.Core.GetDecisions(meta, mode) if __name__ == '__main__': @@ -218,6 +219,7 @@ if __name__ == '__main__': 'static' : Bcfg2.Options.SERVER_STATIC, 'encoding' : Bcfg2.Options.ENCODING, 'filelog' : Bcfg2.Options.LOGGING_FILE_PATH, + 'connectors': Bcfg2.Options.SERVER_MCONNECT, }) |