aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliyingjun <yingjun.li@kylin-cloud.com>2016-09-10 10:08:49 +0800
committerliyingjun <yingjun.li@kylin-cloud.com>2016-09-10 10:12:42 +0800
commite31dede2b03a13f4b9c35f697bc849ba09e2fd8c (patch)
treecf2b050ade860a92b43a19e1f052e5a1093eada2
parent99897c5438f59b3fa40ade388e0eafe6a0fbfffb (diff)
downloadkolla-e31dede2b03a13f4b9c35f697bc849ba09e2fd8c.tar.gz
kolla-e31dede2b03a13f4b9c35f697bc849ba09e2fd8c.zip
Fix generated sahara conf
There should be a blank line between 'transport_url' and 'use_neutron = True', otherwise these line will be merge into one line after rendering. TrivialFix Change-Id: I66d14d5bc4b03b450cdcc0f7ac80548ed90bcd2d
-rw-r--r--ansible/roles/sahara/templates/sahara.conf.j21
1 files changed, 1 insertions, 0 deletions
diff --git a/ansible/roles/sahara/templates/sahara.conf.j2 b/ansible/roles/sahara/templates/sahara.conf.j2
index 9f47f3db7..9cf162dae 100644
--- a/ansible/roles/sahara/templates/sahara.conf.j2
+++ b/ansible/roles/sahara/templates/sahara.conf.j2
@@ -4,6 +4,7 @@ log_dir = /var/log/kolla/sahara
port = {{ sahara_api_port }}
host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
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 %}
+
use_neutron = True
api_workers = 2
use_floating_ips = False