diff --git a/ansible/roles/kolla-ansible/templates/globals.yml.j2 b/ansible/roles/kolla-ansible/templates/globals.yml.j2
index 10b809a10..b549adc5b 100644
--- a/ansible/roles/kolla-ansible/templates/globals.yml.j2
+++ b/ansible/roles/kolla-ansible/templates/globals.yml.j2
@@ -114,7 +114,7 @@ docker_custom_config: {{ kolla_docker_custom_config | to_nice_json | indent(2) }
 #dns_address_family: "{% raw %}{{ network_address_family }}{% endraw %}"
 
 # Valid options are [ openvswitch, linuxbridge ]
-neutron_plugin_agent: "openvswitch"
+neutron_plugin_agent: "{% if kolla_enable_ovn | default(False) | bool %}ovn{% else %}openvswitch{% endif %}"
 
 # Valid options are [ internal, infoblox ]
 #neutron_ipam_driver: "internal"
diff --git a/releasenotes/notes/bugfix-2009080-4c3a5a8acb9de39c.yaml b/releasenotes/notes/bugfix-2009080-4c3a5a8acb9de39c.yaml
new file mode 100644
index 000000000..c2bc255a2
--- /dev/null
+++ b/releasenotes/notes/bugfix-2009080-4c3a5a8acb9de39c.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Setting `kolla_enable_ovn` in ``kolla.yml`` did not configure Neutron's
+    integration with OVN.
+    See `story 2009080 <https://storyboard.openstack.org/#!/story/2009080>`__
+    for details.