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

[Newell Jensen]

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

[Newell Jensen (newell-jensen)]

Backport self-review.

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~newell-jensen/maas/1.5-bug-1373580 into lp:maas/1.5 failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Get:1 http://security.ubuntu.com trusty-security Release.gpg [933 B]
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Get:2 http://security.ubuntu.com trusty-security Release [59.7 kB]
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates Release [59.7 kB]
Get:5 http://security.ubuntu.com trusty-security/main Sources [45.7 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Get:6 http://security.ubuntu.com trusty-security/universe Sources [10.8 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Get:7 http://security.ubuntu.com trusty-security/main amd64 Packages [145 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Get:8 http://security.ubuntu.com trusty-security/universe amd64 Packages [49.1 kB]
Get:9 http://security.ubuntu.com trusty-security/main Translation-en [70.3 kB]
Get:10 http://security.ubuntu.com trusty-security/universe Translation-en [28.7 kB]
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Get:11 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [123 kB]
Get:12 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [85.6 kB]
Get:13 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [326 kB]
Get:14 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [206 kB]
Get:15 http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en [147 kB]
Get:16 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en [104 kB]
Fetched 1,461 kB in 0s (1,925 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make postgresql python-amqplib python-bzrlib python-celery python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-formencode python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-netaddr python-netifaces python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify...

=== modified file 'src/provisioningserver/drivers/hardware/mscm.py'
--- src/provisioningserver/drivers/hardware/mscm.py	2014-07-24 02:52:10 +0000
+++ src/provisioningserver/drivers/hardware/mscm.py	2014-09-29 20:02:46 +0000
@@ -36,9 +36,10 @@
     'ProLiant m350 Server Cartridge': 'amd64/generic',
     'ProLiant m400 Server Cartridge': 'arm64/xgene-uboot',
     'ProLiant m500 Server Cartridge': 'amd64/generic',
+    'ProLiant m700 Server Cartridge': 'amd64/generic',
     'ProLiant m710 Server Cartridge': 'amd64/generic',
     'ProLiant m800 Server Cartridge': 'armhf/keystone',
-    'Default': 'arm64/generic',
+    'Default': 'amd64/generic',
 }