Merge lp:~jason-hobbs/maas/curtin-use-drivers into lp:~maas-committers/maas/trunk

[Jason Hobbs]

Make curtin use third party drivers.

[Scott Moser (smoser)]

a.) please use '--quiet' on apt-get update. and I prefer '--assume-yes' to '-y' as it is self-documenting.
b.) i think if you need to 'update-initramfs' then something is wrong the package installation should trigger the initramfs re-build.
c.) the '[]' version of values is preferred I think. It is more explicit. You're passing all that to /bin/sh, which gets you a level of shell interpretation that you may or may not want (and can cause issues).

ie:
- driver_04_update_install: curtin in-target -- apt-get update
+ driver_04_update_install: ["curtin", "in-target", "--", "apt-get", "update"]

[Andres Rodriguez (andreserl)]

Lgtm! I'll approve but run it trhough scott too for him to approve.

review: Approve

[Scott Moser (smoser)]

looks fine other than
  s/-y/--assume-yes/

=== modified file 'contrib/preseeds_v2/curtin_userdata'
--- contrib/preseeds_v2/curtin_userdata	2014-01-29 15:42:47 +0000
+++ contrib/preseeds_v2/curtin_userdata	2014-04-15 14:56:26 +0000
@@ -4,8 +4,26 @@
   {{for line in str(curtin_preseed).splitlines()}}
   {{line}}
   {{endfor}}
+{{if third_party_drivers and driver}}
+early_commands:
+  {{py: key_string = ''.join(['\\x%x' % x for x in map(ord, driver['key_binary'])])}}
+  driver_00_get_key: /bin/echo -en '{{key_string}}' > /tmp/maas-{{driver['package']}}.gpg
+  driver_01_add_key: ["apt-key", "add", "/tmp/maas-{{driver['package']}}.gpg"]
+  driver_02_add: ["add-apt-repository", "-y", "deb {{driver['repository']}} {{node.get_distro_series()}} main"]
+  driver_03_update_install: ["sh", "-c", "apt-get update --quiet && apt-get --assume-yes install {{driver['package']}}"]
+  driver_04_load: ["sh", "-c", "depmod && modprobe {{driver['module']}}"]
+{{endif}}
 late_commands:
   maas: [wget, '--no-proxy', '{{node_disable_pxe_url|escape.shell}}', '--post-data', '{{node_disable_pxe_data|escape.shell}}', '-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"]
+  driver_03_add: ["curtin", "in-target", "--", "add-apt-repository", "-y", "deb {{driver['repository']}} {{node.get_distro_series()}} main"]
+  driver_04_update_install: ["curtin", "in-target", "--", "apt-get", "update", "--quiet"]
+  driver_05_install: ["curtin", "in-target", "--", "apt-get", "-y", "install", "{{driver['package']}}"]
+  driver_06_depmod: ["curtin", "in-target", "--", "depmod"]
+  driver_07_update_initramfs: ["curtin", "in-target", "--", "update-initramfs", "-u"]
+{{endif}}
 
 power_state:
   mode: reboot