Merge lp:~james-page/charms/trusty/nova-compute/lp1516640-stable into lp:~openstack-charmers-archive/charms/trusty/nova-compute/trunk

Proposed by James Page
Status: Merged
Merged at revision: 143
Proposed branch: lp:~james-page/charms/trusty/nova-compute/lp1516640-stable
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-compute/trunk
Diff against target: 13 lines (+0/-3)
1 file modified
hooks/nova_compute_hooks.py (+0/-3)
To merge this branch: bzr merge lp:~james-page/charms/trusty/nova-compute/lp1516640-stable
Reviewer Review Type Date Requested Status
Corey Bryant (community) Approve
Review via email: mp+277739@code.launchpad.net

Description of the change

Defer configuration of lxd until nova user is in the lxd group.

To post a comment you must log in.
Revision history for this message
Corey Bryant (corey.bryant) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'hooks/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py 2015-10-22 13:23:10 +0000
+++ hooks/nova_compute_hooks.py 2015-11-17 17:36:50 +0000
@@ -145,9 +145,6 @@
145 fp = config('instances-path')145 fp = config('instances-path')
146 fix_path_ownership(fp, user='nova')146 fix_path_ownership(fp, user='nova')
147147
148 if config('virt-type').lower() == 'lxd':
149 configure_lxd(user='nova')
150
151 [compute_joined(rid) for rid in relation_ids('cloud-compute')]148 [compute_joined(rid) for rid in relation_ids('cloud-compute')]
152 for rid in relation_ids('zeromq-configuration'):149 for rid in relation_ids('zeromq-configuration'):
153 zeromq_configuration_relation_joined(rid)150 zeromq_configuration_relation_joined(rid)

Subscribers

People subscribed via source and target branches