commit 343bdf0ce2cd4c0fea44e299e8d101bfaa0b9317 Author: Dmitry Alexeev Date: Fri Oct 2 11:59:54 2020 +0300 Add 'baremetal' to mechanism_drivers when using ironic+linuxbridge There was not 'baremetal' mechanism_driver in ml2_conf.ini.j2 for linuxbridge installations (unlike openvswitch) Change-Id: Idc4dbf28f8348848574b7c527b2b6f614d3cfebf Closes-Bug: #1894995 diff --git a/ansible/roles/neutron/templates/ml2_conf.ini.j2 b/ansible/roles/neutron/templates/ml2_conf.ini.j2 index e81a2e3..93c8f24 100644 --- a/ansible/roles/neutron/templates/ml2_conf.ini.j2 +++ b/ansible/roles/neutron/templates/ml2_conf.ini.j2 @@ -13,7 +13,7 @@ mechanism_drivers = onos_ml2 mechanism_drivers = openvswitch,{% if enable_ironic_neutron_agent | bool %}baremetal,{% endif %}l2population {% endif %} {% elif neutron_plugin_agent == "linuxbridge" %} -mechanism_drivers = linuxbridge,l2population +mechanism_drivers = linuxbridge,{% if enable_ironic_neutron_agent | bool %}baremetal,{% endif %}l2population {% elif neutron_plugin_agent == "opendaylight" %} mechanism_drivers = {{ opendaylight_mechanism_driver }} {% endif %}