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

Proposed by James Page on 2015-11-17
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 2015-11-17 Approve on 2015-11-17
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.
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
1=== modified file 'hooks/nova_compute_hooks.py'
2--- hooks/nova_compute_hooks.py 2015-10-22 13:23:10 +0000
3+++ hooks/nova_compute_hooks.py 2015-11-17 17:36:50 +0000
4@@ -145,9 +145,6 @@
5 fp = config('instances-path')
6 fix_path_ownership(fp, user='nova')
7
8- if config('virt-type').lower() == 'lxd':
9- configure_lxd(user='nova')
10-
11 [compute_joined(rid) for rid in relation_ids('cloud-compute')]
12 for rid in relation_ids('zeromq-configuration'):
13 zeromq_configuration_relation_joined(rid)

Subscribers

People subscribed via source and target branches