From 9dc6df9e751a2ca67c49840bfd6cd3bf441b4aa1 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 13 Mar 2023 22:36:27 +0900
Subject: [PATCH] Neutron: Make sure overlay_ip_version is configured properly

Change 0797e82aca0a408838a49c1a269948e83d978b1c[1][2] fixed the ip
version used by ovs-agent but this effectively changed the ip version
used for underlying network. However that change did not update
the overlay_ip_version option accordingly and neutron records the error
caused by version mismatch continuously.

```
Invalid input for operation: ('Tunnel IP version does not match ML2
overlay_ip_version ...)
```

This change fixes that and ensures the option is set according to
the actual IP version.

Change-Id: Ied95886a30618ae2901cb2e9eacf9296a5911e8f
---
 manifests/neutron.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/neutron.pp b/manifests/neutron.pp
index 584b2845d..28b0ae6ab 100644
--- a/manifests/neutron.pp
+++ b/manifests/neutron.pp
@@ -250,6 +250,7 @@ class openstack_integration::neutron (
     extension_drivers    => 'port_security,qos',
     mechanism_drivers    => $driver,
     max_header_size      => $max_header_size,
+    overlay_ip_version   => $::openstack_integration::config::ip_version,
   }
 
   case $driver {