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

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 132
Proposed branch: lp:~hopem/charms/trusty/nova-compute/fix-config-restart-svc-race
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 14 lines (+4/-0)
1 file modified
hooks/nova_compute_hooks.py (+4/-0)
To merge this branch: bzr merge lp:~hopem/charms/trusty/nova-compute/fix-config-restart-svc-race
Reviewer Review Type Date Requested Status
Billy Olsen Approve
Review via email: mp+257933@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Billy Olsen (billy-olsen) wrote :

LGTM, Approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/nova_compute_hooks.py'
2--- hooks/nova_compute_hooks.py 2015-04-24 13:43:58 +0000
3+++ hooks/nova_compute_hooks.py 2015-04-30 17:05:10 +0000
4@@ -296,6 +296,10 @@
5
6 log("Ceph broker request succeeded (rc=%s, msg=%s)" %
7 (rsp.exit_code, rsp.exit_msg), level=INFO)
8+ # Ensure that nova-compute is restarted since only now can we
9+ # guarantee that ceph resources are ready.
10+ if config('libvirt-image-backend') == 'rbd':
11+ service_restart('nova-compute')
12 else:
13 rq = CephBrokerRq()
14 replicas = config('ceph-osd-replication-count')

Subscribers

People subscribed via source and target branches