From fb36029b59ff4abe00abd506fbd6bd02a2e2fa2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Nasiadka?= <mnasiadka@gmail.com>
Date: Fri, 18 Jun 2021 14:10:27 +0200
Subject: [PATCH] kolla: Set neutron_plugin_agent to OVN when it's enabled

kolla_enable_ovn currently just builds OVN images and
deploys OVN without configuring Neutron to use OVN.

Story: 2009080
Task: 42892

Change-Id: Ib756630d50cb9cf89342f32bf1d4e07df31b1a62
---
 ansible/roles/kolla-ansible/templates/globals.yml.j2    | 2 +-
 releasenotes/notes/bugfix-2009080-4c3a5a8acb9de39c.yaml | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/bugfix-2009080-4c3a5a8acb9de39c.yaml

diff --git a/ansible/roles/kolla-ansible/templates/globals.yml.j2 b/ansible/roles/kolla-ansible/templates/globals.yml.j2
index 85b84472e..d53d8408e 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 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.