diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2009-07-21 18:01:55 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2009-07-21 18:01:55 +0000 |
| commit | 8bafcbe5ff404e71c1c540dd9794ab4a461e5f14 (patch) | |
| tree | 797c20f3e2215a5427a5801d600841c1609a49fa /src/lib | |
| parent | 59d2c7b323566038ccda8d8d38491dd9378e75f4 (diff) | |
| download | bcfg2-8bafcbe5ff404e71c1c540dd9794ab4a461e5f14.tar.gz bcfg2-8bafcbe5ff404e71c1c540dd9794ab4a461e5f14.tar.bz2 bcfg2-8bafcbe5ff404e71c1c540dd9794ab4a461e5f14.zip | |
sync from bb
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5374 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Server/Plugins/BB.py | 8 |
1 files changed, 4 insertions, 4 deletions
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)]) |