Merge lp:~james-page/charms/trusty/nova-cloud-controller/fixupneutronconf into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

Proposed by James Page
Status: Merged
Approved by: Edward Hope-Morley
Approved revision: 106
Merged at revision: 106
Proposed branch: lp:~james-page/charms/trusty/nova-cloud-controller/fixupneutronconf
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 13 lines (+2/-1)
1 file modified
hooks/nova_cc_utils.py (+2/-1)
To merge this branch: bzr merge lp:~james-page/charms/trusty/nova-cloud-controller/fixupneutronconf
Reviewer Review Type Date Requested Status
Edward Hope-Morley Approve
Review via email: mp+237013@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Edward Hope-Morley (hopem) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/nova_cc_utils.py'
2--- hooks/nova_cc_utils.py 2014-09-30 13:24:53 +0000
3+++ hooks/nova_cc_utils.py 2014-10-03 07:45:27 +0000
4@@ -162,7 +162,8 @@
5 nova_cc_context.NeutronCCContext(),
6 nova_cc_context.HAProxyContext(),
7 context.SyslogContext(),
8- nova_cc_context.NovaConfigContext()],
9+ nova_cc_context.NovaConfigContext(),
10+ context.BindHostContext()],
11 }),
12 (NEUTRON_DEFAULT, {
13 'services': ['neutron-server'],

Subscribers

People subscribed via source and target branches