Merge lp:~gmb/maas/fix-curtin-userdata-apt-mirror into lp:~maas-committers/maas/trunk

[Graham Binns]

Update the curtin_userdata template to correctly manipulate apt mirror details

This branch fixes curtin_user_data so that it updates the apt mirror details on fastpath-installed nodes for both standard and security archives.

[Raphaël Badin (rvb)]

review: Approve

=== modified file 'contrib/preseeds_v2/curtin_userdata'
--- contrib/preseeds_v2/curtin_userdata	2013-09-25 12:06:09 +0000
+++ contrib/preseeds_v2/curtin_userdata	2014-01-29 15:53:22 +0000
@@ -11,9 +11,13 @@
   mode: reboot
 
 {{if node.architecture in {'i386/generic', 'amd64/generic'} }}
-apt_mirror: http://{{main_archive_hostname}}/{{main_archive_directory}}
+apt_mirrors:
+  ubuntu_archive: http://{{main_archive_hostname}}/{{main_archive_directory}}
+  ubuntu_security: http://{{main_archive_hostname}}/{{main_archive_directory}}
 {{else}}
-apt_mirror: http://{{ports_archive_hostname}}/{{ports_archive_directory}}
+apt_mirrors:
+  ubuntu_archive: http://{{ports_archive_hostname}}/{{ports_archive_directory}}
+  ubuntu_security: http://{{ports_archive_hostname}}/{{ports_archive_directory}}
 {{endif}}
 
 {{if http_proxy }}