Merge lp:~lutostag/ubuntu/trusty/maas/1.5.4+keystone into lp:ubuntu/trusty-proposed/maas

[Greg Lutostanski]

Add hwe for keystone.

Unmerged revisions

66. By Greg Lutostanski on 2014-09-18

Enablement for armhf/keystone architecture.

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-29 13:27:34 +0000
+++ debian/changelog	2014-09-18 21:50:54 +0000
@@ -1,3 +1,9 @@
+maas (1.5.4+bzr2295-0ubuntu1) trusty-proposed; urgency=medium
+
+  * Add hardware enablement for armhf/keystone (LP: #1350103)
+
+ -- Greg Lutostanski <[e-mail]>  Thu, 18 Sep 2014 16:43:56 -0500
+
 maas (1.5.4+bzr2294-0ubuntu1) trusty-proposed; urgency=medium
 
   * New upstream bug fix release:
 
=== modified file 'src/provisioningserver/driver/__init__.py'
--- src/provisioningserver/driver/__init__.py	2014-08-29 13:27:34 +0000
+++ src/provisioningserver/driver/__init__.py	2014-09-18 21:50:54 +0000
@@ -145,6 +145,9 @@
     Architecture(
         name="armhf/generic", description="armhf/generic",
         pxealiases=["arm"], kernel_options=["console=ttyAMA0"]),
+    Architecture(
+        name="armhf/keystone", description="armhf/keystone",
+        pxealiases=["arm"]),
     # PPC64EL needs a rootdelay for PowerNV. The disk controller
     # in the hardware, takes a little bit longer to come up then
     # the initrd wants to wait. Set this to 60 seconds, just to