Merge lp:~1chb1n/charms/trusty/nova-compute/backport-lp1427660 into lp:~openstack-charmers-archive/charms/trusty/nova-compute/trunk

[Ryan Beisner]

Backport fix for bug 1427660 - related to librbd1 package upgrade.

https://bugs.launchpad.net/charms/+source/nova-compute/+bug/1427660

https://code.launchpad.net/~gnuoy/charms/trusty/nova-compute/1427660/+merge/251596

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #3196 nova-compute for 1chb1n mp255724
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/3196/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #2984 nova-compute for 1chb1n mp255724
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2984/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #3006 nova-compute for 1chb1n mp255724
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/10784339/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3006/

[Ryan Beisner (1chb1n)]

FWIW, n-c next and stable trunk amulet tests now fail with the same error:

14-basic-precise-icehouse DEBUG : 2015-04-07 05:43:51,566 create_instance ERROR: instance creation timed out

14-basic-precise-icehouse DEBUG : 2015-04-09 17:37:40,545 create_instance ERROR: instance creation timed out

[Ryan Beisner (1chb1n)]

^ which is a separate bug (also working to triage that):
https://bugs.launchpad.net/charms/+source/nova-compute/+bug/1440953

[Corey Bryant (corey.bryant)]

review: Approve

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #3017 nova-compute for 1chb1n mp255724
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/10789103/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3017/

=== modified file 'hooks/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py	2015-01-12 12:04:00 +0000
+++ hooks/nova_compute_hooks.py	2015-04-09 17:20:53 +0000
@@ -17,6 +17,7 @@
 )
 from charmhelpers.core.host import (
     restart_on_change,
+    service_restart,
 )
 
 from charmhelpers.fetch import (
@@ -234,6 +235,8 @@
 @restart_on_change(restart_map())
 def ceph_joined():
     apt_install(filter_installed_packages(['ceph-common']), fatal=True)
+    # Bug 1427660
+    service_restart('libvirt-bin')
 
 
 @hooks.hook('ceph-relation-changed')

=== modified file 'unit_tests/test_nova_compute_hooks.py'
--- unit_tests/test_nova_compute_hooks.py	2015-01-09 15:40:46 +0000
+++ unit_tests/test_nova_compute_hooks.py	2015-04-09 17:20:53 +0000
@@ -27,6 +27,7 @@
     'apt_update',
     'filter_installed_packages',
     'restart_on_change',
+    'service_restart',
     # charmhelpers.contrib.openstack.utils
     'configure_installation_source',
     'openstack_upgrade_available',
@@ -342,6 +343,7 @@
     def test_ceph_joined(self):
         hooks.ceph_joined()
         self.apt_install.assert_called_with(['ceph-common'], fatal=True)
+        self.service_restart.assert_called_with('libvirt-bin')
 
     @patch.object(hooks, 'CONFIGS')
     def test_ceph_changed_missing_relation_data(self, configs):