From 270a99d385621931099f40714cc72475d8a314d9 Mon Sep 17 00:00:00 2001 From: James Page Date: Mon, 3 Jun 2024 13:07:45 +0100 Subject: [PATCH] openstack-hypervisor: drop external-gateway 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 --- charms/openstack-hypervisor/config.yaml | 3 --- charms/openstack-hypervisor/src/charm.py | 1 - charms/openstack-hypervisor/tests/unit/test_charm.py | 2 -- 3 files changed, 6 deletions(-) diff --git a/charms/openstack-hypervisor/config.yaml b/charms/openstack-hypervisor/config.yaml index f376b3e7..73499ef5 100644 --- a/charms/openstack-hypervisor/config.yaml +++ b/charms/openstack-hypervisor/config.yaml @@ -13,9 +13,6 @@ options: dns-servers: default: "8.8.8.8" type: string - enable-gateway: - default: False - type: boolean external-bridge: default: "br-ex" type: string diff --git a/charms/openstack-hypervisor/src/charm.py b/charms/openstack-hypervisor/src/charm.py index a2e63770..6d41c66b 100755 --- a/charms/openstack-hypervisor/src/charm.py +++ b/charms/openstack-hypervisor/src/charm.py @@ -433,7 +433,6 @@ class HypervisorOperatorCharm(sunbeam_charm.OSBaseOperatorCharm): "identity.username": contexts.identity_credentials.username, "logging.debug": config("debug"), "network.dns-servers": config("dns-servers"), - "network.enable-gateway": config("enable-gateway"), "network.external-bridge": config("external-bridge"), "network.external-bridge-address": config( "external-bridge-address" diff --git a/charms/openstack-hypervisor/tests/unit/test_charm.py b/charms/openstack-hypervisor/tests/unit/test_charm.py index c2f97a6a..70012753 100644 --- a/charms/openstack-hypervisor/tests/unit/test_charm.py +++ b/charms/openstack-hypervisor/tests/unit/test_charm.py @@ -163,7 +163,6 @@ class TestCharm(test_utils.CharmTestCase): "logging.debug": False, "monitoring.enable": False, "network.dns-servers": "8.8.8.8", - "network.enable-gateway": False, "network.external-bridge": "br-ex", "network.external-bridge-address": "10.20.20.1/24", "network.ip-address": "10.0.0.10", @@ -266,7 +265,6 @@ class TestCharm(test_utils.CharmTestCase): "logging.debug": False, "monitoring.enable": True, "network.dns-servers": "8.8.8.8", - "network.enable-gateway": False, "network.external-bridge": "br-ex", "network.external-bridge-address": "10.20.20.1/24", "network.ip-address": "10.0.0.10",