Merge lp:~newell-jensen/maas/fix-bug-1373580 into lp:maas/trunk

Proposed by Newell Jensen
Status: Merged
Approved by: Newell Jensen
Approved revision: 3080
Merged at revision: 3080
Proposed branch: lp:~newell-jensen/maas/fix-bug-1373580
Merge into: lp:maas/trunk
Diff against target: 13 lines (+2/-1)
1 file modified
src/provisioningserver/drivers/hardware/mscm.py (+2/-1)
To merge this branch: bzr merge lp:~newell-jensen/maas/fix-bug-1373580
Reviewer Review Type Date Requested Status
Jason Hobbs (community) Approve
Review via email: mp+235856@code.launchpad.net

Commit message

Setting default cartridge to amd64/generic and adding ProLiant m700 Server Cartridge to the cartridge mapping.

To post a comment you must log in.
Jason Hobbs (jason-hobbs) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/provisioningserver/drivers/hardware/mscm.py'
--- src/provisioningserver/drivers/hardware/mscm.py 2014-09-10 16:20:31 +0000
+++ src/provisioningserver/drivers/hardware/mscm.py 2014-09-24 19:52:11 +0000
@@ -36,9 +36,10 @@
36 'ProLiant m350 Server Cartridge': 'amd64/generic',36 'ProLiant m350 Server Cartridge': 'amd64/generic',
37 'ProLiant m400 Server Cartridge': 'arm64/xgene-uboot',37 'ProLiant m400 Server Cartridge': 'arm64/xgene-uboot',
38 'ProLiant m500 Server Cartridge': 'amd64/generic',38 'ProLiant m500 Server Cartridge': 'amd64/generic',
39 'ProLiant m700 Server Cartridge': 'amd64/generic',
39 'ProLiant m710 Server Cartridge': 'amd64/generic',40 'ProLiant m710 Server Cartridge': 'amd64/generic',
40 'ProLiant m800 Server Cartridge': 'armhf/keystone',41 'ProLiant m800 Server Cartridge': 'armhf/keystone',
41 'Default': 'arm64/generic',42 'Default': 'amd64/generic',
42}43}
4344
4445