MAAS

Merge lp:~blake-rouse/maas/windows-license-key-userdata into lp:~maas-committers/maas/trunk

  1. windows-license-key-userdata
  2. Merge into trunk
Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 3260
Proposed branch: lp:~blake-rouse/maas/windows-license-key-userdata
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
contrib/preseeds_v2/curtin_userdata_windows (+1/-1)
To merge this branch: bzr merge lp:~blake-rouse/maas/windows-license-key-userdata
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Newell Jensen (community) Approve
Review via email: mp+238509@code.launchpad.net

Commit message

Fix get_effective_license_key in curtin_userdata_windows.

To post a comment you must log in.
Revision history for this message
Newell Jensen (newell-jensen) wrote :

Trivial. LGTM.

review: Approve
Revision history for this message
Raphaël Badin (rvb) :
review: Approve
Revision history for this message
Christian Reis (kiko) wrote :

Untestable?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'contrib/preseeds_v2/curtin_userdata_windows'
--- contrib/preseeds_v2/curtin_userdata_windows 2014-10-08 08:34:46 +0000
+++ contrib/preseeds_v2/curtin_userdata_windows 2014-10-15 22:45:17 +0000
@@ -8,7 +8,7 @@
8late_commands:8late_commands:
9 maas: [wget, '--no-proxy', '{{node_disable_pxe_url}}', '--post-data', '{{node_disable_pxe_data}}', '-O', '/dev/null']9 maas: [wget, '--no-proxy', '{{node_disable_pxe_url}}', '--post-data', '{{node_disable_pxe_data}}', '-O', '/dev/null']
1010
11license_key: {{node.get_effective_license_key}}11license_key: {{node.get_effective_license_key()}}
1212
13power_state:13power_state:
14 mode: reboot14 mode: reboot