← 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/nova.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/nova.conf
24
24
keystone_ec2_url = {{ keystone_ec2_url }}
25
25
{% endif -%}
26
26
 
27
 
{% if database_host -%}
28
 
sql_connection = mysql://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}
29
 
{% endif -%}
 
27
{% include "parts/database" %}
30
28
 
31
 
{% if rabbitmq_host or rabbitmq_hosts -%}
32
 
rabbit_userid = {{ rabbitmq_user }}
33
 
rabbit_password = {{ rabbitmq_password }}
34
 
rabbit_virtual_host = {{ rabbitmq_virtual_host }}
35
 
{% if rabbitmq_hosts -%}
36
 
rabbit_hosts = {{ rabbitmq_hosts }}
37
 
{% if rabbitmq_ha_queues -%}
38
 
rabbit_ha_queues = true
39
 
rabbit_durable_queues = false
40
 
{% endif %}
41
 
{% else %}
42
 
rabbit_host = {{ rabbitmq_host }}
43
 
{% endif -%}
44
 
{% if rabbit_ssl_port %}
45
 
rabbit_use_ssl=True
46
 
rabbit_port={{ rabbit_ssl_port }}
47
 
{% if rabbit_ssl_ca %}
48
 
kombu_ssl_ca_certs={{rabbit_ssl_ca}}
49
 
{% endif %}
50
 
{% endif %}
51
 
{% endif -%}
 
29
{% include "parts/rabbitmq" %}
52
30
 
53
31
{% if glance_api_servers -%}
54
32
glance_api_servers = {{ glance_api_servers }}