aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-01 23:38:59 +0000
committerGerrit Code Review <review@openstack.org>2015-11-01 23:38:59 +0000
commit59c8ad0cd9e7548688768ce4d0646d196b8cf635 (patch)
treebeece42a0dfed6bc9e298238349b1c34e5f012e9
parentb072ea9c3dfacaad812785d910c36133c405a13f (diff)
parentf4eb89f8b08fbc1b0aee49f20cb7a60684c10f44 (diff)
downloadkolla-59c8ad0cd9e7548688768ce4d0646d196b8cf635.tar.gz
kolla-59c8ad0cd9e7548688768ce4d0646d196b8cf635.zip
Merge "HAProxy does not have murano-api configuration"
-rw-r--r--ansible/roles/haproxy/templates/haproxy.cfg.j28
1 files changed, 8 insertions, 0 deletions
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2
index b2a0db1c0..3e31edb0e 100644
--- a/ansible/roles/haproxy/templates/haproxy.cfg.j2
+++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2
@@ -157,3 +157,11 @@ listen swift_api
server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ swift_proxy_server_port }} check inter 2000 rise 2 fall 5
{% endfor %}
{% endif %}
+
+{% if enable_murano | bool %}
+listen murano_api
+ bind {{ kolla_internal_address }}:{{ murano_api_port }}
+{% for host in groups['murano-api'] %}
+ server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ murano_api_port }} check inter 2000 rise 2 fall 5
+{% endfor %}
+{% endif %}