Merge lp:~andreserl/maas/maas_saucy_fix_commissioning into lp:maas/trunk

[Andres Rodriguez]

Fix commissioning by reload initctl configuration in order to make sure that the lldpd init script is available before restart, otherwise # it might cause commissioning to fail. This is due bug # (LP: #882147) in the kernel.

[Gavin Panella (allenap)]

Tip top, nicely sleuthed.

review: Approve

[MAAS Lander (maas-lander)]

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

Ign http://security.ubuntu.com saucy-security InRelease
Ign http://nova.clouds.archive.ubuntu.com saucy InRelease
Hit http://security.ubuntu.com saucy-security Release.gpg
Ign http://nova.clouds.archive.ubuntu.com saucy-updates InRelease
Hit http://security.ubuntu.com saucy-security Release
Get:1 http://nova.clouds.archive.ubuntu.com saucy Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com saucy-updates Release.gpg
Get:2 http://nova.clouds.archive.ubuntu.com saucy Release [49.6 kB]
Hit http://nova.clouds.archive.ubuntu.com saucy-updates Release
Hit http://security.ubuntu.com saucy-security/main Sources
Hit http://security.ubuntu.com saucy-security/universe Sources
Hit http://security.ubuntu.com saucy-security/main amd64 Packages
Hit http://security.ubuntu.com saucy-security/universe amd64 Packages
Hit http://security.ubuntu.com saucy-security/main Translation-en
Hit http://security.ubuntu.com saucy-security/universe Translation-en
Get:3 http://nova.clouds.archive.ubuntu.com saucy/main Sources [1,010 kB]
Ign http://security.ubuntu.com saucy-security/main Translation-en_US
Ign http://security.ubuntu.com saucy-security/universe Translation-en_US
Get:4 http://nova.clouds.archive.ubuntu.com saucy/universe Sources [6,109 kB]
Get:5 http://nova.clouds.archive.ubuntu.com saucy/main amd64 Packages [1,255 kB]
Get:6 http://nova.clouds.archive.ubuntu.com saucy/universe amd64 Packages [5,652 kB]
Hit http://nova.clouds.archive.ubuntu.com saucy/main Translation-en
Get:7 http://nova.clouds.archive.ubuntu.com saucy/universe Translation-en [3,887 kB]
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/main Sources
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/universe Sources
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com saucy-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com saucy/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy/universe Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy-updates/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com saucy-updates/universe Translation-en_US
Fetched 18.0 MB in 8s (2,061 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 avahi-daemon avahi-utils bind9 bind9utils build-essential curl daemontools distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make postgresql-9.1 python-amqplib python-avahi python-bzrlib python-celery python-convoy python-cssselect python-curtin python-dbus 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-lockfile python-lxml python-netaddr python-netifaces python-oauth pyt...

[Raphaël Badin (rvb)]

I just tested this fix in the lab… and it worked \o/. Well done Andres!

review: Approve

[Raphaël Badin (rvb)]

Btw, you need to fix the related test with something like http://paste.ubuntu.com/6215715/

[lp:~andreserl/maas/maas_saucy_fix_commissioning]

1694. By Andres Rodriguez on 2013-10-09

update test

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'src/metadataserver/models/commissioningscript.py'
--- src/metadataserver/models/commissioningscript.py	2013-10-08 15:37:59 +0000
+++ src/metadataserver/models/commissioningscript.py	2013-10-09 22:33:23 +0000
@@ -257,6 +257,11 @@
         fd.write('\n')  # Ensure there's a newline.
         fd.write('# Configured by MAAS:\n')
         fd.write('DAEMON_ARGS="-c -f -s -e -r"\n')
+    # Reload initctl configuration in order to make sure that the
+    # lldpd init script is available before restart, otherwise
+    # it might cause commissioning to fail. This is due bug
+    # (LP: #882147) in the kernel.
+    check_call(("initctl", "reload-configuration"))
     check_call(("service", "lldpd", "restart"))
 
 

=== modified file 'src/metadataserver/models/tests/test_commissioningscript.py'
--- src/metadataserver/models/tests/test_commissioningscript.py	2013-10-08 15:35:23 +0000
+++ src/metadataserver/models/tests/test_commissioningscript.py	2013-10-09 22:33:23 +0000
@@ -232,8 +232,11 @@
         # lldpd is installed and restarted.
         self.assertEqual(
             check_call.call_args_list,
-            [call(("apt-get", "install", "--yes", "lldpd")),
-             call(("service", "lldpd", "restart"))])
+            [
+                call(("apt-get", "install", "--yes", "lldpd")),
+                call(("initctl", "reload-configuration")),
+                call(("service", "lldpd", "restart"))
+            ])
         # lldpd's config was updated to include an updated DAEMON_ARGS
         # setting. Note that the new comment is on a new line, and
         # does not interfere with existing config.