Juju Charms Collection
nova-cloud-controller package

Merge lp:~james-page/charms/precise/nova-cloud-controller/havana-bind into lp:~charmers/charms/precise/nova-cloud-controller/trunk

  1. Precise Pangolin (12.04)
  2. havana-bind
  3. Merge into trunk
Proposed by James Page
Status: Merged
Merged at revision: 57
Proposed branch: lp:~james-page/charms/precise/nova-cloud-controller/havana-bind
Merge into: lp:~charmers/charms/precise/nova-cloud-controller/trunk
Diff against target: 28 lines (+5/-7)
1 file modified
templates/havana/neutron.conf (+5/-7)
To merge this branch: bzr merge lp:~james-page/charms/precise/nova-cloud-controller/havana-bind
Reviewer Review Type Date Requested Status
Marco Ceppi (community) Approve
Review via email: mp+198910@code.launchpad.net

Description of the change

Essential fix for HA with Havana

To post a comment you must log in.
Revision history for this message
Marco Ceppi (marcoceppi) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/havana/neutron.conf'
2--- templates/havana/neutron.conf 2013-09-25 13:10:26 +0000
3+++ templates/havana/neutron.conf 2013-12-13 10:55:50 +0000
4@@ -8,6 +8,11 @@
5 bind_host = 0.0.0.0
6 auth_strategy = keystone
7 notification_driver = neutron.openstack.common.notifier.rpc_notifier
8+{% if neutron_bind_port -%}
9+bind_port = {{ neutron_bind_port }}
10+{% else -%}
11+bind_port = 9696
12+{% endif -%}
13 {% if core_plugin -%}
14 core_plugin = {{ core_plugin }}
15 {% endif -%}
16@@ -45,12 +50,5 @@
17 admin_password = {{ admin_password }}
18 {% endif -%}
19
20-[database]
21-{% if database_host -%}
22-connection = mysql://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}
23-{% else -%}
24-connection = sqlite:////var/lib/neutron/neutron.sqlite
25-{% endif -%}
26-
27 [lbaas]
28 [service_providers]

Subscribers

People subscribed via source and target branches

to all changes: