openstack/kolla-ansible
Code Issues Proposed changes

Set to Unix format trove-conductor.conf file

Browse Source 
Replace all DOS carriage returns (^M) with Unix line feeds.

Change-Id: I0cb757e2aa9c08d87d5da64cc416b3d468219df6
This commit is contained in:
Bertrand Lallau 2017-03-29 21:38:24 +02:00
parent 04ebda9e44
commit 8e2b341cfd
1 changed files with 12 additions and 12 deletions

24
ansible/roles/trove/templates/trove-conductor.conf.j2

@ -1,13 +1,13 @@
[DEFAULT]
debug = {{ trove_logging_debug }}
log_dir = /var/log/kolla/trove
trove_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
conductor_manager = trove.conductor.manager.Manager
control_exchange = trove
transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
[database]
connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address }}/{{ trove_database_name }}
[DEFAULT]
debug = {{ trove_logging_debug }}
log_dir = /var/log/kolla/trove
trove_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
conductor_manager = trove.conductor.manager.Manager
control_exchange = trove
transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
[database]
connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address }}/{{ trove_database_name }}
max_retries = -1