From 8e2b341cfdd7dcb8a01cc2afc6574916d343b0b5 Mon Sep 17 00:00:00 2001
From: Bertrand Lallau <bertrand.lallau@gmail.com>
Date: Wed, 29 Mar 2017 21:38:24 +0200
Subject: [PATCH] Set to Unix format trove-conductor.conf file
Replace all DOS carriage returns (^M) with Unix line feeds.
Change-Id: I0cb757e2aa9c08d87d5da64cc416b3d468219df6
---
.../trove/templates/trove-conductor.conf.j2 | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/ansible/roles/trove/templates/trove-conductor.conf.j2 b/ansible/roles/trove/templates/trove-conductor.conf.j2
index 1f418e0574..2805f57bea 100644
--- a/ansible/roles/trove/templates/trove-conductor.conf.j2
+++ b/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