Merge lp:~hopem/charms/trusty/nova-compute/fix-config-restart-svc-race into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Edward Hope-Morley]

[Billy Olsen (billy-olsen)]

LGTM, Approved.

review: Approve

=== modified file 'hooks/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py	2015-04-24 13:43:58 +0000
+++ hooks/nova_compute_hooks.py	2015-04-30 17:05:10 +0000
@@ -296,6 +296,10 @@
 
             log("Ceph broker request succeeded (rc=%s, msg=%s)" %
                 (rsp.exit_code, rsp.exit_msg), level=INFO)
+            # Ensure that nova-compute is restarted since only now can we
+            # guarantee that ceph resources are ready.
+            if config('libvirt-image-backend') == 'rbd':
+                service_restart('nova-compute')
         else:
             rq = CephBrokerRq()
             replicas = config('ceph-osd-replication-count')