diff --git a/ops-sunbeam/ops_sunbeam/charm.py b/ops-sunbeam/ops_sunbeam/charm.py index 6ed70932..b636113e 100644 --- a/ops-sunbeam/ops_sunbeam/charm.py +++ b/ops-sunbeam/ops_sunbeam/charm.py @@ -203,7 +203,6 @@ class OSBaseOperatorCharm(ops.charm.CharmBase): self.service_name, self.container_configs, self.template_dir, - self.openstack_release, self.configure_charm, ) ] @@ -619,7 +618,6 @@ class OSBaseOperatorAPICharm(OSBaseOperatorCharm): self.service_name, self.container_configs, self.template_dir, - self.openstack_release, self.configure_charm, f"wsgi-{self.service_name}", ) diff --git a/ops-sunbeam/ops_sunbeam/container_handlers.py b/ops-sunbeam/ops_sunbeam/container_handlers.py index b830412e..5d18124f 100644 --- a/ops-sunbeam/ops_sunbeam/container_handlers.py +++ b/ops-sunbeam/ops_sunbeam/container_handlers.py @@ -60,7 +60,6 @@ class PebbleHandler(ops.charm.Object): service_name: str, container_configs: List[sunbeam_core.ContainerConfigFile], template_dir: str, - openstack_release: str, callback_f: Callable, ) -> None: """Run constructor.""" @@ -73,7 +72,6 @@ class PebbleHandler(ops.charm.Object): self.container_configs = container_configs self.container_configs.extend(self.default_container_configs()) self.template_dir = template_dir - self.openstack_release = openstack_release self.callback_f = callback_f self.setup_pebble_handler() @@ -120,7 +118,6 @@ class PebbleHandler(ops.charm.Object): container, config, self.template_dir, - self.openstack_release, context, ) if changed: @@ -348,7 +345,6 @@ class WSGIPebbleHandler(PebbleHandler): service_name: str, container_configs: List[sunbeam_core.ContainerConfigFile], template_dir: str, - openstack_release: str, callback_f: Callable, wsgi_service_name: str, ) -> None: @@ -359,7 +355,6 @@ class WSGIPebbleHandler(PebbleHandler): service_name, container_configs, template_dir, - openstack_release, callback_f, ) self.wsgi_service_name = wsgi_service_name diff --git a/ops-sunbeam/ops_sunbeam/templating.py b/ops-sunbeam/ops_sunbeam/templating.py index cb7b651c..bc9a228b 100644 --- a/ops-sunbeam/ops_sunbeam/templating.py +++ b/ops-sunbeam/ops_sunbeam/templating.py @@ -50,7 +50,6 @@ def sidecar_config_render( container: "ops.model.Container", config: "sunbeam_core.ContainerConfigFile", template_dir: str, - openstack_release: str, context: "sunbeam_core.OPSCharmContexts", ) -> bool: """Render templates inside containers. diff --git a/ops-sunbeam/unit_tests/test_charms.py b/ops-sunbeam/unit_tests/test_charms.py index bcf69a34..21d6467d 100644 --- a/ops-sunbeam/unit_tests/test_charms.py +++ b/ops-sunbeam/unit_tests/test_charms.py @@ -138,7 +138,6 @@ resources: class MyCharm(sunbeam_charm.OSBaseOperatorCharm): """Test charm for testing OSBaseOperatorCharm.""" - openstack_release = "diablo" service_name = "my-service" def __init__(self, framework: "ops.framework.Framework") -> None: @@ -203,7 +202,6 @@ TEMPLATE_CONTENTS = """ class MyAPICharm(sunbeam_charm.OSBaseOperatorAPICharm): """Test charm for testing OSBaseOperatorAPICharm.""" - openstack_release = "diablo" service_name = "my-service" wsgi_admin_script = "/bin/wsgi_admin" wsgi_public_script = "/bin/wsgi_public" @@ -304,7 +302,6 @@ class TestMultiSvcCharm(MyAPICharm): self.service_name, self.container_configs, self.template_dir, - self.openstack_release, self.configure_charm, ) ] diff --git a/ops-sunbeam/unit_tests/test_templating.py b/ops-sunbeam/unit_tests/test_templating.py index 6551fce4..983af2fe 100644 --- a/ops-sunbeam/unit_tests/test_templating.py +++ b/ops-sunbeam/unit_tests/test_templating.py @@ -51,7 +51,7 @@ class TestTemplating(test_utils.CharmTestCase): {"testfile.txt": "debug = {{ debug }}"} ) sunbeam_templating.sidecar_config_render( - container_mock, config, "/tmp/templates", "essex", {"debug": True} + container_mock, config, "/tmp/templates", {"debug": True} ) container_mock.push.assert_called_once_with( "/tmp/testfile.txt", @@ -77,6 +77,6 @@ class TestTemplating(test_utils.CharmTestCase): {"testfile.txt": "debug = {{ debug }}"} ) sunbeam_templating.sidecar_config_render( - container_mock, config, "/tmp/templates", "essex", {"debug": True} + container_mock, config, "/tmp/templates", {"debug": True} ) self.assertFalse(container_mock.push.called)