diff --git a/ansible/roles/kolla-ansible/templates/globals.yml.j2 b/ansible/roles/kolla-ansible/templates/globals.yml.j2
index 85b84472e49dd5d475d229c54065eccfeb2907c9..d53d8408ebf90620e967bd0611c5b9e9b9e7fdfe 100644
--- a/ansible/roles/kolla-ansible/templates/globals.yml.j2
+++ b/ansible/roles/kolla-ansible/templates/globals.yml.j2
@@ -110,7 +110,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 0000000000000000000000000000000000000000..c2bc255a2d483de1ba6335d775ab7e6c600f7f82
--- /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.