From f3f66756752693c9550aafc2eae764a37c3ab42c Mon Sep 17 00:00:00 2001
From: Eduardo Olivares <eolivare@redhat.com>
Date: Fri, 18 Oct 2024 12:48:58 +0200
Subject: [PATCH] Use configured external network as floating network

The FIPs are created on the external network, which can be configured.
We don't need an extra parameter floating_network.

Change-Id: Ifa9781d3b8490a616be5272caa4aeb4ab61680b7
---
 tobiko/openstack/neutron/config.py     | 2 --
 tobiko/openstack/octavia/_deployers.py | 2 +-
 tobiko/openstack/stacks/_neutron.py    | 4 ----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/tobiko/openstack/neutron/config.py b/tobiko/openstack/neutron/config.py
index 239d5e5a6..e8b5fbe1b 100644
--- a/tobiko/openstack/neutron/config.py
+++ b/tobiko/openstack/neutron/config.py
@@ -22,8 +22,6 @@ OPTIONS = [
     cfg.StrOpt('external_network',
                help="Network for creating ports on an external network",
                default="public"),
-    cfg.StrOpt('floating_network',
-               help="Network for creating floating IPs"),
     cfg.StrOpt('ipv4_cidr',
                default='10.100.0.0/16',
                help="The CIDR block to allocate IPv4 subnets from"),
diff --git a/tobiko/openstack/octavia/_deployers.py b/tobiko/openstack/octavia/_deployers.py
index 18331b4d9..cd4bf4da1 100644
--- a/tobiko/openstack/octavia/_deployers.py
+++ b/tobiko/openstack/octavia/_deployers.py
@@ -29,7 +29,7 @@ LOG = log.getLogger(__name__)
 def get_external_subnet(ip_version=4):
     kw = {'router:external': True}
     if len(neutron.list_networks(**{'router:external': True})) > 1:
-        kw['name'] = CONF.neutron.external_network
+        kw['name'] = CONF.tobiko.neutron.external_network
 
     try:
         ext_subnet_list = neutron.find_network(**kw)['subnets']
diff --git a/tobiko/openstack/stacks/_neutron.py b/tobiko/openstack/stacks/_neutron.py
index f6990edf9..25c284fd4 100644
--- a/tobiko/openstack/stacks/_neutron.py
+++ b/tobiko/openstack/stacks/_neutron.py
@@ -135,10 +135,6 @@ class RouterStackFixture(ExternalNetworkStackFixture):
         super(RouterStackFixture, self).__init__()
         self._neutron_client = neutron_client
 
-    @property
-    def external_name(self) -> typing.Optional[str]:
-        return tobiko.tobiko_config().neutron.floating_network
-
     distributed: typing.Optional[bool] = None
 
     @property