commit 6d03ac94c9e4debf78982aabf340ddd25bd355af
Author: Dmitry Alexeev <dalekseev@itkey.com>
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 d9a3436..6a61c3e 100644
--- a/ansible/roles/neutron/templates/ml2_conf.ini.j2
+++ b/ansible/roles/neutron/templates/ml2_conf.ini.j2
@@ -17,7 +17,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 %}