Merge lp:~newell-jensen/maas/keystone-enablement-backport1.5 into lp:maas/1.5

Proposed by Newell Jensen on 2014-07-31
Status: Merged
Approved by: Newell Jensen on 2014-07-31
Approved revision: 2295
Merged at revision: 2295
Proposed branch: lp:~newell-jensen/maas/keystone-enablement-backport1.5
Merge into: lp:maas/1.5
Diff against target: 13 lines (+3/-0)
1 file modified
src/provisioningserver/driver/__init__.py (+3/-0)
To merge this branch: bzr merge lp:~newell-jensen/maas/keystone-enablement-backport1.5
Reviewer Review Type Date Requested Status
Newell Jensen Approve on 2014-07-31
Review via email: mp+229050@code.launchpad.net

Commit message

Backport trunk r2634: Enablement for armhf/keystone architecture.

Description of the change

Backport trunk r2634: Enablement for armhf/keystone architecture.

To post a comment you must log in.
Newell Jensen (newell-jensen) wrote :

Backport. Self approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/driver/__init__.py'
2--- src/provisioningserver/driver/__init__.py 2014-07-24 02:52:10 +0000
3+++ src/provisioningserver/driver/__init__.py 2014-07-31 14:13:33 +0000
4@@ -145,6 +145,9 @@
5 Architecture(
6 name="armhf/generic", description="armhf/generic",
7 pxealiases=["arm"], kernel_options=["console=ttyAMA0"]),
8+ Architecture(
9+ name="armhf/keystone", description="armhf/keystone",
10+ pxealiases=["arm"]),
11 # PPC64EL needs a rootdelay for PowerNV. The disk controller
12 # in the hardware, takes a little bit longer to come up then
13 # the initrd wants to wait. Set this to 60 seconds, just to

Subscribers

People subscribed via source and target branches

to all changes: