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

[Jeff Lane ]

hotfix to address changes in curtin_userdata

[Jeff Lane  (bladernr)]

Self-approve

review: Approve

=== modified file 'preseed/curtin_userdata_cert'
--- preseed/curtin_userdata_cert	2016-11-15 21:18:04 +0000
+++ preseed/curtin_userdata_cert	2016-11-18 16:51:32 +0000
@@ -101,7 +101,7 @@
       done
 
 late_commands:
-  maas: [wget, '--no-proxy', '{{node_disable_pxe_url|escape.shell}}', '--post-data', '{{node_disable_pxe_data|escape.shell}}', '-O', '/dev/null']
+  maas: [wget, '--no-proxy', {{node_disable_pxe_url|escape.json}}, '--post-data', {{node_disable_pxe_data|escape.json}}, '-O', '/dev/null']
 {{if third_party_drivers and driver}}
   driver_00_key_get: curtin in-target -- sh -c "/bin/echo -en '{{key_string}}' > /tmp/maas-{{driver['package']}}.gpg"
   driver_02_key_add: ["curtin", "in-target", "--", "apt-key", "add", "/tmp/maas-{{driver['package']}}.gpg"]
 
=== modified file 'preseed/curtin_userdata_custom_cert'
--- preseed/curtin_userdata_custom_cert	2016-11-15 21:18:04 +0000
+++ preseed/curtin_userdata_custom_cert	2016-11-18 16:51:32 +0000
@@ -123,7 +123,7 @@
       done
 
 late_commands:
-  maas: [wget, '--no-proxy', '{{node_disable_pxe_url|escape.shell}}', '--post-data', '{{node_disable_pxe_data|escape.shell}}', '-O', '/dev/null']
+  maas: [wget, '--no-proxy', {{node_disable_pxe_url|escape.json}}, '--post-data', {{node_disable_pxe_data|escape.json}}, '-O', '/dev/null']
 {{if third_party_drivers and driver}}
   driver_00_key_get: curtin in-target -- sh -c "/bin/echo -en '{{key_string}}' > /tmp/maas-{{driver['package']}}.gpg"
   driver_02_key_add: ["curtin", "in-target", "--", "apt-key", "add", "/tmp/maas-{{driver['package']}}.gpg"]