MAAS

Merge lp:~justinkov/maas/mac into lp:~quentin-conner/maas/CaringoOS

  1. mac
  2. Merge into CaringoOS
Proposed by Justin Kovaric
Status: Work in progress
Proposed branch: lp:~justinkov/maas/mac
Merge into: lp:~quentin-conner/maas/CaringoOS
Diff against target: 11 lines (+1/-0)
1 file modified
src/provisioningserver/boot/pxe.py (+1/-0)
To merge this branch: bzr merge lp:~justinkov/maas/mac
Reviewer Review Type Date Requested Status
Quentin Conner Pending
Review via email: mp+299859@code.launchpad.net

Description of the change

Added mac address for template use in provisioningserver/boot/pxe.py

To post a comment you must log in.

Unmerged revisions

4958. By Justin Kovaric <email address hidden>

Added mac address to structure so that it can be used in a pxe template.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/boot/pxe.py'
2--- src/provisioningserver/boot/pxe.py 2016-05-18 19:39:44 +0000
3+++ src/provisioningserver/boot/pxe.py 2016-07-12 19:08:20 +0000
4@@ -121,6 +121,7 @@
5 template = self.get_template(
6 kernel_params.purpose, kernel_params.arch,
7 kernel_params.subarch, kernel_params.boottype)
8+ kernel_params.mac = extra.get('mac', '')
9 namespace = self.compose_template_namespace(kernel_params)
10 step1 = template.substitute(namespace)
11 return BytesReader(tempita.Template(step1).substitute(namespace).encode('utf-8'))

Subscribers

People subscribed via source and target branches

to all changes: