Merge lp:~andreserl/maas/lp1591395 into lp:~maas-committers/maas/trunk

[Andres Rodriguez]

Add ipmi_ssif driver loading during enlistment/commissioning to allow IPMI discovery on arm64

[dann frazier (dannf)]

Only a comment on the commit message - it's not *instead of*, it's *in addition to*.

[dann frazier (dannf)]

(sorry, that's just the bug title - i've fixed the bug title)

[Andres Rodriguez (andreserl)]

selfie as has been confirmed to work!

review: Approve

=== modified file 'contrib/preseeds_v2/enlist_userdata'
--- contrib/preseeds_v2/enlist_userdata	2016-04-22 17:44:18 +0000
+++ contrib/preseeds_v2/enlist_userdata	2016-06-13 15:24:35 +0000
@@ -60,6 +60,7 @@
       modprobe ipmi_msghandler
       modprobe ipmi_devintf
       modprobe ipmi_si ${IPMI_SI_PARAMS}
+      modprobe ipmi_ssif
       udevadm settle
    }
 

=== modified file 'etc/maas/templates/commissioning-user-data/user_data.template'
--- etc/maas/templates/commissioning-user-data/user_data.template	2015-12-17 14:39:34 +0000
+++ etc/maas/templates/commissioning-user-data/user_data.template	2016-06-13 15:24:35 +0000
@@ -206,6 +206,7 @@
    modprobe ipmi_msghandler
    modprobe ipmi_devintf
    modprobe ipmi_si ${IPMI_SI_PARAMS}
+   modprobe ipmi_ssif
    udevadm settle
 }