commit facf15626e5776bc64a2f072bdccadbda714a8f2
author Takashi Kajinami <tkajinam@redhat.com> Wed Jul 13 15:58:42 2022 +0900
committer Takashi Kajinami <tkajinam@redhat.com> Tue Jul 19 13:24:38 2022 +0000
tree 9a808e5e2b49d9e4645b47224e3681f61ad4d3be
parent cf0bf746e996b780714a085b0e6f38899c2c832e

Neutron: Do not set removed allow_overlapping_ips

The parameter has been removed from neutron by [1].

[1] fde91e8059a9a23fb7ece6e3463984329c7ea581

Change-Id: I3b838ea741d19729d6fcf03c0478b1b4d8ec1213

lib/neutron

diff --git a/lib/neutron b/lib/neutron
index 6e787f2..d4815cd 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -213,7 +213,6 @@
         iniset $NEUTRON_CONF DEFAULT core_plugin $NEUTRON_CORE_PLUGIN
 
         iniset $NEUTRON_CONF DEFAULT policy_file $policy_file
-        iniset $NEUTRON_CONF DEFAULT allow_overlapping_ips True
         iniset $NEUTRON_CONF DEFAULT router_distributed $NEUTRON_DISTRIBUTED_ROUTING
 
         iniset $NEUTRON_CONF DEFAULT auth_strategy $NEUTRON_AUTH_STRATEGY

lib/neutron-legacy

diff --git a/lib/neutron-legacy b/lib/neutron-legacy
index 5e6af0f..d21be51 100644
--- a/lib/neutron-legacy
+++ b/lib/neutron-legacy
@@ -916,7 +916,6 @@
 
     iniset $NEUTRON_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
     iniset $NEUTRON_CONF oslo_policy policy_file $Q_POLICY_FILE
-    iniset $NEUTRON_CONF DEFAULT allow_overlapping_ips $Q_ALLOW_OVERLAPPING_IP
 
     iniset $NEUTRON_CONF DEFAULT auth_strategy $Q_AUTH_STRATEGY
     configure_keystone_authtoken_middleware $NEUTRON_CONF $Q_ADMIN_USERNAME