maas-cert-server

Merge lp:~bladernr/maas-cert-server/1642998 into lp:~hardware-certification/maas-cert-server/trunk

  1. 1642998
  2. Merge into trunk
Proposed by Jeff Lane 
Status: Merged
Approved by: Jeff Lane 
Approved revision: 70
Merged at revision: 70
Proposed branch: lp:~bladernr/maas-cert-server/1642998
Merge into: lp:~hardware-certification/maas-cert-server/trunk
Diff against target: 25 lines (+2/-2)
2 files modified
preseed/curtin_userdata_cert (+1/-1)
preseed/curtin_userdata_custom_cert (+1/-1)
To merge this branch: bzr merge lp:~bladernr/maas-cert-server/1642998
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Review via email: mp+311287@code.launchpad.net

Description of the change

hotfix to address changes in curtin_userdata

To post a comment you must log in.
Revision history for this message
Jeff Lane  (bladernr) wrote :

Self-approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'preseed/curtin_userdata_cert'
2--- preseed/curtin_userdata_cert 2016-11-15 21:18:04 +0000
3+++ preseed/curtin_userdata_cert 2016-11-18 16:51:32 +0000
4@@ -101,7 +101,7 @@
5 done
6
7 late_commands:
8- maas: [wget, '--no-proxy', '{{node_disable_pxe_url|escape.shell}}', '--post-data', '{{node_disable_pxe_data|escape.shell}}', '-O', '/dev/null']
9+ maas: [wget, '--no-proxy', {{node_disable_pxe_url|escape.json}}, '--post-data', {{node_disable_pxe_data|escape.json}}, '-O', '/dev/null']
10 {{if third_party_drivers and driver}}
11 driver_00_key_get: curtin in-target -- sh -c "/bin/echo -en '{{key_string}}' > /tmp/maas-{{driver['package']}}.gpg"
12 driver_02_key_add: ["curtin", "in-target", "--", "apt-key", "add", "/tmp/maas-{{driver['package']}}.gpg"]
13
14=== modified file 'preseed/curtin_userdata_custom_cert'
15--- preseed/curtin_userdata_custom_cert 2016-11-15 21:18:04 +0000
16+++ preseed/curtin_userdata_custom_cert 2016-11-18 16:51:32 +0000
17@@ -123,7 +123,7 @@
18 done
19
20 late_commands:
21- maas: [wget, '--no-proxy', '{{node_disable_pxe_url|escape.shell}}', '--post-data', '{{node_disable_pxe_data|escape.shell}}', '-O', '/dev/null']
22+ maas: [wget, '--no-proxy', {{node_disable_pxe_url|escape.json}}, '--post-data', {{node_disable_pxe_data|escape.json}}, '-O', '/dev/null']
23 {{if third_party_drivers and driver}}
24 driver_00_key_get: curtin in-target -- sh -c "/bin/echo -en '{{key_string}}' > /tmp/maas-{{driver['package']}}.gpg"
25 driver_02_key_add: ["curtin", "in-target", "--", "apt-key", "add", "/tmp/maas-{{driver['package']}}.gpg"]

Subscribers

People subscribed via source and target branches

to status/vote changes: