From 68376d6f313895711dcd6dc992be1e8cdcf459a0 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Wed, 23 Nov 2022 21:17:18 +0100
Subject: [PATCH] Remove allow_overlapping_ips configuration option

This option was removed from Neutron in the Zed release [1]. This can be
backported to Yoga where the default value was changed to True [2].

[1] https://review.opendev.org/c/openstack/neutron/+/837286
[2] https://review.opendev.org/c/openstack/neutron/+/807848

Change-Id: Ibcd81a3a5f4b8de60459b3a4cfc30a50a06a436f
---
 ansible/roles/neutron/templates/neutron.conf.j2 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2
index 62bd1711cb..ee5bcf65ab 100644
--- a/ansible/roles/neutron/templates/neutron.conf.j2
+++ b/ansible/roles/neutron/templates/neutron.conf.j2
@@ -38,8 +38,6 @@ ovs_integration_bridge = br-int-{{ item }}
 host = {{ ansible_facts.hostname }}_{{ item }}
 {% endif %}
 
-allow_overlapping_ips = true
-
 {% if neutron_plugin_agent == 'vmware_nsxv' %}
 core_plugin = vmware_nsx.plugin.NsxVPlugin
 {% elif neutron_plugin_agent == 'vmware_nsxv3' %}
-- 
GitLab