Merge lp:~andreserl/maas/fix_lp1540765_110 into lp:maas/1.10

[Andres Rodriguez]

Backport rev4629 to fix enlistment due to bad decoding

[Andres Rodriguez (andreserl)]

Selfie!

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~andreserl/maas/fix_lp1540765_110 into lp:maas/1.10 failed. Below is the output from the failed tests.

Get:1 http://security.ubuntu.com/ubuntu xenial-security InRelease [82.2 kB]
Get:2 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial InRelease [237 kB]
Get:3 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [82.2 kB]
Get:4 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease [82.2 kB]
Get:5 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial/main Sources [1,129 kB]
Get:6 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial/universe Sources [7,648 kB]
Get:7 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial/main amd64 Packages [1,483 kB]
Get:8 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial/main Translation-en [856 kB]
Get:9 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial/restricted amd64 Packages [15.8 kB]
Get:10 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial/universe amd64 Packages [7,226 kB]
Get:11 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial/universe Translation-en [4,835 kB]
Fetched 23.7 MB in 6s (3,384 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-apt python3-bson python3-convoy python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-djorm-ext-pgarray python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-mock python3-netaddr python3-netifaces python3-oauth python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-seamicroclient python3-simplejson python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version (2.4.18-1ubuntu1).
authbind is already the newest version (2.1.1+nmu1).
bind9 is already the newest version (1:9.9.5.dfsg-12.1ubuntu1).
bind9utils is already the newest version (1:9.9.5.dfsg-12.1ubuntu1).
build-essential is already the newest version (12.1ubuntu2).
curl is already the newest version (7.47.0-1ubuntu1).
debhelper is already the newest version (9.20160115ubuntu2).
dh-apport is already the newest ve...

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2016-02-03 08:41:06 +0000
+++ docs/changelog.rst	2016-02-03 09:18:54 +0000
@@ -35,6 +35,7 @@
 --------------------------------
 
 LP: #1536754    Upgrade from 1.8 to 1.9 lost connected macs in all but one network
+LP: #1540765    Fix unable to detect IPMI control settings during enlistment
 
 
 1.9.0

=== modified file 'etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py'
--- etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py	2015-12-15 16:55:41 +0000
+++ etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py	2016-02-03 09:18:54 +0000
@@ -36,7 +36,7 @@
 def run_command(command_args):
     """Run a command. Return output if successful or raise exception if not."""
     output = subprocess.check_output(command_args, stderr=subprocess.STDOUT)
-    return output
+    return output.decode('utf-8')
 
 
 def bmc_get(key):

=== modified file 'etc/maas/templates/commissioning-user-data/snippets/tests/test_maas_ipmi_autodetect.py'
--- etc/maas/templates/commissioning-user-data/snippets/tests/test_maas_ipmi_autodetect.py	2015-12-01 18:12:59 +0000
+++ etc/maas/templates/commissioning-user-data/snippets/tests/test_maas_ipmi_autodetect.py	2016-02-03 09:18:54 +0000
@@ -49,7 +49,7 @@
 
         self.assertEqual(
             [test_stdout, test_stderr],
-            output.decode("ascii").split())
+            output.split())
 
     def test_exception_on_failure(self):
         """"Failed commands should raise an exception."""