1 files changed, 13 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/roles/config-deployment/templates/openstack_user_config.yml.j2 b/deploy/adapters/ansible/roles/config-deployment/templates/openstack_user_config.yml.j2
index 38e14784..2a24113b 100644
--- a/deploy/adapters/ansible/roles/config-deployment/templates/openstack_user_config.yml.j2
+++ b/deploy/adapters/ansible/roles/config-deployment/templates/openstack_user_config.yml.j2
@@ -37,16 +37,24 @@ global_overrides:
         range: "1:1000"
         net_name: "vxlan"
         group_binds:
+{% if "linuxbridge" == NEUTRON_MECHANISM_DRIVERS[0] %}
           - neutron_linuxbridge_agent
+{% else %}
+          - neutron_openvswitch_agent
+{% endif %}
     - network:
         container_bridge: "br-vlan"
         container_type: "veth"
         container_interface: "eth12"
         host_bind_override: "eth12"
         type: "flat"
-        net_name: "flat"
+        net_name: "{{ public_net_info.provider_network }}"
         group_binds:
+{% if "linuxbridge" == NEUTRON_MECHANISM_DRIVERS[0] %}
           - neutron_linuxbridge_agent
+{% else %}
+          - neutron_openvswitch_agent
+{% endif %}
     - network:
         container_bridge: "br-vlan"
         container_type: "veth"
@@ -55,7 +63,11 @@ global_overrides:
         range: "1:1"
         net_name: "vlan"
         group_binds:
+{% if "linuxbridge" == NEUTRON_MECHANISM_DRIVERS[0] %}
           - neutron_linuxbridge_agent
+{% else %}
+          - neutron_openvswitch_agent
+{% endif %}
     - network:
         container_bridge: "br-storage"
         container_type: "veth"