← Back to branch summary

~1chb1n/charms/trusty/nova-cloud-controller/15.10-stable-flip-tests-helper-syncs

« back to all changes in this revision

Viewing changes to templates/havana/neutron.conf

[yolanda] Add postgresql support
Rejig templates to use includes, add Postgresql context for neutron and quantum config files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/havana/neutron.conf
23
23
allow_overlapping_ips = True
24
24
neutron_firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
25
25
{% endif -%}
26
 
{% if rabbitmq_host or rabbitmq_hosts -%}
27
 
rabbit_userid = {{ rabbitmq_user }}
28
 
rabbit_password = {{ rabbitmq_password }}
29
 
rabbit_virtual_host = {{ rabbitmq_virtual_host }}
30
 
{% if rabbitmq_hosts -%}
31
 
rabbit_hosts = {{ rabbitmq_hosts }}
32
 
{% if rabbitmq_ha_queues -%}
33
 
rabbit_ha_queues = true
34
 
rabbit_durable_queues = false
35
 
{% endif %}
36
 
{% else %}
37
 
rabbit_host = {{ rabbitmq_host }}
38
 
{% endif -%}
39
 
{% if rabbit_ssl_port %}
40
 
rabbit_use_ssl=True
41
 
rabbit_port={{ rabbit_ssl_port }}
42
 
{% if rabbit_ssl_ca %}
43
 
kombu_ssl_ca_certs={{rabbit_ssl_ca}}
44
 
{% endif %}
45
 
{% endif %}
46
 
{% endif -%}
 
26
 
 
27
{% include "parts/rabbitmq" %}
47
28
 
48
29
[quotas]
49
30
quota_driver = neutron.db.quota_db.DbQuotaDriver
68
49
admin_password = {{ admin_password }}
69
50
{% endif -%}
70
51
 
 
52
{% include "parts/section-database" %}
 
53
 
71
54
[lbaas]
72
55
[service_providers]