From 8bafcbe5ff404e71c1c540dd9794ab4a461e5f14 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Tue, 21 Jul 2009 18:01:55 +0000 Subject: sync from bb git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5374 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/BB.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/lib/Server/Plugins/BB.py') diff --git a/src/lib/Server/Plugins/BB.py b/src/lib/Server/Plugins/BB.py index 0824172bf..c4dc92a52 100644 --- a/src/lib/Server/Plugins/BB.py +++ b/src/lib/Server/Plugins/BB.py @@ -28,10 +28,10 @@ class BBfile(Bcfg2.Server.Plugin.XMLFileBacked): for node in self.data.findall('Node'): iface = node.find('Interface') - mac = "01-%s" % (iface.get('mac'.replace(':','-').lower())) - self.actions[node.get('name')] = node.get('action') - self.bootlinks.append(mac, node.get('action')) if iface != None: + mac = "01-%s" % (iface.get('mac'.replace(':','-').lower())) + self.actions[node.get('name')] = node.get('action') + self.bootlinks.append((mac, node.get('action'))) try: ip = socket.gethostbyname(node.get('name')) except: @@ -80,7 +80,7 @@ class BB(Bcfg2.Server.Plugin.Plugin, users[user] = pubkeys - return dict([('users', users), + return dict([('users', users), ('macs', self.store.entries['bb.xml'].macs)]) -- cgit v1.2.3-1-g7c22