Merge lp:~gnuoy/charms/trusty/nova-compute/1427660 into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Liam Young]

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

charm_lint_check #2398 nova-compute-next for gnuoy mp251596
    LINT OK: passed

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

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

charm_unit_test #2188 nova-compute-next for gnuoy mp251596
    UNIT OK: passed

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

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

charm_amulet_test #2318 nova-compute-next for gnuoy mp251596
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/2318/

=== modified file 'hooks/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py	2015-02-06 18:09:18 +0000
+++ hooks/nova_compute_hooks.py	2015-03-03 13:38:04 +0000
@@ -17,6 +17,7 @@
 )
 from charmhelpers.core.host import (
     restart_on_change,
+    service_restart,
 )
 
 from charmhelpers.fetch import (
@@ -235,6 +236,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-03-03 13:38:04 +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):