Merge "Fix disable haproxy causes the neutron service connection error"

This commit is contained in:
Zuul 2018-03-03 12:46:02 +00:00 committed by Gerrit Code Review
commit e66cb5d46b

View File

@ -24,7 +24,11 @@ extension_drivers = port_security
{% if enable_opendaylight | bool %} {% if enable_opendaylight | bool %}
[ml2_odl] [ml2_odl]
{% if enable_haproxy | bool %}
url = {{ internal_protocol }}://{{ kolla_internal_vip_address }}:{{ opendaylight_haproxy_restconf_port }}/controller/nb/v2/neutron 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 username = admin
password = {{ opendaylight_password }} password = {{ opendaylight_password }}
port_binding_controller = {{ opendaylight_port_binding_type }} port_binding_controller = {{ opendaylight_port_binding_type }}