openstack/sunbeam-charms
Code Issues Proposed changes

openstack-hypervisor: drop external-gateway

Browse Source 
Drop configuration of external-gateway property via charm configuration
as its actually determined by whether the unit as an external nic or if
the unit is configured in local only mode, with an IP address on the OVS
bridge.

Related-Bug: #2067623
Change-Id: I31e8a95b831911560c1fc761b1b107b188544fb5
This commit is contained in:
James Page 2024-06-03 13:07:45 +01:00
parent fdae386331
commit 270a99d385
No known key found for this signature in database
GPG Key ID: BFECAECBA0E7D8C3
3 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
charms/openstack-hypervisor/config.yaml
View File

@ -13,9 +13,6 @@ options:
dns-servers: dns-servers:
default: "8.8.8.8" default: "8.8.8.8"
type: string type: string
enable-gateway:
default: False
type: boolean
external-bridge: external-bridge:
default: "br-ex" default: "br-ex"
type: string type: string

1
charms/openstack-hypervisor/src/charm.py
View File

@ -433,7 +433,6 @@ class HypervisorOperatorCharm(sunbeam_charm.OSBaseOperatorCharm):
"identity.username": contexts.identity_credentials.username, "identity.username": contexts.identity_credentials.username,
"logging.debug": config("debug"), "logging.debug": config("debug"),
"network.dns-servers": config("dns-servers"), "network.dns-servers": config("dns-servers"),
"network.enable-gateway": config("enable-gateway"),
"network.external-bridge": config("external-bridge"), "network.external-bridge": config("external-bridge"),
"network.external-bridge-address": config( "network.external-bridge-address": config(
"external-bridge-address" "external-bridge-address"

2
charms/openstack-hypervisor/tests/unit/test_charm.py
View File

@ -163,7 +163,6 @@ class TestCharm(test_utils.CharmTestCase):
"logging.debug": False, "logging.debug": False,
"monitoring.enable": False, "monitoring.enable": False,
"network.dns-servers": "8.8.8.8", "network.dns-servers": "8.8.8.8",
"network.enable-gateway": False,
"network.external-bridge": "br-ex", "network.external-bridge": "br-ex",
"network.external-bridge-address": "10.20.20.1/24", "network.external-bridge-address": "10.20.20.1/24",
"network.ip-address": "10.0.0.10", "network.ip-address": "10.0.0.10",
@ -266,7 +265,6 @@ class TestCharm(test_utils.CharmTestCase):
"logging.debug": False, "logging.debug": False,
"monitoring.enable": True, "monitoring.enable": True,
"network.dns-servers": "8.8.8.8", "network.dns-servers": "8.8.8.8",
"network.enable-gateway": False,
"network.external-bridge": "br-ex", "network.external-bridge": "br-ex",
"network.external-bridge-address": "10.20.20.1/24", "network.external-bridge-address": "10.20.20.1/24",
"network.ip-address": "10.0.0.10", "network.ip-address": "10.0.0.10",