Ticket #1160: NagiosGen.patch

NagiosGen.py

@@ -49 +49 @@
             raise Bcfg2.Server.Plugin.PluginExecutionError
         host_groups = [grp for grp in metadata.groups
                        if os.path.isfile('%s/%s-group.cfg' % (self.data, grp))]
-        host_groups.append([bundle for bundle in metadata.bundles
-                       if os.path.isfile('%s/%s-bundle.cfg' % (self.data, bundle))])
-        
+        bundle_groups = [grp for grp in metadata.bundles
+                       if os.path.isfile('%s/%s-bundle.cfg' % (self.data, grp))]
+        host_groups = bundle_groups + host_groups
         host_config = ['define host {',
                        self.line_fmt % ('host_name', metadata.hostname),
                        self.line_fmt % ('alias', metadata.hostname),
@@ -87 +87 @@
     def createserverconfig(self, entry, _):
         """Build monolithic server configuration file."""
         host_configs = glob.glob(os.path.join(self.data, '*-host.cfg'))
-        group_configs = glob.glob(os.path.join(self.data, '*-group.cfg'))
+        group_configs = glob.glob(os.path.join(self.data, '*-group.cfg')) + glob.glob(os.path.join(self.data, '*-bundle.cfg'))
+
         host_data = []
         group_data = []
         for host in host_configs: