x/tobiko
Code Issues Proposed changes

Use configured external network as floating network

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

Change-Id: Ifa9781d3b8490a616be5272caa4aeb4ab61680b7
This commit is contained in:
Eduardo Olivares 2024-10-18 12:48:58 +02:00
parent f268b126b7
commit f3f6675675
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tobiko/openstack/neutron/config.py
View File

@ -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"),

2
tobiko/openstack/octavia/_deployers.py
View File

@ -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']

4
tobiko/openstack/stacks/_neutron.py
View File

@ -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