diff options
Diffstat (limited to 'src/sbin')
-rwxr-xr-x | src/sbin/bcfg2 | 2 | ||||
-rwxr-xr-x | src/sbin/bcfg2-server | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2 index abcf2ec49..7e78935ba 100755 --- a/src/sbin/bcfg2 +++ b/src/sbin/bcfg2 @@ -261,6 +261,8 @@ class Client: try: self.setup['decision_list'] = proxy.GetDecisionList( \ self.setup['decision']) + self.logger.info("Got Decision List from server:") + self.logger.info(self.setup['decision_list']) except xmlrpclib.Fault, f: if f.faultCode == 1: print "GetDecisionList method not supported by server" diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index 08e3f3d87..8fe1b82ff 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -192,14 +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) - result = [] - for plugin in self.Core.plugins.values(): - try: - if isinstance(plugin, Bcfg2.Server.Plugin.DecisionPlugin): - result += plugin.GetDecision(meta, mode) - except: - self.logger.error("Plugin: %s failed to generate decision list" % plugin.__name__) - return [] + return self.Core.GetDecisions(meta, mode) if __name__ == '__main__': |