From a4ac90d723c225cc1fb22bd161755b1535b4fa5d Mon Sep 17 00:00:00 2001
From: xiaoxu780 <chao.xu@timanetworks.com>
Date: Thu, 1 Mar 2018 21:45:05 -0500
Subject: [PATCH] Fix disable haproxy causes the neutron service connection
 error

Change-Id: I31969667ab86f61d38752954cb0e565ad7e41970
Closes-Bug: #1752760
---
 ansible/roles/neutron/templates/ml2_conf.ini.j2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ansible/roles/neutron/templates/ml2_conf.ini.j2 b/ansible/roles/neutron/templates/ml2_conf.ini.j2
index c92385994c..0aa841ae61 100644
--- a/ansible/roles/neutron/templates/ml2_conf.ini.j2
+++ b/ansible/roles/neutron/templates/ml2_conf.ini.j2
@@ -24,7 +24,11 @@ extension_drivers = port_security
 
 {% if enable_opendaylight | bool %}
 [ml2_odl]
+{% if enable_haproxy | bool %}
 url = {{ internal_protocol }}://{{ kolla_internal_vip_address }}:{{ opendaylight_haproxy_restconf_port }}/controller/nb/v2/neutron
+{% else %}
+url = {{ internal_protocol }}://{{ kolla_internal_vip_address }}:{{ opendaylight_restconf_port }}/controller/nb/v2/neutron
+{% endif %}
 username = admin
 password = {{ opendaylight_password }}
 port_binding_controller = {{ opendaylight_port_binding_type }}